Skip to content

Commit f60905c

Browse files
committed
Merge branch 'dev'
2 parents 9bf50cb + 2b91aa7 commit f60905c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

app/src/main/java/com/project200/undabang/main/MainActivity.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationController {
7070
checkNotificationPermission()
7171

7272
setupObservers()
73-
performRouting()
73+
viewModel.checkForUpdate()
7474
observeAuthEvents()
7575
}
7676

@@ -122,7 +122,6 @@ class MainActivity : AppCompatActivity(), BottomNavigationController {
122122
}
123123

124124
private fun setupViews() {
125-
viewModel.checkForUpdate()
126125
binding.bottomNavigation.setupWithNavController(navController)
127126

128127
val bottomNavHiddenFragments =
@@ -171,13 +170,20 @@ class MainActivity : AppCompatActivity(), BottomNavigationController {
171170
when (result) {
172171
is UpdateCheckResult.UpdateAvailable -> {
173172
showUpdateDialog(result.isForceUpdate)
173+
if (result.isForceUpdate) {
174+
isLoading = false
175+
} else {
176+
performRouting()
177+
}
174178
}
175179
is UpdateCheckResult.NoUpdateNeeded -> {
176180
Timber.d("업데이트 불필요")
181+
performRouting()
177182
}
178183
else -> {
179184
// 필요한 경우 다른 상태 처리
180185
Timber.d("UpdateCheckResult: Unhandled state or null")
186+
performRouting()
181187
}
182188
}
183189
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ ksp = "1.9.23-1.0.19"
88
compileSdk = "35"
99
minSdk = "26"
1010
targetSdk = "35"
11-
versionCode = "22"
12-
versionName = "0.5.7"
11+
versionCode = "23"
12+
versionName = "0.5.8"
1313
firebaseBom = "32.7.0"
1414
googleServicesPlugin = "4.4.2"
1515
firebasePerfPlugin = "1.4.2"

0 commit comments

Comments
 (0)