🔮 Merge repository updated to latest snapshot!

Script Execution UTC Time: null Signed-off-by: validcube <[email protected]>
ReVanced · Aug 7, 2024 · 2b305bf · 2b305bf
2 parents f2f7b2a + edc11b6
commit 2b305bf
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 10 deletions.
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -24,7 +24,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
         env:

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -21,7 +21,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
         env:

diff --git a/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt b/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
@@ -570,7 +570,12 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
 
                     ExtendedFloatingActionButton(
                         text = { Text(stringResource(R.string.add)) },
-                        icon = { Icon(Icons.Outlined.Add, null) },
+                        icon = {
+                            Icon(
+                                Icons.Outlined.Add,
+                                stringResource(R.string.add)
+                            )
+                        },
                         expanded = lazyListState.isScrollingUp,
                         onClick = { items.add(Item(null)) }
                     )

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
@@ -162,7 +162,7 @@ fun PatchesSelectorScreen(
     if (showSelectionWarning) {
         SelectionWarningDialog(onDismiss = { showSelectionWarning = false })
     }
-    vm.pendingUniversalPatchAction?.let { 
+    vm.pendingUniversalPatchAction?.let {
         UniversalPatchWarningDialog(
             onCancel = vm::dismissUniversalPatchWarning,
             onConfirm = vm::confirmUniversalPatchWarning
@@ -295,8 +295,14 @@ fun PatchesSelectorScreen(
 
             ExtendedFloatingActionButton(
                 text = { Text(stringResource(R.string.save)) },
-                icon = { Icon(Icons.Outlined.Save, null) },
-                expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp ?: true,
+                icon = {
+                    Icon(
+                        Icons.Outlined.Save,
+                        stringResource(R.string.save)
+                    )
+                },
+                expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
+                    ?: true,
                 onClick = {
                     // TODO: only allow this if all required options have been set.
                     onSave(vm.getCustomSelection(), vm.getOptions())
@@ -566,7 +572,13 @@ private fun OptionsDialog(
                     if (values == null || !values.contains(key)) option.default else values[key]
 
                 @Suppress("UNCHECKED_CAST")
-                OptionItem(option = option as Option<Any>, value = value, setValue = { set(key, it) })
+                OptionItem(
+                    option = option as Option<Any>,
+                    value = value,
+                    setValue = {
+                        set(key, it)
+                    }
+                )
             }
         }
     }

diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
@@ -163,7 +163,12 @@ private fun SelectedAppInfoScreen(
         floatingActionButton = {
             ExtendedFloatingActionButton(
                 text = { Text(stringResource(R.string.patch)) },
-                icon = { Icon(Icons.Default.AutoFixHigh, null) },
+                icon = {
+                    Icon(
+                        Icons.Default.AutoFixHigh,
+                        stringResource(R.string.patch)
+                    )
+                },
                 onClick = onPatchClick
             )
         }

diff --git a/app/src/main/java/app/revanced/manager/ui/screen/VersionSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/VersionSelectorScreen.kt
@@ -83,7 +83,12 @@ fun VersionSelectorScreen(
         floatingActionButton = {
             ExtendedFloatingActionButton(
                 text = { Text(stringResource(R.string.select_version)) },
-                icon = { Icon(Icons.Default.Check, null) },
+                icon = {
+                    Icon(
+                        Icons.Default.Check,
+                        stringResource(R.string.select_version)
+                    )
+                },
                 expanded = lazyListState.isScrollingUp,
                 onClick = { viewModel.selectedVersion?.let(onAppClick) }
             )

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
@@ -101,7 +101,7 @@ class PatchesSelectorViewModel(input: Params) : ViewModel(), KoinComponent {
 
     val compatibleVersions = mutableStateListOf<String>()
 
-    var filter by mutableIntStateOf(SHOW_SUPPORTED or SHOW_UNIVERSAL or SHOW_UNSUPPORTED)
+    var filter by mutableIntStateOf(0)
         private set
 
     private val defaultPatchSelection = bundlesFlow.map { bundles ->

diff --git a/gradle.properties b/gradle.properties
@@ -23,3 +23,4 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
 org.gradle.configuration-cache=true
+org.gradle.caching=true