Skip to content

Commit 12cc03f

Browse files
committed
Fix showing ReleaseNotes ui bug
1 parent 2e93d15 commit 12cc03f

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
compileSdk compile_sdk_version
2020
minSdkVersion min_sdk_version
2121
targetSdkVersion compile_sdk_version
22-
versionCode 117
22+
versionCode 118
2323
versionName "0.40.0"
2424
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2525

app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ private fun MainScreen(
247247
R.id.releaseNotesFragment,
248248
ReleaseNotesFragment.Input(true)
249249
)
250+
viewModel.whatsNewShown()
250251
}
251252
}
252253

app/src/main/java/io/horizontalsystems/bankwallet/modules/main/MainViewModel.kt

-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ class MainViewModel(
171171

172172
fun whatsNewShown() {
173173
showWhatsNew = false
174-
releaseNotesManager.updateShownAppVersion()
175174
emitState()
176175
}
177176

app/src/main/java/io/horizontalsystems/bankwallet/modules/releasenotes/ReleaseNotesFragment.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ import androidx.navigation.NavController
2424
import io.horizontalsystems.bankwallet.R
2525
import io.horizontalsystems.bankwallet.core.BaseComposeFragment
2626
import io.horizontalsystems.bankwallet.core.getInput
27-
import io.horizontalsystems.bankwallet.modules.main.MainModule
28-
import io.horizontalsystems.bankwallet.modules.main.MainViewModel
2927
import io.horizontalsystems.bankwallet.modules.markdown.MarkdownContent
3028
import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme
3129
import io.horizontalsystems.bankwallet.ui.compose.TranslatableString
@@ -56,10 +54,9 @@ fun ReleaseNotesScreen(
5654
closeablePopup: Boolean,
5755
onCloseClick: () -> Unit,
5856
viewModel: ReleaseNotesViewModel = viewModel(factory = ReleaseNotesModule.Factory()),
59-
mainViewModel: MainViewModel = viewModel(factory = MainModule.Factory())
6057
) {
6158
BackHandler() {
62-
mainViewModel.whatsNewShown()
59+
viewModel.whatsNewShown()
6360
onCloseClick.invoke()
6461
}
6562

@@ -73,7 +70,7 @@ fun ReleaseNotesScreen(
7370
title = TranslatableString.ResString(R.string.Button_Close),
7471
icon = R.drawable.ic_close,
7572
onClick = {
76-
mainViewModel.whatsNewShown()
73+
viewModel.whatsNewShown()
7774
onCloseClick.invoke()
7875
}
7976
)

app/src/main/java/io/horizontalsystems/bankwallet/modules/releasenotes/ReleaseNotesModule.kt

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ object ReleaseNotesModule {
1212
App.networkManager,
1313
App.releaseNotesManager.releaseNotesUrl,
1414
App.connectivityManager,
15+
App.releaseNotesManager,
1516
App.appConfigProvider
1617
) as T
1718
}

app/src/main/java/io/horizontalsystems/bankwallet/modules/releasenotes/ReleaseNotesViewModel.kt

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.lifecycle.ViewModel
77
import androidx.lifecycle.viewModelScope
88
import io.horizontalsystems.bankwallet.core.INetworkManager
99
import io.horizontalsystems.bankwallet.core.managers.ConnectivityManager
10+
import io.horizontalsystems.bankwallet.core.managers.ReleaseNotesManager
1011
import io.horizontalsystems.bankwallet.core.providers.AppConfigProvider
1112
import io.horizontalsystems.bankwallet.entities.ViewState
1213
import io.horizontalsystems.bankwallet.modules.markdown.MarkdownBlock
@@ -21,6 +22,7 @@ class ReleaseNotesViewModel(
2122
private val networkManager: INetworkManager,
2223
private val contentUrl: String,
2324
private val connectivityManager: ConnectivityManager,
25+
private val releaseNotesManager: ReleaseNotesManager,
2426
appConfigProvider: AppConfigProvider
2527
) : ViewModel() {
2628

@@ -50,6 +52,10 @@ class ReleaseNotesViewModel(
5052
loadContent()
5153
}
5254

55+
fun whatsNewShown() {
56+
releaseNotesManager.updateShownAppVersion()
57+
}
58+
5359
private fun loadContent() {
5460
viewModelScope.launch {
5561
try {

0 commit comments

Comments
 (0)