[MERGE] : #341 -> develop

[FEAT/#341] Notice / 공지 팝업 뷰 구현
team-yello · Feb 1, 2024 · ae48b6f · ae48b6f
2 parents 7573b94 + 272fec7
commit ae48b6f
Show file tree

Hide file tree

Showing 41 changed files with 668 additions and 189 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("yello.android.application")
     id("yello.android.androidHilt")
+    alias(libs.plugins.androidKotlin)
 }
 
 dependencies {

diff --git a/app/src/main/java/com/el/yello/di/DataSourceModule.kt b/app/src/main/java/com/el/yello/di/DataSourceModule.kt
@@ -1,6 +1,7 @@
 package com.el.yello.di
 
 import com.example.data.datasource.AuthDataSource
+import com.example.data.datasource.NoticeDataSource
 import com.example.data.datasource.OnboardingDataSource
 import com.example.data.datasource.PayDataSource
 import com.example.data.datasource.ProfileDataSource
@@ -9,6 +10,7 @@ import com.example.data.datasource.SearchDataSource
 import com.example.data.datasource.VoteDataSource
 import com.example.data.datasource.YelloDataSource
 import com.example.data.datasource.remote.AuthDataSourceImpl
+import com.example.data.datasource.remote.NoticeDataSourceImpl
 import com.example.data.datasource.remote.OnboardingDataSourceImpl
 import com.example.data.datasource.remote.PayDataSourceImpl
 import com.example.data.datasource.remote.ProfileDataSourceImpl
@@ -64,4 +66,9 @@ object DataSourceModule {
     @Singleton
     fun provideAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource =
         authDataSourceImpl
+
+    @Provides
+    @Singleton
+    fun provideNoticeDataSource(noticeDataSourceImpl: NoticeDataSourceImpl): NoticeDataSource =
+        noticeDataSourceImpl
 }
diff --git a/app/src/main/java/com/el/yello/di/DataStoreModule.kt b/app/src/main/java/com/el/yello/di/DataStoreModule.kt
@@ -25,7 +25,7 @@ object DataStoreModule {
     @Singleton
     @User
     fun provideUserPreferences(
-        @ApplicationContext context: Context
+        @ApplicationContext context: Context,
     ): SharedPreferences = if (BuildConfig.DEBUG) {
         context.getSharedPreferences(context.packageName, Context.MODE_PRIVATE)
     } else {
@@ -42,7 +42,7 @@ object DataStoreModule {
     @Singleton
     @App
     fun provideAppPreferences(
-        @ApplicationContext context: Context
+        @ApplicationContext context: Context,
     ): SharedPreferences = if (BuildConfig.DEBUG) {
         context.getSharedPreferences(APP_PREFERENCES_NAME, Context.MODE_PRIVATE)
     } else {
@@ -68,7 +68,7 @@ object DataStoreModule {
 
     private fun createEncryptedSharedPreferences(
         fileName: String,
-        context: Context
+        context: Context,
     ): SharedPreferences {
         return EncryptedSharedPreferences.create(
             context,
@@ -77,7 +77,7 @@ object DataStoreModule {
                 .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
                 .build(),
             EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
-            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+            EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
         )
     }
-}
+}
diff --git a/app/src/main/java/com/el/yello/di/RepositoryModule.kt b/app/src/main/java/com/el/yello/di/RepositoryModule.kt
@@ -1,6 +1,7 @@
 package com.el.yello.di
 
 import com.example.data.repository.AuthRepositoryImpl
+import com.example.data.repository.NoticeRepositoryImpl
 import com.example.data.repository.OnboardingRepositoryImpl
 import com.example.data.repository.PayRepositoryImpl
 import com.example.data.repository.ProfileRepositoryImpl
@@ -9,6 +10,7 @@ import com.example.data.repository.SearchRepositoryImpl
 import com.example.data.repository.VoteRepositoryImpl
 import com.example.data.repository.YelloRepositoryImpl
 import com.example.domain.repository.AuthRepository
+import com.example.domain.repository.NoticeRepository
 import com.example.domain.repository.OnboardingRepository
 import com.example.domain.repository.PayRepository
 import com.example.domain.repository.ProfileRepository
@@ -65,4 +67,8 @@ object RepositoryModule {
     fun providePayRepository(payRepositoryImpl: PayRepositoryImpl): PayRepository =
         payRepositoryImpl
 
-}
+    @Provides
+    @Singleton
+    fun provideNoticeRepository(noticeRepositoryImpl: NoticeRepositoryImpl): NoticeRepository =
+        noticeRepositoryImpl
+}
diff --git a/app/src/main/java/com/el/yello/di/ServiceModule.kt b/app/src/main/java/com/el/yello/di/ServiceModule.kt
@@ -2,6 +2,7 @@ package com.el.yello.di
 
 import com.example.data.remote.service.AuthService
 import com.example.data.remote.service.LookService
+import com.example.data.remote.service.NoticeService
 import com.example.data.remote.service.OnboardingService
 import com.example.data.remote.service.PayService
 import com.example.data.remote.service.ProfileService
@@ -64,4 +65,8 @@ object ServiceModule {
     fun provideAuthService(retrofit: Retrofit): AuthService =
         retrofit.create(AuthService::class.java)
 
-}
+    @Provides
+    @Singleton
+    fun provideNoticeService(retrofit: Retrofit): NoticeService =
+        retrofit.create(NoticeService::class.java)
+}