mirror of
https://github.com/geode-sdk/android-launcher.git
synced 2026-10-22 00:42:38 +00:00
fix update warning dismiss
This commit is contained in:
1 file changed
+10
-9
@@ -234,15 +234,13 @@ fun LoadFailedDialog(returnTitle: String, returnMessage: String) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun UpdateWarning(inSafeMode: Boolean = false) {
|
fun UpdateWarning(inSafeMode: Boolean = false, onDismiss: () -> Unit) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val packageManager = context.packageManager
|
val packageManager = context.packageManager
|
||||||
|
|
||||||
val gdVersionCode = remember { LaunchUtils.getGeometryDashVersionCode(packageManager) }
|
val gdVersionCode = remember { LaunchUtils.getGeometryDashVersionCode(packageManager) }
|
||||||
val gdVersionString = remember { LaunchUtils.getGeometryDashVersionString(packageManager) }
|
val gdVersionString = remember { LaunchUtils.getGeometryDashVersionString(packageManager) }
|
||||||
|
|
||||||
var showUpdateWarning by remember { mutableStateOf(true) }
|
|
||||||
|
|
||||||
var lastDismissedVersion by PreferenceUtils.useLongPreference(
|
var lastDismissedVersion by PreferenceUtils.useLongPreference(
|
||||||
preferenceKey = PreferenceUtils.Key.DISMISSED_GJ_UPDATE
|
preferenceKey = PreferenceUtils.Key.DISMISSED_GJ_UPDATE
|
||||||
)
|
)
|
||||||
@@ -251,7 +249,6 @@ fun UpdateWarning(inSafeMode: Boolean = false) {
|
|||||||
val shouldDismiss = canDismissRelease && gdVersionCode == lastDismissedVersion
|
val shouldDismiss = canDismissRelease && gdVersionCode == lastDismissedVersion
|
||||||
|
|
||||||
if (gdVersionCode != Constants.SUPPORTED_VERSION_CODE && !shouldDismiss) {
|
if (gdVersionCode != Constants.SUPPORTED_VERSION_CODE && !shouldDismiss) {
|
||||||
if (showUpdateWarning) {
|
|
||||||
AlertDialog(
|
AlertDialog(
|
||||||
icon = {
|
icon = {
|
||||||
Icon(
|
Icon(
|
||||||
@@ -275,7 +272,7 @@ fun UpdateWarning(inSafeMode: Boolean = false) {
|
|||||||
},
|
},
|
||||||
confirmButton = {
|
confirmButton = {
|
||||||
TextButton(onClick = {
|
TextButton(onClick = {
|
||||||
showUpdateWarning = false
|
onDismiss()
|
||||||
lastDismissedVersion = gdVersionCode
|
lastDismissedVersion = gdVersionCode
|
||||||
|
|
||||||
onLaunch(context, inSafeMode)
|
onLaunch(context, inSafeMode)
|
||||||
@@ -284,13 +281,12 @@ fun UpdateWarning(inSafeMode: Boolean = false) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
dismissButton = {
|
dismissButton = {
|
||||||
TextButton(onClick = { showUpdateWarning = false }) {
|
TextButton(onClick = { onDismiss() }) {
|
||||||
Text(stringResource(R.string.message_box_cancel))
|
Text(stringResource(R.string.message_box_cancel))
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onDismissRequest = { showUpdateWarning = false }
|
onDismissRequest = { onDismiss() }
|
||||||
)
|
)
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
LaunchedEffect(gdVersionCode) {
|
LaunchedEffect(gdVersionCode) {
|
||||||
onLaunch(context, inSafeMode)
|
onLaunch(context, inSafeMode)
|
||||||
@@ -621,7 +617,10 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (beginLaunch) {
|
if (beginLaunch) {
|
||||||
UpdateWarning(launchInSafeMode)
|
UpdateWarning(launchInSafeMode) {
|
||||||
|
beginLaunch = false
|
||||||
|
launchInSafeMode = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (showSafeModeDialog) {
|
if (showSafeModeDialog) {
|
||||||
@@ -632,6 +631,8 @@ fun MainScreen(
|
|||||||
onLaunch = {
|
onLaunch = {
|
||||||
launchInSafeMode = true
|
launchInSafeMode = true
|
||||||
beginLaunch = true
|
beginLaunch = true
|
||||||
|
|
||||||
|
showSafeModeDialog = false
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user