athaliar/APKDownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump compose-material3 to latest alpha

Browse Source 
The library hasn't hit a stable release in over an year by now

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2025-06-18 15:47:46 +08:00
parent 2bffcafed5
commit a37485080f
10 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/aurora/store/compose/composables/SearchAppBarComposable.kt
View File

@@ -10,9 +10,6 @@ import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Clear
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -28,6 +25,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.tooling.preview.Preview
@@ -78,7 +76,7 @@ fun SearchAppBarComposable(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
painter = painterResource(R.drawable.ic_arrow_back),
contentDescription = null
)
}
@@ -92,7 +90,7 @@ fun SearchAppBarComposable(
focusManager.clearFocus(force = true)
}
) {
Icon(imageVector = Icons.Default.Clear, contentDescription = null)
Icon(painter = painterResource(R.drawable.ic_cancel), contentDescription = null)
}
}
actions()

9
app/src/main/java/com/aurora/store/compose/composables/TopAppBarComposable.kt
View File

@@ -6,8 +6,6 @@
package com.aurora.store.compose.composables
import androidx.compose.foundation.layout.RowScope
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -15,7 +13,8 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import com.aurora.store.R
@@ -33,7 +32,7 @@ import com.aurora.store.R
fun TopAppBarComposable(
modifier: Modifier = Modifier,
title: String? = null,
navigationIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack,
navigationIcon: Painter = painterResource(R.drawable.ic_arrow_back),
onNavigateUp: (() -> Unit)? = null,
actions: @Composable (RowScope.() -> Unit) = {}
) {
@@ -43,7 +42,7 @@ fun TopAppBarComposable(
navigationIcon = {
if (onNavigateUp != null) {
IconButton(onClick = onNavigateUp) {
Icon(imageVector = navigationIcon, contentDescription = null)
Icon(painter = navigationIcon, contentDescription = null)
}
}
},

7
app/src/main/java/com/aurora/store/compose/menu/AppDetailsMenu.kt
View File

@@ -6,8 +6,6 @@
package com.aurora.store.compose.menu
import androidx.compose.foundation.layout.Box
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
@@ -70,7 +68,10 @@ fun AppDetailsMenu(
Box(modifier = modifier) {
IconButton(onClick = { expanded = true }) {
Icon(Icons.Default.MoreVert, contentDescription = stringResource(R.string.menu))
Icon(
painter = painterResource(R.drawable.ic_more_vert),
contentDescription = stringResource(R.string.menu)
)
}
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
DropdownMenuItem(

8
app/src/main/java/com/aurora/store/compose/menu/BlacklistMenu.kt
View File

@@ -6,8 +6,6 @@
package com.aurora.store.compose.menu
import androidx.compose.foundation.layout.Box
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
@@ -19,6 +17,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import com.aurora.store.R
@@ -44,7 +43,10 @@ fun BlacklistMenu(
Box(modifier = modifier) {
IconButton(onClick = { expanded = true }) {
Icon(Icons.Default.MoreVert, contentDescription = stringResource(R.string.menu))
Icon(
painter = painterResource(R.drawable.ic_more_vert),
contentDescription = stringResource(R.string.menu)
)
}
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
DropdownMenuItem(

2
app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt
View File

@@ -428,7 +428,7 @@ private fun ScreenContentAppMainPane(
HeaderComposable(
title = stringResource(R.string.details_permission),
subtitle = if (app.permissions.isNotEmpty()) {
stringResource(R.string.permissions, app.permissions.size)
stringResource(R.string.permissions_requested, app.permissions.size)
} else {
stringResource(R.string.details_no_permission)
},

5
app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt
View File

@@ -12,8 +12,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Done
import androidx.compose.material3.FilterChip
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
@@ -27,6 +25,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.hilt.navigation.compose.hiltViewModel
@@ -154,7 +153,7 @@ private fun FilterHeader(onClick: (filter: Review.Filter) -> Unit) {
leadingIcon = {
if (selected) {
Icon(
imageVector = Icons.Filled.Done,
painter = painterResource(R.drawable.ic_check),
contentDescription = stringResource(filters.getValue(filter))
)
}