Add developer option to always show update alert

DerGoogler · DerGoogler · commit bd108511d8c1 · 2025-06-21T22:01:35.000+02:00
Introduces a new developer setting 'Always Show Update Alert' with supporting UI, ViewModel, and datastore logic. Refactors Alert and Card components to support outside content padding and onClick handlers. Cleans up developerMode extension functions and updates usages to support the new setting.
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/home/HomeScreen.kt
@@ -48,7 +48,6 @@ import com.dergoogler.mmrl.ext.managerVersion
 import com.dergoogler.mmrl.ext.navigateSingleTopTo
 import com.dergoogler.mmrl.ext.none
 import com.dergoogler.mmrl.ext.nullable
-import com.dergoogler.mmrl.ext.onClick
 import com.dergoogler.mmrl.ext.takeTrue
 import com.dergoogler.mmrl.model.online.Changelog
 import com.dergoogler.mmrl.network.runRequest
@@ -162,17 +161,16 @@ fun HomeScreen(
                         }
 
                         AnimatedVisibility(
-                            visible = if (latest.preRelease) {
+                            visible = userPreferences.developerMode { devAlwaysShowUpdateAlert } || (if (latest.preRelease) {
                                 userPreferences.checkAppUpdatesPreReleases && latest.versionCode > context.managerVersion.second
                             } else {
                                 latest.versionCode > context.managerVersion.second
-                            },
+                            }),
                             enter = fadeIn() + expandVertically(),
                             exit = shrinkVertically() + fadeOut()
                         ) {
-
                             Alert(
-                                modifier = Modifier.onClick {
+                                onClick = {
                                     changelogSheet = true
                                 },
                                 backgroundColor = MaterialTheme.colorScheme.tertiaryContainer,
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/screens/view/NewViewScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/screens/view/NewViewScreen.kt
@@ -613,6 +613,8 @@ fun NewViewScreen(
                         )
                     }
 
+                    val alertPadding = PaddingValues(horizontal = 16.dp)
+
                     module.hasBlacklist {
                         var open by remember { mutableStateOf(false) }
                         if (open) {
@@ -627,7 +629,7 @@ fun NewViewScreen(
                             backgroundColor = MaterialTheme.colorScheme.errorContainer,
                             textColor = MaterialTheme.colorScheme.onErrorContainer,
                             message = stringResource(R.string.blacklisted_desc),
-                            modifier = Modifier.padding(horizontal = 16.dp),
+                            outsideContentPadding = alertPadding,
                         )
                     }
 
@@ -638,15 +640,15 @@ fun NewViewScreen(
                                 backgroundColor = MaterialTheme.colorScheme.errorContainer,
                                 textColor = MaterialTheme.colorScheme.onErrorContainer,
                                 message = stringResource(id = R.string.view_module_unsupported_desc),
-                                modifier = Modifier.padding(horizontal = 16.dp)
+                                outsideContentPadding = alertPadding,
                             )
                         } else {
                             Alert(
                                 title = stringResource(id = R.string.view_module_low_root_version),
                                 backgroundColor = MaterialTheme.colorScheme.tertiaryContainer,
                                 textColor = MaterialTheme.colorScheme.onTertiaryContainer,
                                 message = stringResource(id = R.string.view_module_low_root_version_desc),
-                                modifier = Modifier.padding(horizontal = 16.dp)
+                                outsideContentPadding = alertPadding,
                             )
                         }
 
@@ -659,7 +661,7 @@ fun NewViewScreen(
                             backgroundColor = MaterialTheme.colorScheme.errorContainer,
                             textColor = MaterialTheme.colorScheme.onErrorContainer,
                             message = stringResource(id = R.string.view_module_unsupported_device_desc),
-                            modifier = Modifier.padding(horizontal = 16.dp)
+                            outsideContentPadding = alertPadding,
                         )
 
                         Spacer(modifier = Modifier.height(16.dp))
@@ -671,7 +673,7 @@ fun NewViewScreen(
                             backgroundColor = MaterialTheme.colorScheme.errorContainer,
                             textColor = MaterialTheme.colorScheme.onErrorContainer,
                             message = stringResource(id = R.string.view_module_unsupported_arch_desc),
-                            modifier = Modifier.padding(horizontal = 16.dp)
+                            outsideContentPadding = alertPadding,
                         )
 
                         Spacer(modifier = Modifier.height(16.dp))
@@ -685,13 +687,13 @@ fun NewViewScreen(
                                 textColor = MaterialTheme.colorScheme.onErrorContainer,
                                 title = it.title,
                                 message = it.message!!,
-                                modifier = Modifier.padding(horizontal = 16.dp)
+                                outsideContentPadding = alertPadding,
                             )
                         } else {
                             Alert(
                                 title = it.title,
                                 message = it.message!!,
-                                modifier = Modifier.padding(horizontal = 16.dp)
+                                outsideContentPadding = alertPadding,
                             )
                         }
 
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/settings/developer/DeveloperScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/settings/developer/DeveloperScreen.kt
@@ -3,12 +3,31 @@ package com.dergoogler.mmrl.ui.screens.settings.developer
 import androidx.compose.runtime.Composable
 import com.dergoogler.mmrl.R
 import com.dergoogler.mmrl.ui.component.SettingsScaffold
+import com.dergoogler.mmrl.ui.component.listItem.dsl.ListItemScope
+import com.dergoogler.mmrl.ui.component.listItem.dsl.ListScope
 import com.dergoogler.mmrl.ui.component.listItem.dsl.component.SwitchItem
 import com.dergoogler.mmrl.ui.component.listItem.dsl.component.item.Description
 import com.dergoogler.mmrl.ui.component.listItem.dsl.component.item.Title
 import com.dergoogler.mmrl.ui.providable.LocalSettings
 import com.dergoogler.mmrl.ui.providable.LocalUserPreferences
 
+@Composable
+fun ListScope.DeveloperSwitch(
+    enabled: Boolean = true,
+    onChange: (Boolean) -> Unit,
+    checked: Boolean,
+    content: @Composable ListItemScope.() -> Unit,
+) {
+    val userPrefs = LocalUserPreferences.current
+
+    SwitchItem(
+        checked = userPrefs.developerMode && checked,
+        onChange = onChange,
+        enabled = userPrefs.developerMode && enabled,
+        content = content
+    )
+}
+
 @Composable
 fun DeveloperScreen() {
     val viewModel = LocalSettings.current
@@ -24,5 +43,12 @@ fun DeveloperScreen() {
             Title(R.string.settings_developer_mode)
             Description(R.string.settings_developer_mode_desc)
         }
+
+        DeveloperSwitch(
+            checked = userPreferences.devAlwaysShowUpdateAlert,
+            onChange = viewModel::setDevAlwaysShowUpdateAlert,
+        ) {
+            Title(R.string.settings_always_show_update_alert)
+        }
     }
 }
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/settings/security/SecurityScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/settings/security/SecurityScreen.kt
@@ -43,8 +43,8 @@ fun SecurityScreen() {
         }
 
         SwitchItem(
-            checked = userPreferences.hideFingerprintInHome,
-            onChange = viewModel::setHideFingerprintInHome
+            checked = userPreferences.strictMode,
+            onChange = viewModel::setStrictMode
         ) {
             Title(R.string.settings_strict_mode)
         }
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/SettingsViewModel.kt b/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/SettingsViewModel.kt
@@ -250,6 +250,12 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+    fun setDevAlwaysShowUpdateAlert(value: Boolean) {
+        viewModelScope.launch {
+            userPreferencesRepository.setDevAlwaysShowUpdateAlert(value)
+        }
+    }
+
     fun setWebUIEngine(value: WebUIEngine) {
         viewModelScope.launch {
             userPreferencesRepository.setWebUIEngine(value)
diff --git a/datastore/src/main/kotlin/com/dergoogler/mmrl/datastore/UserPreferencesDataSource.kt b/datastore/src/main/kotlin/com/dergoogler/mmrl/datastore/UserPreferencesDataSource.kt
@@ -307,6 +307,14 @@ class UserPreferencesDataSource @Inject constructor(
         }
     }
 
+    suspend fun setDevAlwaysShowUpdateAlert(value: Boolean) = withContext(Dispatchers.IO) {
+        userPreferences.updateData {
+            it.copy(
+                devAlwaysShowUpdateAlert = value
+            )
+        }
+    }
+
     suspend fun setWebUIEngine(value: WebUIEngine) = withContext(Dispatchers.IO) {
         userPreferences.updateData {
             it.copy(
diff --git a/datastore/src/main/kotlin/com/dergoogler/mmrl/datastore/UserPreferencesRepository.kt b/datastore/src/main/kotlin/com/dergoogler/mmrl/datastore/UserPreferencesRepository.kt
@@ -113,6 +113,9 @@ class UserPreferencesRepository @Inject constructor(
     suspend fun setShowTerminalLineNumbers(value: Boolean) =
         userPreferencesDataSource.setShowTerminalLineNumbers(value)
 
+    suspend fun setDevAlwaysShowUpdateAlert(value: Boolean) =
+        userPreferencesDataSource.setDevAlwaysShowUpdateAlert(value)
+
     suspend fun setEnableToolbarEvents(value: Boolean) =
         userPreferencesDataSource.setEnableToolbarEvents(value)
 
diff --git a/datastore/src/main/kotlin/com/dergoogler/mmrl/datastore/model/UserPreferences.kt b/datastore/src/main/kotlin/com/dergoogler/mmrl/datastore/model/UserPreferences.kt
@@ -70,6 +70,7 @@ data class UserPreferences(
     @ProtoNumber(36) val enableToolbarEvents: Boolean = true,
     @ProtoNumber(37) val webuiEngine: WebUIEngine = WebUIEngine.PREFER_MODULE,
     @ProtoNumber(38) val showTerminalLineNumbers: Boolean = true,
+    @ProtoNumber(39) val devAlwaysShowUpdateAlert: Boolean = false,
 ) {
     fun isDarkMode() = when (darkMode) {
         DarkMode.AlwaysOff -> false
@@ -89,6 +90,17 @@ data class UserPreferences(
         ProtoBuf.encodeToByteArray(this)
     )
 
+    @OptIn(ExperimentalContracts::class)
+    fun developerMode(
+        also: UserPreferences.() -> Boolean,
+    ): Boolean {
+        contract {
+            callsInPlace(also, InvocationKind.AT_MOST_ONCE)
+        }
+
+        return developerMode && also()
+    }
+
     companion object {
         val PUBLIC_DOWNLOADS: File = Environment.getExternalStoragePublicDirectory(
             Environment.DIRECTORY_DOWNLOADS
@@ -99,48 +111,3 @@ data class UserPreferences(
             ProtoBuf.decodeFromByteArray(input.readBytes())
     }
 }
-
-@OptIn(ExperimentalContracts::class)
-inline fun <R> UserPreferences.developerMode(block: UserPreferences.() -> R): R? {
-    contract {
-        callsInPlace(block, InvocationKind.AT_MOST_ONCE)
-    }
-
-    return if (developerMode) block() else null
-}
-
-@OptIn(ExperimentalContracts::class)
-inline fun <R> UserPreferences.developerMode(
-    also: UserPreferences.() -> Boolean,
-    block: UserPreferences.() -> R,
-): R? {
-    contract {
-        callsInPlace(block, InvocationKind.AT_MOST_ONCE)
-    }
-
-    return if (developerMode && also()) block() else null
-}
-
-@OptIn(ExperimentalContracts::class)
-inline fun UserPreferences.developerMode(
-    also: UserPreferences.() -> Boolean,
-): Boolean {
-    contract {
-        callsInPlace(also, InvocationKind.AT_MOST_ONCE)
-    }
-
-    return developerMode && also()
-}
-
-@OptIn(ExperimentalContracts::class)
-inline fun <R> UserPreferences.developerMode(
-    also: UserPreferences.() -> Boolean,
-    default: R,
-    block: UserPreferences.() -> R,
-): R {
-    contract {
-        callsInPlace(block, InvocationKind.AT_MOST_ONCE)
-    }
-
-    return if (developerMode && also()) block() else default
-}
diff --git a/ui/src/main/kotlin/com/dergoogler/mmrl/ui/component/Alert.kt b/ui/src/main/kotlin/com/dergoogler/mmrl/ui/component/Alert.kt
@@ -3,6 +3,7 @@ package com.dergoogler.mmrl.ui.component
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
@@ -26,11 +27,16 @@ fun Alert(
     textColor: Color = contentColorFor(backgroundColor),
     title: String?,
     message: String,
+    outsideContentPadding: PaddingValues = PaddingValues(0.dp),
+    onClick: (() -> Unit)? = null,
     @DrawableRes icon: Int? = null,
 ) = Card(
-    modifier = modifier
+    onClick = onClick,
+    modifier = Modifier
         .padding(vertical = 16.dp, horizontal = 25.dp)
-        .fillMaxWidth(),
+        .fillMaxWidth()
+        .then(modifier),
+    outsideContentPadding = outsideContentPadding,
     color = backgroundColor,
     contentColor = textColor,
 ) {
diff --git a/ui/src/main/kotlin/com/dergoogler/mmrl/ui/component/card/Card.kt b/ui/src/main/kotlin/com/dergoogler/mmrl/ui/component/card/Card.kt
@@ -9,6 +9,8 @@ import androidx.compose.foundation.hoverable
 import androidx.compose.foundation.interaction.Interaction
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsHoveredAsState
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.LocalAbsoluteTonalElevation
 import androidx.compose.material3.LocalContentColor
@@ -72,6 +74,7 @@ fun Card(
     color: Color = MaterialTheme.colorScheme.surface,
     contentColor: Color = contentColorFor(color),
     shape: Shape = RoundedCornerShape(20.dp),
+    outsideContentPadding: PaddingValues = PaddingValues(0.dp),
     tonalElevation: Dp = 1.dp,
     shadowElevation: Dp = 0.dp,
     border: BorderStroke? = null,
@@ -106,6 +109,7 @@ fun Card(
     ) {
         Layout(
             modifier = Modifier
+                .padding(outsideContentPadding)
                 .card(
                     shape = shape,
                     backgroundColor = MaterialTheme.colorScheme.applyTonalElevation(

Original file line number	Diff line number	Diff line change
`@@ -613,6 +613,8 @@ fun NewViewScreen(`
`613`	`613`	`)`
`614`	`614`	`}`
`615`	`615`
	`616`	`+ val alertPadding = PaddingValues(horizontal = 16.dp)`
	`617`	`+`
`616`	`618`	`module.hasBlacklist {`
`617`	`619`	`var open by remember { mutableStateOf(false) }`
`618`	`620`	`if (open) {`
`@@ -627,7 +629,7 @@ fun NewViewScreen(`
`627`	`629`	`backgroundColor = MaterialTheme.colorScheme.errorContainer,`
`628`	`630`	`textColor = MaterialTheme.colorScheme.onErrorContainer,`
`629`	`631`	`message = stringResource(R.string.blacklisted_desc),`
`630`		`- modifier = Modifier.padding(horizontal = 16.dp),`
	`632`	`+ outsideContentPadding = alertPadding,`
`631`	`633`	`)`
`632`	`634`	`}`
`633`	`635`
`@@ -638,15 +640,15 @@ fun NewViewScreen(`
`638`	`640`	`backgroundColor = MaterialTheme.colorScheme.errorContainer,`
`639`	`641`	`textColor = MaterialTheme.colorScheme.onErrorContainer,`
`640`	`642`	`message = stringResource(id = R.string.view_module_unsupported_desc),`
`641`		`- modifier = Modifier.padding(horizontal = 16.dp)`
	`643`	`+ outsideContentPadding = alertPadding,`
`642`	`644`	`)`
`643`	`645`	`} else {`
`644`	`646`	`Alert(`
`645`	`647`	`title = stringResource(id = R.string.view_module_low_root_version),`
`646`	`648`	`backgroundColor = MaterialTheme.colorScheme.tertiaryContainer,`
`647`	`649`	`textColor = MaterialTheme.colorScheme.onTertiaryContainer,`
`648`	`650`	`message = stringResource(id = R.string.view_module_low_root_version_desc),`
`649`		`- modifier = Modifier.padding(horizontal = 16.dp)`
	`651`	`+ outsideContentPadding = alertPadding,`
`650`	`652`	`)`
`651`	`653`	`}`
`652`	`654`
`@@ -659,7 +661,7 @@ fun NewViewScreen(`
`659`	`661`	`backgroundColor = MaterialTheme.colorScheme.errorContainer,`
`660`	`662`	`textColor = MaterialTheme.colorScheme.onErrorContainer,`
`661`	`663`	`message = stringResource(id = R.string.view_module_unsupported_device_desc),`
`662`		`- modifier = Modifier.padding(horizontal = 16.dp)`
	`664`	`+ outsideContentPadding = alertPadding,`
`663`	`665`	`)`
`664`	`666`
`665`	`667`	`Spacer(modifier = Modifier.height(16.dp))`
`@@ -671,7 +673,7 @@ fun NewViewScreen(`
`671`	`673`	`backgroundColor = MaterialTheme.colorScheme.errorContainer,`
`672`	`674`	`textColor = MaterialTheme.colorScheme.onErrorContainer,`
`673`	`675`	`message = stringResource(id = R.string.view_module_unsupported_arch_desc),`
`674`		`- modifier = Modifier.padding(horizontal = 16.dp)`
	`676`	`+ outsideContentPadding = alertPadding,`
`675`	`677`	`)`
`676`	`678`
`677`	`679`	`Spacer(modifier = Modifier.height(16.dp))`
`@@ -685,13 +687,13 @@ fun NewViewScreen(`
`685`	`687`	`textColor = MaterialTheme.colorScheme.onErrorContainer,`
`686`	`688`	`title = it.title,`
`687`	`689`	`message = it.message!!,`
`688`		`- modifier = Modifier.padding(horizontal = 16.dp)`
	`690`	`+ outsideContentPadding = alertPadding,`
`689`	`691`	`)`
`690`	`692`	`} else {`
`691`	`693`	`Alert(`
`692`	`694`	`title = it.title,`
`693`	`695`	`message = it.message!!,`
`694`		`- modifier = Modifier.padding(horizontal = 16.dp)`
	`696`	`+ outsideContentPadding = alertPadding,`
`695`	`697`	`)`
`696`	`698`	`}`
`697`	`699`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ fun SecurityScreen() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`SwitchItem(`
`46`		`- checked = userPreferences.hideFingerprintInHome,`
`47`		`- onChange = viewModel::setHideFingerprintInHome`
	`46`	`+ checked = userPreferences.strictMode,`
	`47`	`+ onChange = viewModel::setStrictMode`
`48`	`48`	`) {`
`49`	`49`	`Title(R.string.settings_strict_mode)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,12 @@ class SettingsViewModel @Inject constructor(`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
	`253`	`+ fun setDevAlwaysShowUpdateAlert(value: Boolean) {`
	`254`	`+ viewModelScope.launch {`
	`255`	`+ userPreferencesRepository.setDevAlwaysShowUpdateAlert(value)`
	`256`	`+ }`
	`257`	`+ }`
	`258`	`+`
`253`	`259`	`fun setWebUIEngine(value: WebUIEngine) {`
`254`	`260`	`viewModelScope.launch {`
`255`	`261`	`userPreferencesRepository.setWebUIEngine(value)`
Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,14 @@ class UserPreferencesDataSource @Inject constructor(`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`
	`310`	`+ suspend fun setDevAlwaysShowUpdateAlert(value: Boolean) = withContext(Dispatchers.IO) {`
	`311`	`+ userPreferences.updateData {`
	`312`	`+ it.copy(`
	`313`	`+ devAlwaysShowUpdateAlert = value`
	`314`	`+ )`
	`315`	`+ }`
	`316`	`+ }`
	`317`	`+`
`310`	`318`	`suspend fun setWebUIEngine(value: WebUIEngine) = withContext(Dispatchers.IO) {`
`311`	`319`	`userPreferences.updateData {`
`312`	`320`	`it.copy(`