diff --git a/app/src/androidTest/java/org/fdroid/ui/screenshots/LocalizedScreenshotTest.kt b/app/src/androidTest/java/org/fdroid/ui/screenshots/LocalizedScreenshotTest.kt index ec18e4ff6..72e416ef4 100644 --- a/app/src/androidTest/java/org/fdroid/ui/screenshots/LocalizedScreenshotTest.kt +++ b/app/src/androidTest/java/org/fdroid/ui/screenshots/LocalizedScreenshotTest.kt @@ -66,7 +66,6 @@ abstract class LocalizedScreenshotTest(val localeName: String) { model = MainModel( dynamicColors = false, - smallBottomBar = false, numUpdates = numUpdates, hasAppIssues = hasAppIssues, ), diff --git a/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt index 8eb181a7b..531b90735 100644 --- a/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt +++ b/app/src/main/kotlin/org/fdroid/settings/SettingsConstants.kt @@ -17,9 +17,6 @@ object SettingsConstants { const val PREF_KEY_DYNAMIC_COLORS = "dynamicColors" const val PREF_DEFAULT_DYNAMIC_COLORS = false - const val PREF_KEY_SMALL_BOTTOM_BAR = "smallBottomBar" - const val PREF_DEFAULT_SMALL_BOTTOM_BAR = false - enum class AutoUpdateValues { OnlyWifi, Always, diff --git a/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt b/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt index dff3e549d..8aaa35e71 100644 --- a/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt +++ b/app/src/main/kotlin/org/fdroid/settings/SettingsManager.kt @@ -33,7 +33,6 @@ import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PREVENT_SCREENSHOTS import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_REPO_UPDATES import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SHOW_INCOMPATIBLE -import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SMALL_BOTTOM_BAR import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME import org.fdroid.settings.SettingsConstants.PREF_DNS_CACHE import org.fdroid.settings.SettingsConstants.PREF_DNS_CACHE_DEFAULT @@ -50,7 +49,6 @@ import org.fdroid.settings.SettingsConstants.PREF_KEY_PREVENT_SCREENSHOTS import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES import org.fdroid.settings.SettingsConstants.PREF_KEY_SHOW_INCOMPATIBLE -import org.fdroid.settings.SettingsConstants.PREF_KEY_SMALL_BOTTOM_BAR import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME import org.fdroid.settings.SettingsConstants.PREF_USE_DNS_CACHE import org.fdroid.settings.SettingsConstants.PREF_USE_DNS_CACHE_DEFAULT @@ -79,10 +77,6 @@ class SettingsManager @Inject constructor(@param:ApplicationContext private val prefsFlow .map { it.get(PREF_KEY_DYNAMIC_COLORS) ?: PREF_DEFAULT_DYNAMIC_COLORS } .distinctUntilChanged() - val smallBottomBarFlow: Flow = - prefsFlow - .map { it.get(PREF_KEY_SMALL_BOTTOM_BAR) ?: PREF_DEFAULT_SMALL_BOTTOM_BAR } - .distinctUntilChanged() val repoUpdates get() = prefs.getString(PREF_KEY_REPO_UPDATES, PREF_DEFAULT_REPO_UPDATES).toAutoUpdateValue() diff --git a/app/src/main/kotlin/org/fdroid/ui/Main.kt b/app/src/main/kotlin/org/fdroid/ui/Main.kt index 63879b795..59f4e0c30 100644 --- a/app/src/main/kotlin/org/fdroid/ui/Main.kt +++ b/app/src/main/kotlin/org/fdroid/ui/Main.kt @@ -82,7 +82,6 @@ fun Main(onListeningForIntent: () -> Unit = {}) { val viewModel = hiltViewModel() Settings( model = viewModel.model, - isBigScreen = isBigScreen, onSaveLogcat = { viewModel.onSaveLogcat(it) navigator.goBack() diff --git a/app/src/main/kotlin/org/fdroid/ui/MainPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/MainPresenter.kt index 086624c55..8d6037763 100644 --- a/app/src/main/kotlin/org/fdroid/ui/MainPresenter.kt +++ b/app/src/main/kotlin/org/fdroid/ui/MainPresenter.kt @@ -5,12 +5,10 @@ import androidx.compose.runtime.collectAsState import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_DYNAMIC_COLORS -import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SMALL_BOTTOM_BAR import org.fdroid.ui.apps.AppWithIssueItem data class MainModel( val dynamicColors: Boolean, - val smallBottomBar: Boolean, val numUpdates: Int, val hasAppIssues: Boolean, ) @@ -18,14 +16,11 @@ data class MainModel( @Composable fun MainPresenter( dynamicColorsFlow: Flow, - smallBottomBarFlow: Flow, numUpdatesFlow: StateFlow, appsWithIssuesFlow: StateFlow?>, ): MainModel { return MainModel( dynamicColors = dynamicColorsFlow.collectAsState(initial = PREF_DEFAULT_DYNAMIC_COLORS).value, - smallBottomBar = - smallBottomBarFlow.collectAsState(initial = PREF_DEFAULT_SMALL_BOTTOM_BAR).value, numUpdates = numUpdatesFlow.collectAsState().value, hasAppIssues = !appsWithIssuesFlow.collectAsState().value.isNullOrEmpty(), ) diff --git a/app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt index a8ffc800f..874c05797 100644 --- a/app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt +++ b/app/src/main/kotlin/org/fdroid/ui/MainViewModel.kt @@ -37,7 +37,6 @@ constructor( moleculeScope.launchMolecule(mode = ContextClock) { MainPresenter( dynamicColorsFlow = settingsManager.dynamicColorFlow, - smallBottomBarFlow = settingsManager.smallBottomBarFlow, numUpdatesFlow = updatesManager.numUpdates, appsWithIssuesFlow = updatesManager.appsWithIssues, ) diff --git a/app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt b/app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt index 5f2d0cdbc..ea5314991 100644 --- a/app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt +++ b/app/src/main/kotlin/org/fdroid/ui/navigation/BottomBar.kt @@ -3,13 +3,6 @@ package org.fdroid.ui.navigation import androidx.compose.foundation.layout.Arrangement.spacedBy import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.WindowInsets -import androidx.compose.foundation.layout.WindowInsetsSides -import androidx.compose.foundation.layout.consumeWindowInsets -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.navigationBars -import androidx.compose.foundation.layout.only -import androidx.compose.foundation.layout.safeDrawing import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Error import androidx.compose.material3.Badge @@ -26,7 +19,6 @@ import androidx.compose.material3.Text import androidx.compose.material3.contentColorFor import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalResources import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics @@ -41,23 +33,11 @@ import org.fdroid.ui.MainModel @Composable fun BottomBar(model: MainModel, currentNavKey: NavKey, onNav: (MainNavKey) -> Unit) { val res = LocalResources.current - val modifier = - Modifier.consumeWindowInsets( - WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom) - ) - val bottom = with(LocalDensity.current) { WindowInsets.navigationBars.getBottom(this).toDp() } - NavigationBar( - modifier = if (model.smallBottomBar) modifier.heightIn(max = 48.dp + bottom) else modifier - ) { + NavigationBar { topLevelRoutes.forEach { dest -> NavigationBarItem( icon = { NavIcon(dest, model.numUpdates, model.hasAppIssues) }, - label = - if (model.smallBottomBar) { - null - } else { - { Text(stringResource(dest.label)) } - }, + label ={ Text(stringResource(dest.label)) }, selected = dest == currentNavKey, colors = NavigationBarItemDefaults.colors( @@ -156,16 +136,10 @@ private fun Preview() { val model = MainModel( dynamicColors = false, - smallBottomBar = false, numUpdates = 3, hasAppIssues = false, ) BottomBar(model = model, currentNavKey = NavigationKey.Discover, onNav = {}) - BottomBar( - model = model.copy(smallBottomBar = true), - currentNavKey = NavigationKey.Discover, - onNav = {}, - ) } } } @@ -186,16 +160,10 @@ private fun PreviewIssues() { val model = MainModel( dynamicColors = true, - smallBottomBar = false, numUpdates = 0, hasAppIssues = true, ) BottomBar(model = model, currentNavKey = NavigationKey.MyApps, onNav = {}) - BottomBar( - model = model.copy(smallBottomBar = true), - currentNavKey = NavigationKey.MyApps, - onNav = {}, - ) } } } diff --git a/app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt b/app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt index 50e2f1e37..b5c6c9ce8 100644 --- a/app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt +++ b/app/src/main/kotlin/org/fdroid/ui/settings/Settings.kt @@ -65,7 +65,6 @@ import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_MIRROR_CHOOSER import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PREVENT_SCREENSHOTS import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_PROXY import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_REPO_UPDATES -import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_SMALL_BOTTOM_BAR import org.fdroid.settings.SettingsConstants.PREF_DEFAULT_THEME import org.fdroid.settings.SettingsConstants.PREF_KEY_AUTO_UPDATES import org.fdroid.settings.SettingsConstants.PREF_KEY_DYNAMIC_COLORS @@ -73,7 +72,6 @@ import org.fdroid.settings.SettingsConstants.PREF_KEY_MIRROR_CHOOSER import org.fdroid.settings.SettingsConstants.PREF_KEY_PREVENT_SCREENSHOTS import org.fdroid.settings.SettingsConstants.PREF_KEY_PROXY import org.fdroid.settings.SettingsConstants.PREF_KEY_REPO_UPDATES -import org.fdroid.settings.SettingsConstants.PREF_KEY_SMALL_BOTTOM_BAR import org.fdroid.settings.SettingsConstants.PREF_KEY_THEME import org.fdroid.settings.SettingsConstants.PREF_USE_DNS_CACHE import org.fdroid.settings.SettingsConstants.PREF_USE_DNS_CACHE_DEFAULT @@ -89,7 +87,6 @@ import org.fdroid.utils.getLogName @OptIn(ExperimentalMaterial3Api::class) fun Settings( model: SettingsModel, - isBigScreen: Boolean, onSaveLogcat: (Uri?) -> Unit, onBackClicked: () -> Unit, ) { @@ -193,14 +190,6 @@ fun Settings( context.startActivitySafe(intent) }, ) - if (!isBigScreen) - switchPreference( - key = PREF_KEY_SMALL_BOTTOM_BAR, - defaultValue = PREF_DEFAULT_SMALL_BOTTOM_BAR, - icon = {}, - title = { Text(stringResource(R.string.pref_compact_bottom_bar_title)) }, - summary = { Text(stringResource(R.string.pref_compact_bottom_bar_summary)) }, - ) preferenceCategory( key = "pref_category_updates", title = { Text(stringResource(R.string.updates)) }, @@ -404,6 +393,6 @@ fun SettingsPreview() { nextRepoUpdateFlow = MutableStateFlow(Long.MAX_VALUE), nextAppUpdateFlow = MutableStateFlow(currentTimeMillis() - HOURS.toMillis(12)), ) - Settings(model, true, {}, {}) + Settings(model, {}, {}) } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b0e77ae2e..8d9fbd148 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -851,8 +851,6 @@ حُدِّث %1$d تطبيقًا حُدِّث %1$d تطبيق - شريط تنقل مضغوط - يقلل حجم شريط التنقل السفلي ويخفي تسمياته - ينزل ب %1$s +W ينزل ب %1$s %1$s متبقي diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bc9cd1706..9d093ec01 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -714,8 +714,6 @@ Usa i colori di sistema Applica colori dinamici dalle impostazioni di sistema Apri le impostazioni di lingua del sistema - Barra di navigazione compatta - Riduci la dimensione e nascondi le etichette della barra inferiore di navigazione Solo con Wi-Fi Sempre (anche con connessione dati mobile) Mai diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e8bd4c6f8..5a2dff6a1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -826,8 +826,6 @@ Historia instalacji jest wyłączona\n\nInstalacje, aktualizacje i odinstalowania nie będą rejestrowane Usuń historię instalacji Czy usunąć historię instalacji? - Kompaktowy pasek nawigacyjny - Zmniejsz rozmiar i ukryj etykiety dolnego paska nawigacyjnego Pobieranie z prędkością %1$s Pozostało %1$s diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6ea3db33f..290f184bf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -768,8 +768,6 @@ 禁用了安装历史记录\n\n不会记录安装、更新和卸载 删除安装历史记录 要删除安装历史记录吗? - 紧凑式导航栏 - 缩小尺寸并隐藏底部导航栏的标签 实时下载速度 %1$s 剩余 %1$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9906b9abe..03b9a7125 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -167,8 +167,6 @@ Use system colors Apply dynamic colors from your system settings Open system language settings - Compact navigation bar - Reduces size and hides labels of navigation bottom bar Only on Wi-Fi Always (even on mobile data) Never diff --git a/app/src/screenshotTest/kotlin/org/fdroid/ui/ScreenshotTest.kt b/app/src/screenshotTest/kotlin/org/fdroid/ui/ScreenshotTest.kt index 426035a78..1336083ab 100644 --- a/app/src/screenshotTest/kotlin/org/fdroid/ui/ScreenshotTest.kt +++ b/app/src/screenshotTest/kotlin/org/fdroid/ui/ScreenshotTest.kt @@ -11,7 +11,6 @@ import org.fdroid.ui.navigation.NavigationKey fun ScreenshotTest( currentNavKey: NavKey = NavigationKey.Discover, showBottomBar: Boolean = currentNavKey is MainNavKey, - smallBottomBar: Boolean = false, numUpdates: Int = 3, hasAppIssues: Boolean = true, content: @Composable () -> Unit, @@ -20,7 +19,6 @@ fun ScreenshotTest( model = MainModel( dynamicColors = false, - smallBottomBar = smallBottomBar, numUpdates = numUpdates, hasAppIssues = hasAppIssues, ), diff --git a/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt b/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt index d046e370e..b5926d394 100644 --- a/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt +++ b/app/src/screenshotTest/kotlin/org/fdroid/ui/discover/DiscoverTest.kt @@ -1,6 +1,5 @@ package org.fdroid.ui.discover -import android.content.res.Configuration import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview import com.android.tools.screenshot.PreviewTest @@ -42,24 +41,6 @@ private fun DiscoverTest() { } } -@Composable -@PreviewTest -@Preview( - showBackground = true, - showSystemUi = true, - uiMode = Configuration.UI_MODE_NIGHT_YES or Configuration.UI_MODE_TYPE_NORMAL, -) -private fun DiscoverSmallBottomBarTest() { - ScreenshotTest(smallBottomBar = true) { - Discover( - discoverModel = getLoadedModel().copy(hasRepoIssues = false), - onListTap = {}, - onAppTap = {}, - onNav = {}, - ) - } -} - private fun getLoadedModel(): LoadedDiscoverModel { val newApps = listOf( diff --git a/app/src/screenshotTest/kotlin/org/fdroid/ui/settings/SettingsTest.kt b/app/src/screenshotTest/kotlin/org/fdroid/ui/settings/SettingsTest.kt index 609757239..bd077c012 100644 --- a/app/src/screenshotTest/kotlin/org/fdroid/ui/settings/SettingsTest.kt +++ b/app/src/screenshotTest/kotlin/org/fdroid/ui/settings/SettingsTest.kt @@ -15,7 +15,7 @@ import org.fdroid.ui.ScreenshotTest @Preview(showBackground = true, showSystemUi = true, heightDp = 1400) fun SettingsTest() = ScreenshotTest(showBottomBar = false) { - Settings(model = getSettingsModel(), isBigScreen = false, onSaveLogcat = {}, onBackClicked = {}) + Settings(model = getSettingsModel(), onSaveLogcat = {}, onBackClicked = {}) } @Composable @@ -28,7 +28,7 @@ fun SettingsTest() = ) fun SettingsNightTest() = ScreenshotTest(showBottomBar = false) { - Settings(model = getSettingsModel(), isBigScreen = false, onSaveLogcat = {}, onBackClicked = {}) + Settings(model = getSettingsModel(), onSaveLogcat = {}, onBackClicked = {}) } private fun getSettingsModel( diff --git a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/discover/DiscoverTestKt/DiscoverSmallBottomBarTest_1def2e7f_0.png b/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/discover/DiscoverTestKt/DiscoverSmallBottomBarTest_1def2e7f_0.png deleted file mode 100644 index e4aa7cda1..000000000 --- a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/discover/DiscoverTestKt/DiscoverSmallBottomBarTest_1def2e7f_0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a9ece5ddf70e67cff5fdad716124b4c6fde77591ee1cf3c1811c881af63e17d -size 151099 diff --git a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsNightTest_58c50acd_0.png b/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsNightTest_58c50acd_0.png index 1059e9767..eabf079a0 100644 --- a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsNightTest_58c50acd_0.png +++ b/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsNightTest_58c50acd_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71f406a178f4a466d27c9a1483046a249688370daeb95b15878729934ccee8af -size 235934 +oid sha256:153ff37f2aab19d3ca55d158d1a0157a29981f3da8e89271fa9ca4ef3bdb5df3 +size 217052 diff --git a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsTest_4fcdc4d2_0.png b/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsTest_4fcdc4d2_0.png index 80bddd955..4d5013430 100644 --- a/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsTest_4fcdc4d2_0.png +++ b/app/src/screenshotTestBasicDefaultDebug/reference/org/fdroid/ui/settings/SettingsTestKt/SettingsTest_4fcdc4d2_0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ab1c8e0bdc1c1a148a287020d299b08d060dc8315068d3f9ca5fd412f21227e -size 235866 +oid sha256:081a2b6280f74393aae70752da97ce3e0629505d98dee69425095ec018140c27 +size 216908