[ Feature ] : 버전 업데이트 다이얼로그 구현

common/src/main/java/com/yapp/common/yds/YDSPopupDialog.kt

@@ -40,9 +40,9 @@ fun YDSPopupDialog(
     title: String,
     content: String,
     modifier: Modifier = Modifier,
-    negativeButtonText: String,
+    negativeButtonText: String? = null,
     positiveButtonText: String,
-    onClickNegativeButton: () -> Unit,
+    onClickNegativeButton: (() -> Unit)? = null,
     onClickPositiveButton: () -> Unit,
     editTextInitValue: String = "",
     editTextHint: String? = null,
@@ -127,31 +127,38 @@ fun YDSPopupDialog(
                 Row(
                     modifier = Modifier.padding(top = 18.dp)
                 ) {
-                    Button(
-                        onClick = onClickNegativeButton,
-                        modifier = Modifier
-                            .weight(1f)
-                            .height(46.dp)
-                            .padding(end = 6.dp),
-                        colors = ButtonDefaults.buttonColors(
-                            backgroundColor = AttendanceTheme.colors.grayScale.Gray200
-                        ),
-                        shape = RoundedCornerShape(10.dp),
-                        elevation = null
-                    ) {
-                        Text(
-                            text = negativeButtonText,
-                            style = AttendanceTypography.body1,
-                            color = AttendanceTheme.colors.grayScale.Gray800
-                        )
+                    if (onClickNegativeButton != null && negativeButtonText != null) {
+                        Button(
+                            onClick = onClickNegativeButton,
+                            modifier = Modifier
+                                .weight(1f)
+                                .height(46.dp)
+                                .padding(end = 6.dp),
+                            colors = ButtonDefaults.buttonColors(
+                                backgroundColor = AttendanceTheme.colors.grayScale.Gray200
+                            ),
+                            shape = RoundedCornerShape(10.dp),
+                            elevation = null
+                        ) {
+                            Text(
+                                text = negativeButtonText,
+                                style = AttendanceTypography.body1,
+                                color = AttendanceTheme.colors.grayScale.Gray800
+                            )
+                        }
                     }
 
+                    val positiveButtonPadding =
+                        if (onClickNegativeButton != null && negativeButtonText != null)
+                            Modifier.padding(horizontal = 12.dp)
+                        else Modifier.padding(start = 6.dp)
+
                     Button(
                         onClick = onClickPositiveButton,
                         modifier = Modifier
                             .weight(1f)
                             .height(46.dp)
-                            .padding(start = 6.dp),
+                            .then(positiveButtonPadding),
                         colors = ButtonDefaults.buttonColors(
                             backgroundColor = AttendanceTheme.colors.etcColors.EtcRed // EtcRed or YappOrange
                         ),

data/src/main/java/com/yapp/data/datasource/FirebaseRemoteConfigDataSource.kt

@@ -3,6 +3,7 @@ package com.yapp.data.datasource
 import com.yapp.data.model.ConfigEntity
 import com.yapp.data.model.SessionEntity
 import com.yapp.data.model.TeamEntity
+import com.yapp.data.model.VersionEntity
 
 
 interface FirebaseRemoteConfigDataSource {
@@ -12,4 +13,5 @@ interface FirebaseRemoteConfigDataSource {
     suspend fun getTeamList(): List<TeamEntity>
     suspend fun getQrPassword(): String
     suspend fun shouldShowGuestButton(): Boolean
-}
+    suspend fun getVersionInfo(): VersionEntity
+}

data/src/main/java/com/yapp/data/datasource/FirebaseRemoteConfigDataSourceImpl.kt

@@ -3,9 +3,11 @@ package com.yapp.data.datasource
 import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.ktx.remoteConfig
 import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
+import com.yapp.data.BuildConfig
 import com.yapp.data.model.ConfigEntity
 import com.yapp.data.model.SessionEntity
 import com.yapp.data.model.TeamEntity
+import com.yapp.data.model.VersionEntity
 import com.yapp.domain.firebase.RemoteConfigData
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -19,7 +21,9 @@ import kotlin.coroutines.resumeWithException
 class FirebaseRemoteConfigDataSourceImpl @Inject constructor() : FirebaseRemoteConfigDataSource {
 
     private val firebaseRemoteConfig = Firebase.remoteConfig
-    private val configSettings = remoteConfigSettings { minimumFetchIntervalInSeconds = 3600 }
+    private val configSettings = remoteConfigSettings {
+        minimumFetchIntervalInSeconds = if (BuildConfig.DEBUG) 60 else 3600
+    }
 
     init {
         firebaseRemoteConfig.setDefaultsAsync(RemoteConfigData.defaultMaps)
@@ -107,4 +111,18 @@ class FirebaseRemoteConfigDataSourceImpl @Inject constructor() : FirebaseRemoteC
         }
     }
 
-}
+    override suspend fun getVersionInfo(): VersionEntity {
+        return suspendCancellableCoroutine { cancellableContinuation ->
+            firebaseRemoteConfig.fetchAndActivate().addOnSuccessListener {
+                val version = firebaseRemoteConfig.getString(RemoteConfigData.VersionInfo.key)
+                    .let { jsonString ->
+                        Json.decodeFromString<VersionEntity>(jsonString)
+                    }
+
+                cancellableContinuation.resume(version, null)
+            }.addOnFailureListener { exception ->
+                cancellableContinuation.resumeWithException(exception)
+            }
+        }
+    }
+}

data/src/main/java/com/yapp/data/model/VersionEntity.kt

@@ -0,0 +1,24 @@
+package com.yapp.data.model
+
+import com.yapp.domain.model.Version
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class VersionEntity(
+    @SerialName("min_version_code")
+    val minVersionCode: Long? = null,
+    @SerialName("max_version_code")
+    val maxVersionCode: Long? = null,
+    @SerialName("current_version")
+    val currentVersion: String? = null,
+)
+
+fun VersionEntity.toDomain(isAlreadyRequestVersionUpdate: Boolean): Version {
+    return Version(
+        isAlreadyRequestVersionUpdate = isAlreadyRequestVersionUpdate,
+        minVersionCode = minVersionCode!!,
+        maxVersionCode = maxVersionCode!!,
+        currentVersion = currentVersion!!
+    )
+}

data/src/main/java/com/yapp/data/repository/RemoteConfigRepositoryImpl.kt

@@ -4,10 +4,12 @@ import com.yapp.data.datasource.FirebaseRemoteConfigDataSource
 import com.yapp.data.model.ConfigEntity
 import com.yapp.data.model.SessionEntity
 import com.yapp.data.model.TeamEntity
+import com.yapp.data.model.VersionEntity
 import com.yapp.data.model.toDomain
 import com.yapp.domain.model.Config
 import com.yapp.domain.model.Session
 import com.yapp.domain.model.Team
+import com.yapp.domain.model.Version
 import com.yapp.domain.repository.RemoteConfigRepository
 import javax.inject.Inject
 
@@ -16,6 +18,8 @@ class RemoteConfigRepositoryImpl @Inject constructor(
     private val firebaseRemoteConfigDataSource: FirebaseRemoteConfigDataSource,
 ) : RemoteConfigRepository {
 
+    private var isAlreadyRequestUpdate = false
+
     override suspend fun getMaginotlineTime(): Result<String> {
         return runCatching {
             firebaseRemoteConfigDataSource.getMaginotlineTime()
@@ -94,4 +98,18 @@ class RemoteConfigRepositoryImpl @Inject constructor(
         )
     }
 
+    override suspend fun getVersionInfo(): Result<Version> {
+        return runCatching {
+            firebaseRemoteConfigDataSource.getVersionInfo()
+        }.fold(
+            onSuccess = { entity: VersionEntity ->
+                Result.success(entity.toDomain(isAlreadyRequestUpdate)).also {
+                    isAlreadyRequestUpdate = true
+                }
+            },
+            onFailure = { exception ->
+                Result.failure(exception)
+            }
+        )
+    }
 }

domain/src/main/java/com/yapp/domain/firebase/RemoteConfigData.kt

@@ -34,22 +34,28 @@ sealed class RemoteConfigData<T> {
         override val defaultValue: String = "fail"
     }
 
+    object VersionInfo : RemoteConfigData<String>() {
+        override val key: String = ATTENDANCE_VERSION_INFO
+        override val defaultValue: String = ""
+    }
+
     companion object {
         private const val ATTENDANCE_MAGINOTLINE_TIME = "attendance_maginotline_time"
         private const val ATTENDANCE_SESSION_LIST = "attendance_session_list"
         private const val ATTENDANCE_SELECT_TEAMS = "attendance_select_teams"
         private const val ATTENDANCE_CONFIG = "config"
         private const val ATTENDANCE_QR_PASSWORD = "attendance_qr_password"
         private const val SHOULD_SHOW_GUEST_BUTTON = "should_show_guest_button"
+        private const val ATTENDANCE_VERSION_INFO = "attendance_version"
 
         val defaultMaps = mapOf(
             MaginotlineTime.defaultValue to MaginotlineTime.key,
             SessionList.defaultValue to SessionList.key,
             AttendanceSelectTeams.defaultValue to AttendanceSelectTeams.key,
             Config.defaultValue to Config.key,
             QrPassword.defaultValue to QrPassword.key,
-            ShouldShowGuestButton.defaultValue to ShouldShowGuestButton.key
+            ShouldShowGuestButton.defaultValue to ShouldShowGuestButton.key,
+            VersionInfo.defaultValue to VersionInfo.key
         )
     }
-
 }

domain/src/main/java/com/yapp/domain/model/Version.kt

@@ -0,0 +1,8 @@
+package com.yapp.domain.model
+
+data class Version(
+    val isAlreadyRequestVersionUpdate: Boolean,
+    val minVersionCode: Long,
+    val maxVersionCode: Long,
+    val currentVersion: String,
+)

domain/src/main/java/com/yapp/domain/model/types/VersionType.kt

@@ -0,0 +1,7 @@
+package com.yapp.domain.model.types
+
+enum class VersionType {
+    NOT_REQUIRED,
+    REQUIRED,
+    UPDATED_BUT_NOT_REQUIRED
+}

domain/src/main/java/com/yapp/domain/repository/RemoteConfigRepository.kt

@@ -3,6 +3,7 @@ package com.yapp.domain.repository
 import com.yapp.domain.model.Config
 import com.yapp.domain.model.Session
 import com.yapp.domain.model.Team
+import com.yapp.domain.model.Version
 
 
 interface RemoteConfigRepository {
@@ -12,4 +13,5 @@ interface RemoteConfigRepository {
     suspend fun getTeamList(): Result<List<Team>>
     suspend fun getQrPassword(): Result<String>
     suspend fun shouldShowGuestButton(): Result<Boolean>
-}
+    suspend fun getVersionInfo(): Result<Version>
+}

domain/src/main/java/com/yapp/domain/usecases/CheckVersionUpdateUseCase.kt

@@ -0,0 +1,26 @@
+package com.yapp.domain.usecases
+
+import com.yapp.domain.model.types.VersionType
+import com.yapp.domain.repository.RemoteConfigRepository
+import javax.inject.Inject
+
+class CheckVersionUpdateUseCase @Inject constructor(
+    private val remoteConfigRepository: RemoteConfigRepository,
+) {
+
+    suspend operator fun invoke(currentVersionCode: Long): Result<VersionType> {
+        return remoteConfigRepository.getVersionInfo().mapCatching { version ->
+            val minVersionCode = version.minVersionCode
+            val maxVersionCode = version.maxVersionCode
+
+            return@mapCatching when {
+                currentVersionCode < minVersionCode -> VersionType.REQUIRED
+                currentVersionCode == maxVersionCode -> VersionType.NOT_REQUIRED
+                else -> {
+                    if (version.isAlreadyRequestVersionUpdate) VersionType.NOT_REQUIRED
+                    else VersionType.UPDATED_BUT_NOT_REQUIRED
+                }
+            }
+        }
+    }
+}

presentation/src/main/java/com/yapp/presentation/ui/AttendanceScreen.kt

@@ -24,6 +24,8 @@ import com.google.accompanist.insets.systemBarsPadding
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.yapp.common.theme.AttendanceTheme
 import com.yapp.common.yds.YDSToast
+import com.yapp.presentation.ui.MainContract.MainUiEvent
+import com.yapp.presentation.ui.MainContract.MainUiSideEffect
 import com.yapp.presentation.ui.admin.AdminConstants.KEY_LAST_SESSION_ID
 import com.yapp.presentation.ui.admin.AdminConstants.KEY_SESSION_ID
 import com.yapp.presentation.ui.admin.AdminConstants.KEY_SESSION_TITLE
@@ -56,11 +58,11 @@ fun AttendanceScreen(
     LaunchedEffect(key1 = viewModel.effect) {
         viewModel.effect.collect { effect ->
             when (effect) {
-                is MainContract.MainUiSideEffect.NavigateToQRScreen -> {
+                is MainUiSideEffect.NavigateToQRScreen -> {
                     navController.navigate(BottomNavigationItem.QR_AUTH.route)
                 }
 
-                is MainContract.MainUiSideEffect.ShowToast -> {
+                is MainUiSideEffect.ShowToast -> {
                     qrToastVisible = !qrToastVisible
                     delay(1000L)
                     qrToastVisible = !qrToastVisible
@@ -149,7 +151,7 @@ fun AttendanceScreen(
             MemberMain(
                 navigateToScreen = { route ->
                     if (route == AttendanceScreenRoute.QR_AUTH.route) {
-                        viewModel.setEvent(MainContract.MainUiEvent.OnClickQrAuthButton)
+                        viewModel.setEvent(MainUiEvent.OnClickQrAuthButton)
                     } else {
                         navController.navigate(route)
                     }

presentation/src/main/java/com/yapp/presentation/ui/MainViewModel.kt

@@ -4,6 +4,7 @@ import com.yapp.common.base.BaseViewModel
 import com.yapp.domain.usecases.CheckQrAuthTimeUseCase
 import com.yapp.presentation.R
 import com.yapp.presentation.common.AttendanceBundle
+import com.yapp.presentation.ui.MainContract.MainUiEvent
 import com.yapp.presentation.util.ResourceProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.coroutineScope
@@ -13,13 +14,13 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     private val resourcesProvider: ResourceProvider,
     private val checkQrAuthTime: CheckQrAuthTimeUseCase
-) : BaseViewModel<MainContract.MainUiState, MainContract.MainUiSideEffect, MainContract.MainUiEvent>(
+) : BaseViewModel<MainContract.MainUiState, MainContract.MainUiSideEffect, MainUiEvent>(
     MainContract.MainUiState()
 ) {
 
-    override suspend fun handleEvent(event: MainContract.MainUiEvent) {
+    override suspend fun handleEvent(event: MainUiEvent) {
         when (event) {
-            MainContract.MainUiEvent.OnClickQrAuthButton -> checkAttendanceValidate()
+            MainUiEvent.OnClickQrAuthButton -> checkAttendanceValidate()
         }
     }