Update the filter menu

ReVanced · Jan 6, 2025 · 7c4272d · 7c4272d
1 parent 05e702d
commit 7c4272d
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 27 deletions.
diff --git a/app/src/main/java/app/revanced/manager/ui/component/CheckedFilterChip.kt b/app/src/main/java/app/revanced/manager/ui/component/CheckedFilterChip.kt
@@ -0,0 +1,61 @@
+package app.revanced.manager.ui.component
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandIn
+import androidx.compose.animation.shrinkOut
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Done
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.FilterChipDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.SelectableChipColors
+import androidx.compose.material3.SelectableChipElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+
+@Composable
+fun CheckedFilterChip(
+    selected: Boolean,
+    onClick: () -> Unit,
+    label: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    trailingIcon: @Composable (() -> Unit)? = null,
+    shape: Shape = FilterChipDefaults.shape,
+    colors: SelectableChipColors = FilterChipDefaults.filterChipColors(),
+    elevation: SelectableChipElevation? = FilterChipDefaults.filterChipElevation(),
+    border: BorderStroke? = FilterChipDefaults.filterChipBorder(enabled, selected),
+    interactionSource: MutableInteractionSource? = null
+) {
+    FilterChip(
+        selected = selected,
+        onClick = onClick,
+        label = label,
+        modifier = modifier,
+        enabled = enabled,
+        leadingIcon = {
+            AnimatedVisibility(
+                visible = selected,
+                enter = expandIn(expandFrom = Alignment.CenterStart),
+                exit = shrinkOut(shrinkTowards = Alignment.CenterStart)
+            ) {
+                Icon(
+                    modifier = Modifier.size(FilterChipDefaults.IconSize),
+                    imageVector = Icons.Filled.Done,
+                    contentDescription = null,
+                )
+            }
+        },
+        trailingIcon = trailingIcon,
+        shape = shape,
+        colors = colors,
+        elevation = elevation,
+        border = border,
+        interactionSource = interactionSource
+    )
+}
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@@ -48,6 +48,7 @@ import app.revanced.manager.R
 import app.revanced.manager.patcher.patch.Option
 import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.ui.component.AppTopBar
