From cb94485e82c6df977db26408b6dcb646f733ca48 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Wed, 3 Aug 2022 01:44:49 +0200 Subject: [PATCH] Update: New Compose's M3 version related changes --- .../fdroid/ui/compose/components/TopBar.kt | 3 +++ .../ui/compose/pages/app_detail/components/Header.kt | 6 +++--- .../pages/app_detail/components/ReleaseItem.kt | 4 ++-- .../compose/pages/home/components/CategoryChipList.kt | 2 +- .../com/machiav3lli/fdroid/ui/compose/utils/Chip.kt | 11 +++++++---- .../fdroid/ui/fragments/ExploreFragment.kt | 4 ++-- .../fdroid/ui/fragments/InstalledFragment.kt | 4 ++-- .../machiav3lli/fdroid/ui/fragments/LatestFragment.kt | 4 ++-- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt index 6ebcf481..4655c335 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Close import androidx.compose.material.icons.rounded.Search +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -41,6 +42,7 @@ import androidx.compose.ui.text.input.TextFieldValue import com.machiav3lli.fdroid.R import com.machiav3lli.fdroid.ui.compose.utils.HorizontalExpandingVisibility +@OptIn(ExperimentalMaterial3Api::class) @Composable fun TopBar( title: String, @@ -101,6 +103,7 @@ fun CollapsedSearchView( ) } +@OptIn(ExperimentalMaterial3Api::class) @Composable fun ExpandedSearchView( query: String, diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt index 7b46fc49..5583f2a5 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt @@ -16,7 +16,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Shapes +import androidx.compose.material3.ShapeDefaults import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -230,7 +230,7 @@ fun DownloadProgress( LinearProgressIndicator( modifier = Modifier .fillMaxWidth() - .clip(Shapes.Full), + .clip(ShapeDefaults.Large), ) } else { Text( @@ -240,7 +240,7 @@ fun DownloadProgress( LinearProgressIndicator( modifier = Modifier .fillMaxWidth() - .clip(Shapes.Full), + .clip(ShapeDefaults.Large), progress = downloaded?.toFloat()?.div(totalSize) ?: 1f ) } diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt index 7db82bba..4cacafa4 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt @@ -23,7 +23,7 @@ import androidx.compose.material.icons.rounded.Download import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Shapes +import androidx.compose.material3.ShapeDefaults import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -208,7 +208,7 @@ fun ReleaseBadge( ) { Surface( modifier = modifier - .background(color, Shapes.Full) + .background(color, ShapeDefaults.Large) .padding(6.dp, 2.dp), color = color ) { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt index 50cdbf47..805c9efc 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt @@ -17,9 +17,9 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Icon import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Done +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt index cf1f10a3..80714b7b 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt @@ -1,7 +1,10 @@ package com.machiav3lli.fdroid.ui.compose.utils -import androidx.compose.material.ExperimentalMaterialApi -import androidx.compose.material3.* +import androidx.compose.material3.ElevatedAssistChip +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ShapeDefaults +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -13,7 +16,7 @@ import androidx.compose.ui.unit.dp /** * Basically a OutlineChip without spamming "ExperimentalMaterialApi" */ -@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun CustomChip( modifier: Modifier = Modifier, @@ -25,7 +28,7 @@ fun CustomChip( ) { ElevatedAssistChip( modifier = modifier, - shape = Shapes.Full, + shape = ShapeDefaults.Large, onClick = { onClick(text) }, label = { Text(text = text, color = borderColor) } ) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt index 197c7eac..168c0b52 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt @@ -18,7 +18,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberTopAppBarScrollState +import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState @@ -74,7 +74,7 @@ class ExploreFragment : MainNavFragmentX() { val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray()) val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior( - rememberTopAppBarScrollState() + rememberTopAppBarState() ) { true } AppTheme( diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt index 95e84210..35ccc333 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt @@ -29,7 +29,7 @@ import androidx.compose.material3.SuggestionChip import androidx.compose.material3.SuggestionChipDefaults import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberTopAppBarScrollState +import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState @@ -92,7 +92,7 @@ class InstalledFragment : MainNavFragmentX() { val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray()) val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior( - rememberTopAppBarScrollState() + rememberTopAppBarState() ) { true } AppTheme( diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt index f3a11cdc..d7fb37a0 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt @@ -20,7 +20,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberTopAppBarScrollState +import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState @@ -77,7 +77,7 @@ class LatestFragment : MainNavFragmentX() { val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray()) val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior( - rememberTopAppBarScrollState() + rememberTopAppBarState() ) { true } AppTheme(