Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/workflows/pr_checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 13 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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")
}

Expand Down Expand Up @@ -51,6 +52,7 @@ android {
}

dependencies {
implementation(projects.core.data)
implementation(projects.core.designsystem)
implementation(projects.core.domain)
implementation(projects.core.network)
Expand All @@ -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
}
66 changes: 24 additions & 42 deletions app/src/main/java/com/routee/android/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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<Unit> 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 = "기기 데이터 삭제 실패"
}
}
68 changes: 68 additions & 0 deletions app/src/main/java/com/routee/android/MainActivityViewModel.kt
Original file line number Diff line number Diff line change
@@ -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<Unit> = 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 = "업데이트, 점검 안내 설정 읽기 실패"
}
}
Original file line number Diff line number Diff line change
@@ -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,
)
67 changes: 67 additions & 0 deletions app/src/main/java/com/routee/android/ui/AppNoticeDialog.kt
Original file line number Diff line number Diff line change
@@ -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,
)
}
}
11 changes: 11 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,15 @@
<string name="tab_archive">아카이브</string>
<string name="tab_setting">설정</string>
<string name="tab_exit_toast">한 번 더 누르면 앱이 종료됩니다.</string>

<!-- 업데이트, 점검 안내 -->
<string name="app_notice_maintenance_title">서비스 점검 중이에요</string>
<string name="app_notice_maintenance_description">더 나은 루티를 위해 점검하고 있어요.\n잠시 후 다시 이용해주세요.</string>
<string name="app_notice_force_update_title">업데이트가 필요해요</string>
<string name="app_notice_force_update_description">더 안정적인 루티를 위해\n최신 버전으로 업데이트해주세요.</string>
<string name="app_notice_optional_update_title">새로운 버전이 나왔어요</string>
<string name="app_notice_optional_update_description">업데이트하고 더 편해진\n루티를 만나보세요.</string>
<string name="app_notice_update">업데이트</string>
<string name="app_notice_later">나중에</string>
<string name="app_notice_confirm">확인</string>
</resources>
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
3 changes: 3 additions & 0 deletions core/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
Loading
Loading