+import app.revanced.manager.ui.component.CheckedFilterChip
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.SafeguardDialog
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
@@ -57,14 +58,13 @@ import app.revanced.manager.ui.component.patches.OptionItem
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_SUPPORTED
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNIVERSAL
-import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNSUPPORTED
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.isScrollingUp
 import app.revanced.manager.util.transparentListItemColors
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
 fun PatchesSelectorScreen(
     onSave: (PatchSelection?, Options) -> Unit,
@@ -127,27 +127,22 @@ fun PatchesSelectorScreen(
                     style = MaterialTheme.typography.titleMedium
                 )
 
-                Row(
+                FlowRow(
                     modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(5.dp)
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    verticalArrangement = Arrangement.spacedBy(12.dp)
                 ) {
-                    FilterChip(
+                    CheckedFilterChip(
                         selected = vm.filter and SHOW_SUPPORTED != 0,
                         onClick = { vm.toggleFlag(SHOW_SUPPORTED) },
                         label = { Text(stringResource(R.string.supported)) }
                     )
 
-                    FilterChip(
+                    CheckedFilterChip(
                         selected = vm.filter and SHOW_UNIVERSAL != 0,
                         onClick = { vm.toggleFlag(SHOW_UNIVERSAL) },
                         label = { Text(stringResource(R.string.universal)) },
                     )
-
-                    FilterChip(
-                        selected = vm.filter and SHOW_UNSUPPORTED != 0,
-                        onClick = { vm.toggleFlag(SHOW_UNSUPPORTED) },
-                        label = { Text(stringResource(R.string.unsupported)) },
-                    )
                 }
             }
         }
@@ -194,11 +189,11 @@ fun PatchesSelectorScreen(
     fun LazyListScope.patchList(
         uid: Int,
         patches: List<PatchInfo>,
-        filterFlag: Int,
+        visible: Boolean,
         supported: Boolean,
         header: (@Composable () -> Unit)? = null
     ) {
-        if (patches.isNotEmpty() && (vm.filter and filterFlag) != 0 || vm.filter == 0) {
+        if (patches.isNotEmpty() && visible) {
             header?.let {
                 item {
                     it()
@@ -311,26 +306,25 @@ fun PatchesSelectorScreen(
                     patchList(
                         uid = bundle.uid,
                         patches = bundle.supported.searched(),
-                        filterFlag = SHOW_SUPPORTED,
+                        visible = true,
                         supported = true
                     )
                     patchList(
                         uid = bundle.uid,
                         patches = bundle.universal.searched(),
-                        filterFlag = SHOW_UNIVERSAL,
+                        visible = vm.filter and SHOW_UNIVERSAL != 0,
                         supported = true
                     ) {
                         ListHeader(
                             title = stringResource(R.string.universal_patches),
                         )
                     }
 
-                    if (!vm.allowIncompatiblePatches) return@LazyColumnWithScrollbar
                     patchList(
                         uid = bundle.uid,
                         patches = bundle.unsupported.searched(),
-                        filterFlag = SHOW_UNSUPPORTED,
-                        supported = true
+                        visible = vm.filter and SHOW_SUPPORTED == 0,
+                        supported = vm.allowIncompatiblePatches
                     ) {
                         ListHeader(
                             title = stringResource(R.string.unsupported_patches),
@@ -447,13 +441,13 @@ fun PatchesSelectorScreen(
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.supported,
-                            filterFlag = SHOW_SUPPORTED,
+                            visible = true,
                             supported = true
                         )
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.universal,
-                            filterFlag = SHOW_UNIVERSAL,
+                            visible = vm.filter and SHOW_UNIVERSAL != 0,
                             supported = true
                         ) {
                             ListHeader(
@@ -463,7 +457,7 @@ fun PatchesSelectorScreen(
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.unsupported,
-                            filterFlag = SHOW_UNSUPPORTED,
+                            visible = vm.filter and SHOW_SUPPORTED == 0,
                             supported = vm.allowIncompatiblePatches
                         ) {
                             ListHeader(

diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatchesSelectorViewModel.kt
@@ -2,6 +2,7 @@ package app.revanced.manager.ui.viewmodel
 
 import android.app.Application
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.setValue
@@ -104,7 +105,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
 
     val compatibleVersions = mutableStateListOf<String>()
 
-    var filter by mutableIntStateOf(0)
+    var filter by mutableIntStateOf(SHOW_SUPPORTED xor SHOW_UNIVERSAL)
         private set
 
     private val defaultPatchSelection = bundlesFlow.map { bundles ->
@@ -220,7 +221,6 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
     companion object {
         const val SHOW_SUPPORTED = 1 // 2^0
         const val SHOW_UNIVERSAL = 2 // 2^1
-        const val SHOW_UNSUPPORTED = 4 // 2^2
 
         private val optionsSaver: Saver<PersistentOptions, Options> = snapshotStateMapSaver(
             // Patch name -> Options

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -210,7 +210,7 @@
     <string name="no_patched_apps_found">No patched apps found</string>
     <string name="tap_on_patches">Tap on the patches to get more information about them</string>
     <string name="bundles_selected">%s selected</string>
-    <string name="unsupported_patches">Unsupported patches</string>
+    <string name="unsupported_patches">Incompatible patches</string>
     <string name="universal_patches">Universal patches</string>
     <string name="patch_selection_reset_toast">Patch selection and options has been reset to recommended defaults</string>
     <string name="patch_options_reset_toast">Patch options have been reset</string>
@@ -219,8 +219,8 @@
     <string name="selection_warning_title">Stop using defaults?</string>
     <string name="selection_warning_description">It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou need to turn on \"Allow changing patch selection\" in the advanced settings before toggling patches.</string>
     <string name="universal_patch_warning_description">Universal patches have a more generalized use and do not work as reliably as patches that target specific apps. You may encounter issues while using them.\n\nThis warning can be disabled in the advanced settings.</string>
-    <string name="supported">Supported</string>
-    <string name="universal">Universal</string>
+    <string name="supported">This version</string>
+    <string name="universal">Any app</string>
     <string name="unsupported">Unsupported</string>
     <string name="search_patches">Search patches</string>
     <string name="app_not_supported">This patch is not compatible with the selected app version (%1$s).\n\nIt only supports the following version(s): %2$s.</string>