compose: blacklist: Minor changes to menu

Drop leading icons as they look odd

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2025-05-16 17:56:06 +08:00
parent e7f6d40709
commit 3a23088525
7 changed files with 7 additions and 110 deletions

View File

@@ -1,35 +0,0 @@
/*
* SPDX-FileCopyrightText: 2025 The Calyx Institute
* SPDX-License-Identifier: GPL-3.0-or-later
*/
package com.aurora.store.compose.composables
import androidx.compose.material3.Icon
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import com.aurora.store.R
/**
* A transparent icon for occupying space
*
* This is useful for occupying spaces in composable where alignment is not respected such as
* DropDownMenu.
* @param modifier The modifier to be applied to the composable
*/
@Composable
fun TransparentIconComposable(modifier: Modifier = Modifier) {
Icon(
modifier = modifier,
painter = painterResource(R.drawable.ic_transparent),
contentDescription = null
)
}
@Preview(showBackground = true)
@Composable
private fun TransparentIconComposablePreview() {
TransparentIconComposable()
}

View File

@@ -10,7 +10,6 @@ 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.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
@@ -20,11 +19,9 @@ 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
import com.aurora.store.compose.composables.TransparentIconComposable
import com.aurora.store.compose.menu.items.BlacklistMenuItem
/**
@@ -52,39 +49,19 @@ fun BlacklistMenu(
DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
DropdownMenuItem(
text = { Text(text = stringResource(R.string.action_select_all)) },
onClick = { onClick(BlacklistMenuItem.SELECT_ALL) },
leadingIcon = {
Icon(
painter = painterResource(R.drawable.ic_select_all),
contentDescription = null
)
}
onClick = { onClick(BlacklistMenuItem.SELECT_ALL) }
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.action_remove_all)) },
onClick = { onClick(BlacklistMenuItem.REMOVE_ALL) },
leadingIcon = { TransparentIconComposable() }
onClick = { onClick(BlacklistMenuItem.REMOVE_ALL) }
)
HorizontalDivider()
DropdownMenuItem(
text = { Text(text = stringResource(R.string.action_import)) },
onClick = { onClick(BlacklistMenuItem.IMPORT) },
leadingIcon = {
Icon(
painter = painterResource(R.drawable.ic_file_import),
contentDescription = null
)
}
onClick = { onClick(BlacklistMenuItem.IMPORT) }
)
DropdownMenuItem(
text = { Text(text = stringResource(R.string.action_export)) },
onClick = { onClick(BlacklistMenuItem.EXPORT) },
leadingIcon = {
Icon(
painter = painterResource(R.drawable.ic_file_export),
contentDescription = null
)
}
onClick = { onClick(BlacklistMenuItem.EXPORT) }
)
}
}

View File

@@ -100,8 +100,8 @@ private fun ScreenContent(
@Composable
fun SetupMenu() {
BlacklistMenu { blacklistMenuItem ->
when (blacklistMenuItem) {
BlacklistMenu { menuItem ->
when (menuItem) {
BlacklistMenuItem.SELECT_ALL -> onBlacklistAll()
BlacklistMenuItem.REMOVE_ALL -> onWhitelistAll()
BlacklistMenuItem.IMPORT -> {

View File

@@ -209,7 +209,7 @@ private fun ScreenContentApp(
download: Download? = null,
installProgress: Float? = null,
plexusScores: Scores? = null,
dataSafetyReport: com.aurora.gplayapi.data.models.datasafety.Report? = null,
dataSafetyReport: DataSafetyReport? = null,
exodusReport: Report? = null,
hasValidUpdate: Boolean = false,
onNavigateUp: () -> Unit = {},