avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 19:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update: New Compose's M3 version related changes

Browse Source
This commit is contained in:
machiav3lli 2022-08-03 01:44:49 +02:00
parent 2330cec69d
commit cb94485e82
8 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt
View File

@ -11,6 +11,7 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Close import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.Search import androidx.compose.material.icons.rounded.Search
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme 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.R
import com.machiav3lli.fdroid.ui.compose.utils.HorizontalExpandingVisibility import com.machiav3lli.fdroid.ui.compose.utils.HorizontalExpandingVisibility
@OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun TopBar( fun TopBar(
title: String, title: String,
@ -101,6 +103,7 @@ fun CollapsedSearchView(
) )
} }
@OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun ExpandedSearchView( fun ExpandedSearchView(
query: String, query: String,

6
src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt
View File

@ -16,7 +16,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Shapes import androidx.compose.material3.ShapeDefaults
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -230,7 +230,7 @@ fun DownloadProgress(
LinearProgressIndicator( LinearProgressIndicator(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clip(Shapes.Full), .clip(ShapeDefaults.Large),
) )
} else { } else {
Text( Text(
@ -240,7 +240,7 @@ fun DownloadProgress(
LinearProgressIndicator( LinearProgressIndicator(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.clip(Shapes.Full), .clip(ShapeDefaults.Large),
progress = downloaded?.toFloat()?.div(totalSize) ?: 1f progress = downloaded?.toFloat()?.div(totalSize) ?: 1f
) )
} }

4
src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt
View File

@ -23,7 +23,7 @@ import androidx.compose.material.icons.rounded.Download
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Shapes import androidx.compose.material3.ShapeDefaults
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -208,7 +208,7 @@ fun ReleaseBadge(
) { ) {
Surface( Surface(
modifier = modifier modifier = modifier
.background(color, Shapes.Full) .background(color, ShapeDefaults.Large)
.padding(6.dp, 2.dp), .padding(6.dp, 2.dp),
color = color color = color
) { ) {

2
src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt
View File

@ -17,9 +17,9 @@ import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Icon
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Done import androidx.compose.material.icons.filled.Done
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text

11
src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt
View File

@ -1,7 +1,10 @@
package com.machiav3lli.fdroid.ui.compose.utils package com.machiav3lli.fdroid.ui.compose.utils
import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material3.ElevatedAssistChip
import androidx.compose.material3.* 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.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@ -13,7 +16,7 @@ import androidx.compose.ui.unit.dp
/** /**
* Basically a OutlineChip without spamming "ExperimentalMaterialApi" * Basically a OutlineChip without spamming "ExperimentalMaterialApi"
*/ */
@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun CustomChip( fun CustomChip(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
@ -25,7 +28,7 @@ fun CustomChip(
) { ) {
ElevatedAssistChip( ElevatedAssistChip(
modifier = modifier, modifier = modifier,
shape = Shapes.Full, shape = ShapeDefaults.Large,
onClick = { onClick(text) }, onClick = { onClick(text) },
label = { Text(text = text, color = borderColor) } label = { Text(text = text, color = borderColor) }
) )

4
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt
View File

@ -18,7 +18,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarScrollState import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
@ -74,7 +74,7 @@ class ExploreFragment : MainNavFragmentX() {
val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray()) val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray())
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior( val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(
rememberTopAppBarScrollState() rememberTopAppBarState()
) { true } ) { true }
AppTheme( AppTheme(

4
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt
View File

@ -29,7 +29,7 @@ import androidx.compose.material3.SuggestionChip
import androidx.compose.material3.SuggestionChipDefaults import androidx.compose.material3.SuggestionChipDefaults
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarScrollState import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
@ -92,7 +92,7 @@ class InstalledFragment : MainNavFragmentX() {
val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray()) val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray())
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior( val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(
rememberTopAppBarScrollState() rememberTopAppBarState()
) { true } ) { true }
AppTheme( AppTheme(

4
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt
View File

@ -20,7 +20,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarScrollState import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
@ -77,7 +77,7 @@ class LatestFragment : MainNavFragmentX() {
val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray()) val favorites by mainActivityX.db.extrasDao.favoritesLive.observeAsState(emptyArray())
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior( val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(
rememberTopAppBarScrollState() rememberTopAppBarState()
) { true } ) { true }
AppTheme( AppTheme(