compose: blacklist: Minor changes to menu

Drop leading icons as they look odd

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>

app/src/main/java/com/aurora/store/compose/composables/TransparentIconComposable.kt

@@ -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()
-}

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

@@ -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) },
+                onClick = { onClick(BlacklistMenuItem.SELECT_ALL) }
-                leadingIcon = {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_select_all),
-                        contentDescription = null
-                    )
-                }
             )
             DropdownMenuItem(
                 text = { Text(text = stringResource(R.string.action_remove_all)) },
-                onClick = { onClick(BlacklistMenuItem.REMOVE_ALL) },
+                onClick = { onClick(BlacklistMenuItem.REMOVE_ALL) }
-                leadingIcon = { TransparentIconComposable() }
             )
-            HorizontalDivider()
             DropdownMenuItem(
                 text = { Text(text = stringResource(R.string.action_import)) },
-                onClick = { onClick(BlacklistMenuItem.IMPORT) },
+                onClick = { onClick(BlacklistMenuItem.IMPORT) }
-                leadingIcon = {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_file_import),
-                        contentDescription = null
-                    )
-                }
             )
             DropdownMenuItem(
                 text = { Text(text = stringResource(R.string.action_export)) },
-                onClick = { onClick(BlacklistMenuItem.EXPORT) },
+                onClick = { onClick(BlacklistMenuItem.EXPORT) }
-                leadingIcon = {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_file_export),
-                        contentDescription = null
-                    )
-                }
             )
         }
     }

app/src/main/java/com/aurora/store/compose/ui/commons/BlacklistScreen.kt

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

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

@@ -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 = {},

app/src/main/res/drawable/ic_file_export.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ SPDX-FileCopyrightText: Material Design Authors / Google LLC
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M440,760L520,760L520,593L584,657L640,600L480,440L320,600L377,656L440,593L440,760ZM240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L720,800Q720,800 720,800Q720,800 720,800L720,360L520,360ZM240,160L240,160L240,360L240,360L240,160L240,360L240,360L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z"/>
-</vector>

app/src/main/res/drawable/ic_file_import.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ SPDX-FileCopyrightText: Material Design Authors / Google LLC
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M720,840L880,680L824,624L760,688L760,521L680,521L680,688L616,624L560,680L720,840ZM560,960L560,880L880,880L880,960L560,960ZM240,800Q207,800 183.5,776.5Q160,753 160,720L160,160Q160,127 183.5,103.5Q207,80 240,80L520,80L760,320L760,441L680,441L680,360L480,360L480,160L240,160Q240,160 240,160Q240,160 240,160L240,720Q240,720 240,720Q240,720 240,720L480,720L480,800L240,800ZM240,720L240,441L240,441L240,360L240,160L240,160Q240,160 240,160Q240,160 240,160L240,720Q240,720 240,720Q240,720 240,720Z"/>
-</vector>

app/src/main/res/drawable/ic_select_all.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ SPDX-FileCopyrightText: Material Design Authors / Google LLC
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M280,680L280,280L680,280L680,680L280,680ZM360,600L600,600L600,360L360,360L360,600ZM200,760L200,840Q167,840 143.5,816.5Q120,793 120,760L200,760ZM120,680L120,600L200,600L200,680L120,680ZM120,520L120,440L200,440L200,520L120,520ZM120,360L120,280L200,280L200,360L120,360ZM200,200L120,200Q120,167 143.5,143.5Q167,120 200,120L200,200ZM280,840L280,760L360,760L360,840L280,840ZM280,200L280,120L360,120L360,200L280,200ZM440,840L440,760L520,760L520,840L440,840ZM440,200L440,120L520,120L520,200L440,200ZM600,840L600,760L680,760L680,840L600,840ZM600,200L600,120L680,120L680,200L600,200ZM760,840L760,760L840,760Q840,793 816.5,816.5Q793,840 760,840ZM760,680L760,600L840,600L840,680L760,680ZM760,520L760,440L840,440L840,520L760,520ZM760,360L760,280L840,280L840,360L760,360ZM760,200L760,120Q793,120 816.5,143.5Q840,167 840,200L760,200Z"/>
-</vector>