From f9c2ddac54c07235fe7043b697a3a8bdf6a22c40 Mon Sep 17 00:00:00 2001 From: seungjun Date: Tue, 10 Nov 2026 20:44:15 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[SETTING/#234]=20Firebase=20Remote=20Config?= =?UTF-8?q?=20=EC=9D=98=EC=A1=B4=EC=84=B1=EA=B3=BC=20=EC=95=B1=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=A0=95=EC=B1=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr_checker.yml | 29 +++++++++++++++++++++++++++++ app/build.gradle.kts | 14 +++++++++++++- build.gradle.kts | 1 + core/data/build.gradle.kts | 3 +++ gradle/libs.versions.toml | 14 ++++++++++++-- 5 files changed, 58 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_checker.yml b/.github/workflows/pr_checker.yml index 03d8ff72..7b5cd874 100644 --- a/.github/workflows/pr_checker.yml +++ b/.github/workflows/pr_checker.yml @@ -52,6 +52,35 @@ jobs: echo "naver.map.client.id=unused" } > local.properties + - name: Create CI Firebase config + run: | + cat > app/google-services.json <<'EOF' + { + "project_info": { "project_number": "000000000000", "project_id": "routee-ci" }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:000000000000:android:0000000000000000", + "android_client_info": { "package_name": "com.routee.android" } + }, + "oauth_client": [], + "api_key": [{ "current_key": "unused" }], + "services": { "appinvite_service": { "other_platform_oauth_client": [] } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:000000000000:android:0000000000000001", + "android_client_info": { "package_name": "com.routee.android.debug" } + }, + "oauth_client": [], + "api_key": [{ "current_key": "unused" }], + "services": { "appinvite_service": { "other_platform_oauth_client": [] } } + } + ], + "configuration_version": "1" + } + EOF + - name: Lint run: ./gradlew ktlintCheck diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 66b1acee..e54d02f0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,6 +3,7 @@ import com.routee.android.buildlogic.extension.requireLocalProperty plugins { alias(libs.plugins.routee.android.application.compose) alias(libs.plugins.routee.hilt) + alias(libs.plugins.google.services) } android { @@ -14,8 +15,8 @@ android { defaultConfig { applicationId = "com.routee.android" - versionCode = libs.versions.versionCode.get().toInt() versionName = libs.versions.versionName.get() + versionCode = versionCodeOf(libs.versions.versionName.get(), libs.versions.versionBuild.get().toInt()) manifestPlaceholders["naverMapClientId"] = requireLocalProperty("naver.map.client.id") } @@ -51,6 +52,7 @@ android { } dependencies { + implementation(projects.core.data) implementation(projects.core.designsystem) implementation(projects.core.domain) implementation(projects.core.network) @@ -75,8 +77,18 @@ dependencies { implementation(libs.androidx.activity.compose) implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.timber) testImplementation(libs.junit) androidTestImplementation(libs.bundles.android.test) debugImplementation(libs.androidx.compose.ui.test.manifest) } + +fun versionCodeOf(versionName: String, build: Int): Int { + val parts = versionName.split(".").map { it.toInt() } + require(parts.size == 3 && parts.drop(1).all { it < 100 } && build < 100) { + "versionName은 x.y.z, y, z, versionBuild는 99 이하: $versionName, $build" + } + val (major, minor, patch) = parts + return major * 1_000_000 + minor * 10_000 + patch * 100 + build +} diff --git a/build.gradle.kts b/build.gradle.kts index 1f972d92..6390ff3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,4 +8,5 @@ plugins { alias(libs.plugins.hilt) apply false alias(libs.plugins.ktlint) apply false alias(libs.plugins.room) apply false + alias(libs.plugins.google.services) apply false } diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts index 3a96d883..35293bf7 100644 --- a/core/data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -26,9 +26,12 @@ dependencies { implementation(libs.androidx.datastore.preferences) implementation(libs.play.services.location) + implementation(libs.kotlinx.coroutines.play.services) implementation(libs.androidx.core.location.altitude) implementation(libs.androidx.exifinterface) implementation(libs.coil) + implementation(platform(libs.firebase.bom)) + implementation(libs.firebase.config) testImplementation(libs.junit) testImplementation(libs.kotlinx.coroutines.test) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1b644fed..d57b3754 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,8 +4,8 @@ compileSdk = "37" minSdk = "26" targetSdk = "37" jvmTarget = "17" -versionCode = "1" -versionName = "1.0" +versionName = "1.0.0" +versionBuild = "0" # Build agp = "9.4.1" @@ -49,6 +49,10 @@ androidxHilt = "1.4.0" # Logging timber = "5.0.1" +# Firebase +googleServices = "4.5.0" +firebaseBom = "35.1.0" + # Kotlin kotlinxCollectionsImmutable = "0.5.2" @@ -96,6 +100,7 @@ androidx-compose-material3 = { group = "androidx.compose.material3", name = "mat # Kotlinx kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } +kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "coroutines" } # Network retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } @@ -133,6 +138,10 @@ naver-map-sdk = { group = "com.naver.maps", name = "map-sdk", version.ref = "nav play-services-location = { group = "com.google.android.gms", name = "play-services-location", version.ref = "playServicesLocation" } androidx-core-location-altitude = { group = "androidx.core", name = "core-location-altitude", version.ref = "coreLocationAltitude" } +# Firebase +firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" } +firebase-config = { group = "com.google.firebase", name = "firebase-config" } + # Logging timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" } @@ -186,6 +195,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } room = { id = "androidx.room", version.ref = "room" } +google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" } # build-logic routee-android-application = { id = "routee.android.application", version = "unspecified" } From 7ff55b3cd4703d79e653eefcc1e6f7564789d3f3 Mon Sep 17 00:00:00 2001 From: seungjun Date: Tue, 10 Nov 2026 20:44:15 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[ADD/#234]=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8,=20=EC=A0=90=EA=B2=80=20=EC=95=88=EB=82=B4=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=AA=A8=EB=8D=B8=EA=B3=BC=20Remote=20Con?= =?UTF-8?q?fig=20DTO=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/data/appnotice/model/AppNotice.kt | 30 +++++++++++ .../data/appnotice/model/AppNoticeConfig.kt | 27 ++++++++++ .../core/data/appnotice/model/AppVersion.kt | 34 ++++++++++++ .../remote/dto/response/AppNoticeResponse.kt | 54 +++++++++++++++++++ .../appnotice/model/AppNoticeConfigTest.kt | 48 +++++++++++++++++ .../appnotice/remote/AppNoticeResponseTest.kt | 40 ++++++++++++++ 6 files changed, 233 insertions(+) create mode 100644 core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNotice.kt create mode 100644 core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNoticeConfig.kt create mode 100644 core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppVersion.kt create mode 100644 core/data/src/main/java/com/routee/android/core/data/appnotice/remote/dto/response/AppNoticeResponse.kt create mode 100644 core/data/src/test/java/com/routee/android/core/data/appnotice/model/AppNoticeConfigTest.kt create mode 100644 core/data/src/test/java/com/routee/android/core/data/appnotice/remote/AppNoticeResponseTest.kt diff --git a/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNotice.kt b/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNotice.kt new file mode 100644 index 00000000..44232b47 --- /dev/null +++ b/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNotice.kt @@ -0,0 +1,30 @@ +package com.routee.android.core.data.appnotice.model + +/** + * 앱 시작 시 띄우는 안내. [title], [message]가 null 이면 앱 기본 문구 + */ +sealed interface AppNotice { + val title: String? + val message: String? + + /** true 이면 앱을 쓸 수 없음 (점검, 강제 업데이트) */ + val blocksApp: Boolean get() = this is Maintenance || this is ForceUpdate + + /** 서비스 점검 */ + data class Maintenance( + override val title: String? = null, + override val message: String? = null, + ) : AppNotice + + /** 강제 업데이트 */ + data class ForceUpdate( + override val title: String? = null, + override val message: String? = null, + ) : AppNotice + + /** 권장 업데이트 */ + data class OptionalUpdate( + override val title: String? = null, + override val message: String? = null, + ) : AppNotice +} diff --git a/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNoticeConfig.kt b/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNoticeConfig.kt new file mode 100644 index 00000000..c36cbd9c --- /dev/null +++ b/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppNoticeConfig.kt @@ -0,0 +1,27 @@ +package com.routee.android.core.data.appnotice.model + +/** + * 업데이트, 점검 안내 설정 (Remote Config android_app_notice) + * + * @param maintenance null 이면 점검 아님 + * @param minimumVersion 이보다 낮으면 강제 업데이트. null 이면 확인 안 함 + * @param latestVersion 이보다 낮으면 권장 업데이트. null 이면 확인 안 함 + */ +data class AppNoticeConfig( + val maintenance: AppNotice.Maintenance? = null, + val minimumVersion: AppVersion? = null, + val forceUpdate: AppNotice.ForceUpdate = AppNotice.ForceUpdate(), + val latestVersion: AppVersion? = null, + val optionalUpdate: AppNotice.OptionalUpdate = AppNotice.OptionalUpdate(), +) { + /** 앱 버전에 맞는 안내. 점검 > 강제 > 권장, 없으면 null */ + fun noticeFor(appVersion: String): AppNotice? { + if (maintenance != null) return maintenance + val current = AppVersion.parse(appVersion) ?: return null + return when { + minimumVersion != null && current < minimumVersion -> forceUpdate + latestVersion != null && current < latestVersion -> optionalUpdate + else -> null + } + } +} diff --git a/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppVersion.kt b/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppVersion.kt new file mode 100644 index 00000000..aee298df --- /dev/null +++ b/core/data/src/main/java/com/routee/android/core/data/appnotice/model/AppVersion.kt @@ -0,0 +1,34 @@ +package com.routee.android.core.data.appnotice.model + +/** + * 앱 버전 (major.minor.patch) + */ +data class AppVersion( + val major: Int, + val minor: Int, + val patch: Int, +) : Comparable { + override fun compareTo(other: AppVersion): Int = + compareValuesBy(this, other, AppVersion::major, AppVersion::minor, AppVersion::patch) + + companion object { + /** + * 문자열을 버전으로 변환 + * + * @param value "1.2.3" 형식. 빠진 자리는 0 ("1.0" = 1.0.0) + * @return 숫자가 아니거나 자리가 넘치면 null + */ + fun parse(value: String): AppVersion? { + val parts = value.trim().split(".") + if (parts.size > 3 || !parts.all { it.isNumber() }) return null + val numbers = parts.map { it.toIntOrNull() ?: return null } + return AppVersion( + major = numbers[0], + minor = numbers.getOrElse(1) { 0 }, + patch = numbers.getOrElse(2) { 0 }, + ) + } + + private fun String.isNumber(): Boolean = isNotEmpty() && all { it in '0'..'9' } + } +} diff --git a/core/data/src/main/java/com/routee/android/core/data/appnotice/remote/dto/response/AppNoticeResponse.kt b/core/data/src/main/java/com/routee/android/core/data/appnotice/remote/dto/response/AppNoticeResponse.kt new file mode 100644 index 00000000..bd2788af --- /dev/null +++ b/core/data/src/main/java/com/routee/android/core/data/appnotice/remote/dto/response/AppNoticeResponse.kt @@ -0,0 +1,54 @@ +package com.routee.android.core.data.appnotice.remote.dto.response + +import com.routee.android.core.data.appnotice.model.AppNotice +import com.routee.android.core.data.appnotice.model.AppNoticeConfig +import com.routee.android.core.data.appnotice.model.AppVersion +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +// Remote Config android_app_notice 값. 빠진 필드는 기본값 +@Serializable +internal data class AppNoticeResponse( + @SerialName("maintenance") val maintenance: MaintenanceResponse? = null, + @SerialName("forceUpdate") val forceUpdate: ForceUpdateResponse? = null, + @SerialName("optionalUpdate") val optionalUpdate: OptionalUpdateResponse? = null, +) + +@Serializable +internal data class MaintenanceResponse( + @SerialName("enabled") val enabled: Boolean = false, + @SerialName("title") val title: String? = null, + @SerialName("message") val message: String? = null, +) + +@Serializable +internal data class ForceUpdateResponse( + @SerialName("minimumVersion") val minimumVersion: String? = null, + @SerialName("title") val title: String? = null, + @SerialName("message") val message: String? = null, +) + +@Serializable +internal data class OptionalUpdateResponse( + @SerialName("latestVersion") val latestVersion: String? = null, + @SerialName("title") val title: String? = null, + @SerialName("message") val message: String? = null, +) + +internal fun AppNoticeResponse.toAppNoticeConfig(): AppNoticeConfig = AppNoticeConfig( + maintenance = maintenance?.takeIf { it.enabled }?.let { + AppNotice.Maintenance(title = it.title.orNullIfBlank(), message = it.message.orNullIfBlank()) + }, + minimumVersion = forceUpdate?.minimumVersion?.let(AppVersion::parse), + forceUpdate = AppNotice.ForceUpdate( + title = forceUpdate?.title.orNullIfBlank(), + message = forceUpdate?.message.orNullIfBlank(), + ), + latestVersion = optionalUpdate?.latestVersion?.let(AppVersion::parse), + optionalUpdate = AppNotice.OptionalUpdate( + title = optionalUpdate?.title.orNullIfBlank(), + message = optionalUpdate?.message.orNullIfBlank(), + ), +) + +private fun String?.orNullIfBlank(): String? = this?.takeIf { it.isNotBlank() } diff --git a/core/data/src/test/java/com/routee/android/core/data/appnotice/model/AppNoticeConfigTest.kt b/core/data/src/test/java/com/routee/android/core/data/appnotice/model/AppNoticeConfigTest.kt new file mode 100644 index 00000000..842093a4 --- /dev/null +++ b/core/data/src/test/java/com/routee/android/core/data/appnotice/model/AppNoticeConfigTest.kt @@ -0,0 +1,48 @@ +package com.routee.android.core.data.appnotice.model + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class AppNoticeConfigTest { + @Test + fun `빠진 자리는 0으로 읽고 형식이 틀리면 null`() { + assertEquals(AppVersion(1, 0, 0), AppVersion.parse("1.0")) + assertEquals(AppVersion(1, 2, 3), AppVersion.parse(" 1.2.3 ")) + assertNull(AppVersion.parse("1.0.0-qa")) + assertNull(AppVersion.parse("")) + assertNull(AppVersion.parse("1.2.x")) + assertNull(AppVersion.parse("1.2.3.4")) + assertNull(AppVersion.parse("-1.0.0")) + } + + @Test + fun `자리마다 숫자로 비교`() { + assertTrue(AppVersion(1, 9, 0) < AppVersion(1, 10, 0)) + assertTrue(AppVersion(2, 0, 0) > AppVersion(1, 99, 99)) + } + + @Test + fun `점검이 버전보다 먼저`() { + val config = AppNoticeConfig( + maintenance = AppNotice.Maintenance(), + minimumVersion = AppVersion(9, 0, 0), + ) + assertEquals(AppNotice.Maintenance(), config.noticeFor("1.0.0")) + } + + @Test + fun `최소 버전보다 낮으면 강제, 최신 버전보다 낮으면 권장`() { + val config = AppNoticeConfig(minimumVersion = AppVersion(1, 1, 0), latestVersion = AppVersion(1, 2, 0)) + assertEquals(AppNotice.ForceUpdate(), config.noticeFor("1.0.9")) + assertEquals(AppNotice.OptionalUpdate(), config.noticeFor("1.1.0")) + assertNull(config.noticeFor("1.2.0")) + } + + @Test + fun `설정이 비었거나 앱 버전을 못 읽으면 안내 없음`() { + assertNull(AppNoticeConfig().noticeFor("1.0")) + assertNull(AppNoticeConfig(minimumVersion = AppVersion(9, 0, 0)).noticeFor("dev")) + } +} diff --git a/core/data/src/test/java/com/routee/android/core/data/appnotice/remote/AppNoticeResponseTest.kt b/core/data/src/test/java/com/routee/android/core/data/appnotice/remote/AppNoticeResponseTest.kt new file mode 100644 index 00000000..e76ea798 --- /dev/null +++ b/core/data/src/test/java/com/routee/android/core/data/appnotice/remote/AppNoticeResponseTest.kt @@ -0,0 +1,40 @@ +package com.routee.android.core.data.appnotice.remote + +import com.routee.android.core.data.appnotice.model.AppNotice +import com.routee.android.core.data.appnotice.model.AppNoticeConfig +import com.routee.android.core.data.appnotice.model.AppVersion +import com.routee.android.core.data.appnotice.remote.dto.response.AppNoticeResponse +import com.routee.android.core.data.appnotice.remote.dto.response.toAppNoticeConfig +import kotlinx.serialization.json.Json +import org.junit.Assert.assertEquals +import org.junit.Test + +class AppNoticeResponseTest { + private val json = Json { ignoreUnknownKeys = true } + + private fun parse(value: String): AppNoticeConfig = + json.decodeFromString(value).toAppNoticeConfig() + + @Test + fun `필요한 필드만 넣으면 나머지는 기본값`() { + val config = parse("""{"optionalUpdate":{"latestVersion":"1.2.0"}}""") + assertEquals(AppNoticeConfig(latestVersion = AppVersion(1, 2, 0)), config) + } + + @Test + fun `점검이 꺼져 있으면 문구가 있어도 점검 아님, 빈 문구는 앱 기본 문구`() { + val config = parse( + """ + { + "maintenance": { "enabled": false, "message": "점검" }, + "forceUpdate": { "minimumVersion": "1.x", "title": " ", "message": "안내\n문구" }, + "unknown": 1 + } + """, + ) + assertEquals( + AppNoticeConfig(forceUpdate = AppNotice.ForceUpdate(title = null, message = "안내\n문구")), + config, + ) + } +} From 9725a88d503e5c75b0d252314cab20d77456cc89 Mon Sep 17 00:00:00 2001 From: seungjun Date: Tue, 10 Nov 2026 20:44:15 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[FEAT/#234]=20Remote=20Config=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EC=84=A4=EC=A0=95=20=EC=A0=80=EC=9E=A5=EC=86=8C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/AppNoticeRepository.kt | 11 +++++ .../repository/AppNoticeRepositoryImpl.kt | 49 +++++++++++++++++++ .../android/core/data/di/AppNoticeModule.kt | 17 +++++++ 3 files changed, 77 insertions(+) create mode 100644 core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepository.kt create mode 100644 core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepositoryImpl.kt create mode 100644 core/data/src/main/java/com/routee/android/core/data/di/AppNoticeModule.kt diff --git a/core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepository.kt b/core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepository.kt new file mode 100644 index 00000000..5faa168b --- /dev/null +++ b/core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepository.kt @@ -0,0 +1,11 @@ +package com.routee.android.core.data.appnotice.repository + +import com.routee.android.core.data.appnotice.model.AppNoticeConfig + +/** + * 업데이트, 점검 안내 설정 저장소 (Firebase Remote Config) + */ +interface AppNoticeRepository { + /** 받아오기가 실패하거나 늦으면 마지막으로 받은 값, 처음이면 빈 설정. 값을 읽지 못하면 실패 */ + suspend fun getAppNoticeConfig(): Result +} diff --git a/core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepositoryImpl.kt b/core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepositoryImpl.kt new file mode 100644 index 00000000..03bdbcea --- /dev/null +++ b/core/data/src/main/java/com/routee/android/core/data/appnotice/repository/AppNoticeRepositoryImpl.kt @@ -0,0 +1,49 @@ +package com.routee.android.core.data.appnotice.repository + +import com.google.firebase.Firebase +import com.google.firebase.remoteconfig.FirebaseRemoteConfig +import com.google.firebase.remoteconfig.remoteConfig +import com.google.firebase.remoteconfig.remoteConfigSettings +import com.routee.android.core.common.util.suspendRunCatching +import com.routee.android.core.data.BuildConfig +import com.routee.android.core.data.appnotice.model.AppNoticeConfig +import com.routee.android.core.data.appnotice.remote.dto.response.AppNoticeResponse +import com.routee.android.core.data.appnotice.remote.dto.response.toAppNoticeConfig +import javax.inject.Inject +import kotlin.time.Duration.Companion.seconds +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.tasks.await +import kotlinx.coroutines.withContext +import kotlinx.coroutines.withTimeout +import kotlinx.serialization.json.Json + +internal class AppNoticeRepositoryImpl @Inject constructor( + private val json: Json, +) : AppNoticeRepository { + override suspend fun getAppNoticeConfig(): Result = withContext(Dispatchers.IO) { + suspendRunCatching { + val remoteConfig = Firebase.remoteConfig + refreshRemoteConfig(remoteConfig) + val value = remoteConfig.getString(KEY_APP_NOTICE) + if (value.isBlank()) return@suspendRunCatching AppNoticeConfig() + json.decodeFromString(value).toAppNoticeConfig() + } + } + + private suspend fun refreshRemoteConfig(remoteConfig: FirebaseRemoteConfig) { + suspendRunCatching { + withTimeout(FETCH_TIMEOUT) { + remoteConfig.setConfigSettingsAsync(FETCH_SETTINGS).await() + remoteConfig.fetchAndActivate().await() + } + } + } + + private companion object { + const val KEY_APP_NOTICE = "android_app_notice" + val FETCH_TIMEOUT = 3.seconds + val FETCH_SETTINGS = remoteConfigSettings { + minimumFetchIntervalInSeconds = if (BuildConfig.DEBUG) 0L else 3_600L + } + } +} diff --git a/core/data/src/main/java/com/routee/android/core/data/di/AppNoticeModule.kt b/core/data/src/main/java/com/routee/android/core/data/di/AppNoticeModule.kt new file mode 100644 index 00000000..eb9de82b --- /dev/null +++ b/core/data/src/main/java/com/routee/android/core/data/di/AppNoticeModule.kt @@ -0,0 +1,17 @@ +package com.routee.android.core.data.di + +import com.routee.android.core.data.appnotice.repository.AppNoticeRepository +import com.routee.android.core.data.appnotice.repository.AppNoticeRepositoryImpl +import dagger.Binds +import dagger.Module +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +internal abstract class AppNoticeModule { + @Binds + @Singleton + abstract fun bindAppNoticeRepository(impl: AppNoticeRepositoryImpl): AppNoticeRepository +} From ed60acd7bb573c3a222c77f72ad5e927ffb384c9 Mon Sep 17 00:00:00 2001 From: seungjun Date: Tue, 10 Nov 2026 20:44:15 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[FEAT/#234]=20=EB=8B=A4=EC=9D=B4=EC=96=BC?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EB=B0=94=EA=B9=A5=20=EC=98=81=EC=97=AD=20?= =?UTF-8?q?=ED=83=AD=20=EB=AC=B4=EC=8B=9C=20=EC=98=B5=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designsystem/component/dialog/RouteeButtonDialog.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/designsystem/src/main/java/com/routee/android/core/designsystem/component/dialog/RouteeButtonDialog.kt b/core/designsystem/src/main/java/com/routee/android/core/designsystem/component/dialog/RouteeButtonDialog.kt index 74ce3243..73bff9ea 100644 --- a/core/designsystem/src/main/java/com/routee/android/core/designsystem/component/dialog/RouteeButtonDialog.kt +++ b/core/designsystem/src/main/java/com/routee/android/core/designsystem/component/dialog/RouteeButtonDialog.kt @@ -27,6 +27,7 @@ import com.routee.android.core.designsystem.theme.RouteeTheme * @param onButtonClick 버튼 탭 시 호출. 닫기는 호출하는 쪽에서 * @param onDismissRequest 뒤로가기, 바깥 영역 탭 시 호출 * @param description 제목 아래 설명. null 이면 숨김 + * @param dismissOnDimClick false 이면 바깥 영역 탭 무시 */ @Composable fun RouteeOneButtonDialog( @@ -36,11 +37,13 @@ fun RouteeOneButtonDialog( onDismissRequest: () -> Unit, modifier: Modifier = Modifier, description: String? = null, + dismissOnDimClick: Boolean = true, ) { RouteeDialogContainer( onDismissRequest = onDismissRequest, contentPadding = PaddingValues(RouteeTheme.spacing.Spacing24), modifier = modifier, + dismissOnDimClick = dismissOnDimClick, ) { OneButtonDialogContent( title = title, @@ -64,6 +67,7 @@ fun RouteeOneButtonDialog( * @param description 제목 아래 설명. null 이면 숨김 * @param leftButtonContentColor 왼쪽 버튼 글자색 * @param rightButtonContentColor 오른쪽 버튼 글자색 + * @param dismissOnDimClick false 이면 바깥 영역 탭 무시 */ @Composable fun RouteeTwoButtonDialog( @@ -76,11 +80,13 @@ fun RouteeTwoButtonDialog( description: String? = null, leftButtonContentColor: Color = RouteeTheme.colors.white, rightButtonContentColor: Color = RouteeTheme.colors.statusError, + dismissOnDimClick: Boolean = true, ) { RouteeDialogContainer( onDismissRequest = onDismissRequest, contentPadding = PaddingValues(RouteeTheme.spacing.Spacing24), modifier = modifier, + dismissOnDimClick = dismissOnDimClick, ) { TwoButtonDialogContent( title = title, From 0359e9606094742f637e76b8078992c97638979b Mon Sep 17 00:00:00 2001 From: seungjun Date: Tue, 10 Nov 2026 20:44:16 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[FEAT/#234]=20=EC=95=B1=20=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=20=EC=8B=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8,?= =?UTF-8?q?=20=EC=A0=90=EA=B2=80=20=EC=95=88=EB=82=B4=20=EB=AA=A8=EB=8B=AC?= =?UTF-8?q?=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/routee/android/MainActivity.kt | 66 +++++++----------- .../routee/android/MainActivityViewModel.kt | 68 +++++++++++++++++++ .../android/model/MainActivityUiState.kt | 11 +++ .../com/routee/android/ui/AppNoticeDialog.kt | 67 ++++++++++++++++++ app/src/main/res/values/strings.xml | 11 +++ .../routee/android/core/ui/link/RouteeLink.kt | 2 + 6 files changed, 183 insertions(+), 42 deletions(-) create mode 100644 app/src/main/java/com/routee/android/MainActivityViewModel.kt create mode 100644 app/src/main/java/com/routee/android/model/MainActivityUiState.kt create mode 100644 app/src/main/java/com/routee/android/ui/AppNoticeDialog.kt diff --git a/app/src/main/java/com/routee/android/MainActivity.kt b/app/src/main/java/com/routee/android/MainActivity.kt index f9f5818f..0599a1e2 100644 --- a/app/src/main/java/com/routee/android/MainActivity.kt +++ b/app/src/main/java/com/routee/android/MainActivity.kt @@ -6,69 +6,51 @@ import androidx.activity.ComponentActivity import androidx.activity.SystemBarStyle import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge +import androidx.activity.viewModels import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalUriHandler import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen -import androidx.lifecycle.lifecycleScope -import androidx.navigation3.runtime.NavKey +import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.routee.android.core.designsystem.theme.RouteeTheme -import com.routee.android.core.domain.auth.ClearDeviceDataUseCase -import com.routee.android.core.network.session.AuthSessionManager -import com.routee.android.feature.onboarding.api.LoginNavKey -import com.routee.android.feature.workout.api.WorkoutMainNavKey +import com.routee.android.core.ui.link.RouteeLink +import com.routee.android.core.ui.link.tryOpenUri +import com.routee.android.ui.AppNoticeDialog import com.routee.android.ui.RouteeApp import com.routee.android.util.lockPortraitOnPhone import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.launch -import timber.log.Timber @AndroidEntryPoint class MainActivity : ComponentActivity() { - @Inject - lateinit var authSessionManager: AuthSessionManager - - @Inject - lateinit var clearDeviceData: ClearDeviceDataUseCase - - // 로그인 세션을 확인하기 전에는 null, 그동안 스플래시 유지 - private var startKey: NavKey? by mutableStateOf(null) - - private val sessionExpired: Flow by lazy { - authSessionManager.sessionExpired.onEach { clearDeviceData().onFailure { Timber.e(it, DATA_CLEAR_FAILED) } } - } + private val viewModel: MainActivityViewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { val splashScreen = installSplashScreen() super.onCreate(savedInstanceState) - splashScreen.setKeepOnScreenCondition { startKey == null } + splashScreen.setKeepOnScreenCondition { viewModel.uiState.value.startKey == null } lockPortraitOnPhone() enableEdgeToEdge( statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT), navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT), ) - decideStartKey() setContent { + val uiState by viewModel.uiState.collectAsStateWithLifecycle() + val uriHandler = LocalUriHandler.current RouteeTheme { - startKey?.let { RouteeApp(startKey = it, sessionExpired = sessionExpired) } + if (uiState.appNotice?.blocksApp != true) { + uiState.startKey?.let { RouteeApp(startKey = it, sessionExpired = viewModel.sessionExpired) } + } + uiState.appNotice?.let { notice -> + AppNoticeDialog( + notice = notice, + onUpdateClick = { + uriHandler.tryOpenUri(RouteeLink.PLAY_STORE_APP.url) || + uriHandler.tryOpenUri(RouteeLink.PLAY_STORE.url) + }, + onDismissRequest = viewModel::dismissAppNotice, + onExitRequest = ::finish, + ) + } } } } - - // 토큰이 없으면 로그인, 있으면 운동 메인 (진행 중인 기록은 운동 메인이 기록 화면으로 보냄) - private fun decideStartKey() { - lifecycleScope.launch { - val hasSession = authSessionManager.hasSession() - // 로그아웃, 탈퇴 직후 삭제가 실패했거나 앱이 종료돼 남은 데이터 정리 - if (!hasSession) clearDeviceData().onFailure { Timber.e(it, DATA_CLEAR_FAILED) } - startKey = if (hasSession) WorkoutMainNavKey else LoginNavKey() - } - } - - private companion object { - const val DATA_CLEAR_FAILED = "기기 데이터 삭제 실패" - } } diff --git a/app/src/main/java/com/routee/android/MainActivityViewModel.kt b/app/src/main/java/com/routee/android/MainActivityViewModel.kt new file mode 100644 index 00000000..98cb7262 --- /dev/null +++ b/app/src/main/java/com/routee/android/MainActivityViewModel.kt @@ -0,0 +1,68 @@ +package com.routee.android + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import androidx.navigation3.runtime.NavKey +import com.routee.android.core.data.appnotice.model.AppNotice +import com.routee.android.core.data.appnotice.repository.AppNoticeRepository +import com.routee.android.core.domain.auth.ClearDeviceDataUseCase +import com.routee.android.core.network.session.AuthSessionManager +import com.routee.android.feature.onboarding.api.LoginNavKey +import com.routee.android.feature.workout.api.WorkoutMainNavKey +import com.routee.android.model.MainActivityUiState +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject +import kotlinx.coroutines.async +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import timber.log.Timber + +@HiltViewModel +internal class MainActivityViewModel @Inject constructor( + private val authSessionManager: AuthSessionManager, + private val clearDeviceData: ClearDeviceDataUseCase, + private val appNoticeRepository: AppNoticeRepository, +) : ViewModel() { + private val _uiState = MutableStateFlow(MainActivityUiState()) + val uiState = _uiState.asStateFlow() + + val sessionExpired: Flow = authSessionManager.sessionExpired + .onEach { clearDeviceData().onFailure { Timber.e(it, DATA_CLEAR_FAILED) } } + + init { + loadStart() + } + + fun dismissAppNotice() = _uiState.update { it.copy(appNotice = null) } + + private fun loadStart() { + viewModelScope.launch { + val notice = async { loadAppNotice() } + val startKey = decideStartKey() + _uiState.update { it.copy(startKey = startKey, appNotice = notice.await()) } + } + } + + // 토큰이 없으면 로그인, 있으면 운동 메인 (진행 중인 기록은 운동 메인이 기록 화면으로 보냄) + private suspend fun decideStartKey(): NavKey { + val hasSession = authSessionManager.hasSession() + // 로그아웃, 탈퇴 직후 삭제가 실패했거나 앱이 종료돼 남은 데이터 정리 + if (!hasSession) clearDeviceData().onFailure { Timber.e(it, DATA_CLEAR_FAILED) } + return if (hasSession) WorkoutMainNavKey else LoginNavKey() + } + + private suspend fun loadAppNotice(): AppNotice? = + appNoticeRepository.getAppNoticeConfig() + .onFailure { Timber.w(it, APP_NOTICE_LOAD_FAILED) } + .getOrNull() + ?.noticeFor(BuildConfig.VERSION_NAME) + + private companion object { + const val DATA_CLEAR_FAILED = "기기 데이터 삭제 실패" + const val APP_NOTICE_LOAD_FAILED = "업데이트, 점검 안내 설정 읽기 실패" + } +} diff --git a/app/src/main/java/com/routee/android/model/MainActivityUiState.kt b/app/src/main/java/com/routee/android/model/MainActivityUiState.kt new file mode 100644 index 00000000..3a88439a --- /dev/null +++ b/app/src/main/java/com/routee/android/model/MainActivityUiState.kt @@ -0,0 +1,11 @@ +package com.routee.android.model + +import androidx.compose.runtime.Immutable +import androidx.navigation3.runtime.NavKey +import com.routee.android.core.data.appnotice.model.AppNotice + +@Immutable +internal data class MainActivityUiState( + val startKey: NavKey? = null, // null 이면 확인 중, 그동안 스플래시 유지 + val appNotice: AppNotice? = null, +) diff --git a/app/src/main/java/com/routee/android/ui/AppNoticeDialog.kt b/app/src/main/java/com/routee/android/ui/AppNoticeDialog.kt new file mode 100644 index 00000000..1b9a81cb --- /dev/null +++ b/app/src/main/java/com/routee/android/ui/AppNoticeDialog.kt @@ -0,0 +1,67 @@ +package com.routee.android.ui + +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import com.routee.android.R +import com.routee.android.core.data.appnotice.model.AppNotice +import com.routee.android.core.designsystem.component.dialog.RouteeOneButtonDialog +import com.routee.android.core.designsystem.component.dialog.RouteeTwoButtonDialog +import com.routee.android.core.designsystem.theme.RouteeTheme + +// TODO P1 기획: 업데이트, 점검 모달 문구와 점검 중 앱 사용 여부 확인 + +/** + * 업데이트, 점검 안내 다이얼로그. 바깥 영역 탭은 무시 + * + * @param notice 띄울 안내. 제목, 설명이 null 이면 앱 기본 문구 + * @param onUpdateClick [업데이트] 탭 시 호출 + * @param onDismissRequest 권장 업데이트 [나중에], 뒤로가기 시 호출 + * @param onExitRequest 점검 [확인], 점검과 강제 업데이트에서 뒤로가기 시 호출 + */ +@Composable +internal fun AppNoticeDialog( + notice: AppNotice, + onUpdateClick: () -> Unit, + onDismissRequest: () -> Unit, + onExitRequest: () -> Unit, + modifier: Modifier = Modifier, +) { + when (notice) { + is AppNotice.Maintenance -> RouteeOneButtonDialog( + title = notice.title ?: stringResource(R.string.app_notice_maintenance_title), + buttonText = stringResource(R.string.app_notice_confirm), + onButtonClick = onExitRequest, + onDismissRequest = onExitRequest, + modifier = modifier, + description = notice.message ?: stringResource(R.string.app_notice_maintenance_description), + dismissOnDimClick = false, + ) + + is AppNotice.ForceUpdate -> RouteeOneButtonDialog( + title = notice.title ?: stringResource(R.string.app_notice_force_update_title), + buttonText = stringResource(R.string.app_notice_update), + onButtonClick = onUpdateClick, + onDismissRequest = onExitRequest, + modifier = modifier, + description = notice.message ?: stringResource(R.string.app_notice_force_update_description), + dismissOnDimClick = false, + ) + + is AppNotice.OptionalUpdate -> RouteeTwoButtonDialog( + title = notice.title ?: stringResource(R.string.app_notice_optional_update_title), + leftButtonText = stringResource(R.string.app_notice_later), + rightButtonText = stringResource(R.string.app_notice_update), + onRightButtonClick = { + onUpdateClick() + onDismissRequest() + }, + onDismissRequest = onDismissRequest, + modifier = modifier, + description = notice.message ?: stringResource(R.string.app_notice_optional_update_description), + leftButtonContentColor = RouteeTheme.colors.white60, + rightButtonContentColor = RouteeTheme.colors.white, + dismissOnDimClick = false, + ) + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cee8b396..267fc5c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,4 +6,15 @@ 아카이브 설정 한 번 더 누르면 앱이 종료됩니다. + + + 서비스 점검 중이에요 + 더 나은 루티를 위해 점검하고 있어요.\n잠시 후 다시 이용해주세요. + 업데이트가 필요해요 + 더 안정적인 루티를 위해\n최신 버전으로 업데이트해주세요. + 새로운 버전이 나왔어요 + 업데이트하고 더 편해진\n루티를 만나보세요. + 업데이트 + 나중에 + 확인 diff --git a/core/ui/src/main/java/com/routee/android/core/ui/link/RouteeLink.kt b/core/ui/src/main/java/com/routee/android/core/ui/link/RouteeLink.kt index 5d4e0db3..5dff0483 100644 --- a/core/ui/src/main/java/com/routee/android/core/ui/link/RouteeLink.kt +++ b/core/ui/src/main/java/com/routee/android/core/ui/link/RouteeLink.kt @@ -11,4 +11,6 @@ enum class RouteeLink(val url: String) { KAKAO_CHANNEL_APP("kakaoplus://plusfriend/home/_ExkxgSX"), KAKAO_CHANNEL("https://pf.kakao.com/_ExkxgSX"), CONTACT_EMAIL("mailto:routee.ask@gmail.com"), + PLAY_STORE_APP("market://details?id=com.routee.android"), + PLAY_STORE("https://play.google.com/store/apps/details?id=com.routee.android"), }