From 2d04939add97b0c689e68d9b217d406fb8a06377 Mon Sep 17 00:00:00 2001 From: Avently <7953703+avently@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:16:11 +0700 Subject: [PATCH] rename bars properties and strings --- .../common/views/usersettings/Appearance.android.kt | 5 +++-- .../kotlin/chat/simplex/common/model/SimpleXAPI.kt | 8 ++++---- .../kotlin/chat/simplex/common/views/TerminalView.kt | 2 +- .../kotlin/chat/simplex/common/views/chat/ComposeView.kt | 2 +- .../chat/simplex/common/views/chatlist/ChatListView.kt | 6 +++--- .../chat/simplex/common/views/helpers/CloseSheetBar.kt | 4 ++-- .../chat/simplex/common/views/helpers/DefaultTopAppBar.kt | 2 +- .../chat/simplex/common/views/usersettings/Appearance.kt | 5 +++-- .../common/src/commonMain/resources/MR/base/strings.xml | 3 ++- .../common/views/usersettings/Appearance.desktop.kt | 4 +--- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/usersettings/Appearance.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/usersettings/Appearance.android.kt index b78a5f4a9e..886e886d37 100644 --- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/usersettings/Appearance.android.kt +++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/usersettings/Appearance.android.kt @@ -118,9 +118,10 @@ fun AppearanceScope.AppearanceLayout( MessageShapeSection() SectionDividerSpaced() - BarsAlphaSection(appPrefs.barsAlpha, 0.9f) + BarsAlphaSection(MR.strings.appearance_in_app_bars_alpha, appPrefs.inAppBarsAlpha, 0.9f) + SectionDividerSpaced() SectionSpacer() - BarsAlphaSection(appPrefs.barsAlpha2, 0.6f) + BarsAlphaSection(MR.strings.appearance_nav_bar_alpha, appPrefs.navBarAlpha, 0.6f) SectionDividerSpaced() ProfileImageSection() diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt index 00f216aa99..18d6393997 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt @@ -223,8 +223,8 @@ class AppPreferences { val chatItemTail = mkBoolPreference(SHARED_PREFS_CHAT_ITEM_TAIL, true) val fontScale = mkFloatPreference(SHARED_PREFS_FONT_SCALE, 1f) val densityScale = mkFloatPreference(SHARED_PREFS_DENSITY_SCALE, 1f) - val barsAlpha = mkFloatPreference(SHARED_PREFS_BARS_ALPHA, 0.9f) - val barsAlpha2 = mkFloatPreference(SHARED_PREFS_BARS_ALPHA2, 0.6f) + val inAppBarsAlpha = mkFloatPreference(SHARED_PREFS_IN_APP_BARS_ALPHA, 0.9f) + val navBarAlpha = mkFloatPreference(SHARED_PREFS_NAV_BAR_ALPHA, 0.6f) val whatsNewVersion = mkStrPreference(SHARED_PREFS_WHATS_NEW_VERSION, null) val lastMigratedVersionCode = mkIntPreference(SHARED_PREFS_LAST_MIGRATED_VERSION_CODE, 0) @@ -430,8 +430,8 @@ class AppPreferences { private const val SHARED_PREFS_CHAT_ITEM_TAIL = "ChatItemTail" private const val SHARED_PREFS_FONT_SCALE = "FontScale" private const val SHARED_PREFS_DENSITY_SCALE = "DensityScale" - private const val SHARED_PREFS_BARS_ALPHA = "BarsAlpha" - private const val SHARED_PREFS_BARS_ALPHA2 = "BarsAlpha2" + private const val SHARED_PREFS_IN_APP_BARS_ALPHA = "InAppBarsAlpha" + private const val SHARED_PREFS_NAV_BAR_ALPHA = "NavBarAlpha" private const val SHARED_PREFS_WHATS_NEW_VERSION = "WhatsNewVersion" private const val SHARED_PREFS_LAST_MIGRATED_VERSION_CODE = "LastMigratedVersionCode" private const val SHARED_PREFS_CUSTOM_DISAPPEARING_MESSAGE_TIME = "CustomDisappearingMessageTime" diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt index c2876e555d..6ac3b41ac0 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt @@ -89,7 +89,7 @@ fun TerminalLayout( .align(Alignment.BottomCenter) .navigationBarsPadding() .imePadding() - .background(MaterialTheme.colors.background.copy(remember { appPrefs.barsAlpha.state }.value)) + .background(MaterialTheme.colors.background.copy(remember { appPrefs.inAppBarsAlpha.state }.value)) ) { Divider() Box(Modifier.padding(horizontal = 8.dp)) { diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt index c462b22e8a..89bb35b605 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt @@ -897,7 +897,7 @@ fun ComposeView( } } } - Column(Modifier.background(MaterialTheme.colors.background.copy(remember { appPrefs.barsAlpha.state }.value))) { + Column(Modifier.background(MaterialTheme.colors.background.copy(remember { appPrefs.inAppBarsAlpha.state }.value))) { Divider() Row(Modifier.padding(end = 8.dp), verticalAlignment = Alignment.Bottom) { val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt index a3a383bb82..8d6131dcce 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt @@ -589,7 +589,7 @@ enum class ScrollDirection { @Composable fun BoxScope.StatusBarBackground() { if (appPlatform.isAndroid) { - val finalColor = MaterialTheme.colors.background.copy(remember { appPrefs.barsAlpha.state }.value) + val finalColor = MaterialTheme.colors.background.copy(remember { appPrefs.inAppBarsAlpha.state }.value) Box(Modifier.fillMaxWidth().windowInsetsTopHeight(WindowInsets.statusBars).background(finalColor)) } } @@ -601,7 +601,7 @@ fun BoxScope.NavigationBarBackground(appBarOnBottom: Boolean = false, mixedColor val barPadding = WindowInsets.navigationBars.asPaddingValues() val paddingBottom = barPadding.calculateBottomPadding() val color = if (mixedColor) MaterialTheme.colors.background.mixWith(MaterialTheme.colors.onBackground, 0.97f) else MaterialTheme.colors.background - val finalColor = color.copy(remember(appBarOnBottom) { if (appBarOnBottom) appPrefs.barsAlpha.state else appPrefs.barsAlpha2.state }.value) + val finalColor = color.copy(remember(appBarOnBottom) { if (appBarOnBottom) appPrefs.inAppBarsAlpha.state else appPrefs.navBarAlpha.state }.value) Box(Modifier.align(Alignment.BottomStart).height(paddingBottom).fillMaxWidth().background(finalColor)) } } @@ -612,7 +612,7 @@ fun BoxScope.NavigationBarBackground(modifier: Modifier, color: Color = Material if (appPlatform.isAndroid && keyboardState.value == KeyboardState.Closed) { val barPadding = WindowInsets.navigationBars.asPaddingValues() val paddingBottom = barPadding.calculateBottomPadding() - val finalColor = color.copy(remember { appPrefs.barsAlpha2.state }.value) + val finalColor = color.copy(remember { appPrefs.navBarAlpha.state }.value) Box(modifier.align(Alignment.BottomStart).height(paddingBottom).fillMaxWidth().background(finalColor)) } } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CloseSheetBar.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CloseSheetBar.kt index 4a56ac09a5..e262149cdc 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CloseSheetBar.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CloseSheetBar.kt @@ -33,7 +33,7 @@ fun CloseSheetBar( endButtons: @Composable RowScope.() -> Unit = {} ) { val background = MaterialTheme.colors.background.mixWith(MaterialTheme.colors.onBackground, 0.97f) - val themeBackgroundMix = background.copy(remember { appPrefs.barsAlpha.state }.value) + val themeBackgroundMix = background.copy(remember { appPrefs.inAppBarsAlpha.state }.value) val handler = LocalAppBarHandler.current val connection = LocalAppBarHandler.current?.connection val title = remember(handler?.title?.value) { handler?.title ?: mutableStateOf("") } @@ -157,7 +157,7 @@ fun AppBarTitle(title: String, hostDevice: Pair? = null, withPad private fun topTitleAlpha(text: Boolean, connection: CollapsingAppBarNestedScrollConnection) = if (connection.appBarOffset.absoluteValue < AppBarHandler.appBarMaxHeightPx / 3) 0f - else ((-connection.appBarOffset * 1.5f) / (AppBarHandler.appBarMaxHeightPx)).coerceIn(0f, if (text) 1f else appPrefs.barsAlpha.get()) + else ((-connection.appBarOffset * 1.5f) / (AppBarHandler.appBarMaxHeightPx)).coerceIn(0f, if (text) 1f else appPrefs.inAppBarsAlpha.get()) private fun bottomTitleAlpha(connection: CollapsingAppBarNestedScrollConnection?) = if ((connection?.appBarOffset ?: 0f).absoluteValue < AppBarHandler.appBarMaxHeightPx / 3) 1f diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt index 8d30623199..5dc657ec88 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt @@ -41,7 +41,7 @@ fun DefaultTopAppBar( } }, backgroundColor = MaterialTheme.colors.background.mixWith(MaterialTheme.colors.onBackground, 0.97f) - .copy(remember { appPrefs.barsAlpha.state }.value), + .copy(remember { appPrefs.inAppBarsAlpha.state }.value), navigationIcon = navigationButton, buttons = if (!showSearch) buttons else emptyList(), centered = !showSearch, diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt index cdfebf58f0..bc4a6b4306 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/Appearance.kt @@ -39,6 +39,7 @@ import chat.simplex.common.views.chat.item.msgTailWidthDp import chat.simplex.res.MR import com.godaddy.android.colorpicker.ClassicColorPicker import com.godaddy.android.colorpicker.HsvColor +import dev.icerock.moko.resources.StringResource import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.datetime.Clock @@ -171,9 +172,9 @@ object AppearanceScope { } @Composable - fun BarsAlphaSection(pref: SharedPreference, defaultValue: Float) { + fun BarsAlphaSection(sectionTitle: StringResource, pref: SharedPreference, defaultValue: Float) { val barsAlpha = remember { mutableStateOf(pref.get()) } - SectionView(stringResource(MR.strings.appearance_bars_alpha).uppercase(), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING)) { + SectionView(stringResource(sectionTitle).uppercase(), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING)) { Row(Modifier.padding(top = 10.dp), verticalAlignment = Alignment.CenterVertically) { Box(Modifier.size(60.dp) .background(MaterialTheme.colors.surface, RoundedCornerShape(percent = 22)) diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml index 3f297205c1..065c3c9bcb 100644 --- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml +++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml @@ -1755,7 +1755,8 @@ Remove image Font size Zoom - Navigation bars transparency + In-app bars transparency + Navigation bar transparency System mode diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/usersettings/Appearance.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/usersettings/Appearance.desktop.kt index 2d5de02827..1988554cbb 100644 --- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/usersettings/Appearance.desktop.kt +++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/usersettings/Appearance.desktop.kt @@ -68,9 +68,7 @@ fun AppearanceScope.AppearanceLayout( MessageShapeSection() SectionDividerSpaced() - BarsAlphaSection(appPrefs.barsAlpha, 0.9f) - SectionSpacer() - BarsAlphaSection(appPrefs.barsAlpha2, 0.6f) + BarsAlphaSection(MR.strings.appearance_in_app_bars_alpha, appPrefs.inAppBarsAlpha, 0.9f) SectionDividerSpaced() ProfileImageSection()