diff --git a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt index 9f6069b2c7..d166136fa7 100644 --- a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt +++ b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt @@ -137,6 +137,10 @@ class PreferenceManager @Inject constructor( val recentsTranslucentBackground = BoolPref("pref_recentsTranslucentBackground", false, recreate) val recentsTranslucentBackgroundAlpha = FloatPref("pref_recentTranslucentBackgroundAlpha", .8f, recreate) + + val hideVersionInfo = BoolPref("pref_hideVersionInfo", false) + val pseudonymVersion = StringPref("pref_pseudonymVersion", "Bubble Tea") + override fun close() { TODO("Not yet implemented") } diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt index 7344472240..785161c709 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt @@ -48,6 +48,7 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewmodel.compose.viewModel +import app.lawnchair.preferences.PreferenceManager import app.lawnchair.ui.preferences.LocalIsExpandedScreen import app.lawnchair.ui.preferences.components.NavigationActionPreference import app.lawnchair.ui.preferences.components.controls.ClickablePreference @@ -74,6 +75,8 @@ fun About( var openBottomSheet by remember { mutableStateOf(false) } val scope = rememberCoroutineScope() + val prefs: PreferenceManager = PreferenceManager.getInstance(context) + if (openBottomSheet) { val updateState = uiState.updateState if (updateState is UpdateState.Available) { @@ -135,7 +138,11 @@ fun About( horizontalArrangement = Arrangement.Center, ) { Text( - text = BuildConfig.VERSION_DISPLAY_NAME, + text = if (prefs.hideVersionInfo.get()) { + prefs.pseudonymVersion.get() + " (pseudonym)" + } else { + BuildConfig.VERSION_DISPLAY_NAME + }, style = MaterialTheme.typography.bodyLarge, color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.Center, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt index b52f9eb0ae..42f39d0c81 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/AboutViewModel.kt @@ -3,6 +3,7 @@ package app.lawnchair.ui.preferences.about import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope +import app.lawnchair.preferences.PreferenceManager import com.android.launcher3.BuildConfig import com.android.launcher3.R import java.io.File @@ -18,6 +19,7 @@ class AboutViewModel( ) : AndroidViewModel(application) { private val api: GitHubService = gitHubApiRetrofit.create() + private val prefs: PreferenceManager = PreferenceManager.getInstance(application) private val nightlyBuildsRepository = NightlyBuildsRepository( applicationContext = application, @@ -31,7 +33,11 @@ class AboutViewModel( init { _uiState.update { it.copy( - versionName = BuildConfig.VERSION_NAME, + versionName = if (prefs.hideVersionInfo.get()) { + prefs.pseudonymVersion.get() + " (pseudonym)" + } else { + BuildConfig.VERSION_NAME + }, commitHash = BuildConfig.COMMIT_HASH, coreTeam = team, supportAndPr = supportAndPr, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt index 1eba8e434d..29f4bfcb92 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/DebugMenuPreferences.kt @@ -3,6 +3,7 @@ package app.lawnchair.ui.preferences.destinations import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource import androidx.datastore.preferences.core.Preferences import app.lawnchair.preferences.PreferenceManager import app.lawnchair.preferences.getAdapter @@ -17,9 +18,11 @@ import app.lawnchair.ui.preferences.components.controls.SwitchPreference import app.lawnchair.ui.preferences.components.controls.TextPreference import app.lawnchair.ui.preferences.components.layout.PreferenceGroup import app.lawnchair.ui.preferences.components.layout.PreferenceLayout +import app.lawnchair.ui.preferences.components.search.SearchPopupPreference import app.lawnchair.ui.preferences.data.liveinfo.liveInformationManager import app.lawnchair.ui.preferences.data.liveinfo.model.LiveInformation import app.lawnchair.ui.preferences.navigation.FeatureFlags +import com.android.launcher3.R import com.patrykmichalik.opto.domain.Preference import kotlinx.coroutines.runBlocking @@ -66,6 +69,17 @@ fun DebugMenuPreferences( } }, ) + SwitchPreference( + label = "Hide version info in About screen", + adapter = prefs.hideVersionInfo.getAdapter(), + ) + SearchPopupPreference( + title = "Set custom pseudonym version", + initialValue = prefs.pseudonymVersion.get(), + placeholder = stringResource(R.string.custom), + onConfirm = prefs.pseudonymVersion.getAdapter()::onChange, + isErrorCheck = { it.isEmpty() }, + ) } PreferenceGroup(heading = "Debug flags") {