Merge pull request #2064 from hussainmohd-a/v055n

v055q

Author: hussainmohd-a

app/src/full/java/com/celzero/bravedns/ui/bottomsheet/FirewallAppFilterBottomSheet.kt

@@ -85,6 +85,7 @@ class FirewallAppFilterBottomSheet : BottomSheetDialogFragment() {
             return
         } else {
             this.filters.firewallFilter = f.firewallFilter
+            this.filters.categoryFilters.addAll(f.categoryFilters)
         }
 
         applyParentFilter(f.topLevelFilter.id)
@@ -190,23 +191,20 @@ class FirewallAppFilterBottomSheet : BottomSheetDialogFragment() {
         when (tag) {
             AppListActivity.TopLevelFilter.ALL.id -> {
                 filters.topLevelFilter = AppListActivity.TopLevelFilter.ALL
-                filters.categoryFilters.clear()
                 io {
                     val categories = FirewallManager.getAllCategories()
                     uiCtx { remakeChildFilterChipsUi(categories) }
                 }
             }
             AppListActivity.TopLevelFilter.INSTALLED.id -> {
                 filters.topLevelFilter = AppListActivity.TopLevelFilter.INSTALLED
-                filters.categoryFilters.clear()
                 io {
                     val categories = FirewallManager.getCategoriesForInstalledApps()
                     uiCtx { remakeChildFilterChipsUi(categories) }
                 }
             }
             AppListActivity.TopLevelFilter.SYSTEM.id -> {
                 filters.topLevelFilter = AppListActivity.TopLevelFilter.SYSTEM
-                filters.categoryFilters.clear()
                 io {
                     val categories = FirewallManager.getCategoriesForSystemApps()
                     uiCtx { remakeChildFilterChipsUi(categories) }
@@ -218,14 +216,21 @@ class FirewallAppFilterBottomSheet : BottomSheetDialogFragment() {
     private fun remakeChildFilterChipsUi(categories: List<String>) {
         b.ffaChipGroup.removeAllViews()
         for (c in categories) {
-            b.ffaChipGroup.addView(makeChildChip(c))
+            if (filters.categoryFilters.contains(c)) {
+                // if the category is already selected, check the chip
+                b.ffaChipGroup.addView(makeChildChip(c, true))
+            } else {
+                b.ffaChipGroup.addView(makeChildChip(c, false))
+            }
         }
     }
 
-    private fun makeChildChip(title: String): Chip {
+    private fun makeChildChip(title: String, checked: Boolean): Chip {
         val chip = this.layoutInflater.inflate(R.layout.item_chip_filter, b.root, false) as Chip
         chip.text = title
         chip.tag = title
+        chip.isChecked = checked
+        if (checked) colorUpChipIcon(chip)
 
         chip.setOnCheckedChangeListener { compoundButton: CompoundButton, isSelected: Boolean ->
             applyChildFilter(compoundButton.tag, isSelected)

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.celzero.bravedns"
-    android:versionCode="48"
-    android:versionName="v055p"> <!-- 48 for v055p -->
+    android:versionCode="49"
+    android:versionName="v055q"> <!-- 49 for v055q -->
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />