From 77e854b970c4018e0398d4a2df40f076fe65a700 Mon Sep 17 00:00:00 2001
From: Ben <mail@ben-nichols.net>
Date: Thu, 31 Oct 2024 22:43:29 -0500
Subject: [PATCH 1/3] Add 'disabled' state to rule list

---
 .../ui/screen/filterrules/FilterRulesScreen.kt         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt b/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
index eefaf79..40a110e 100644
--- a/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
+++ b/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
@@ -211,7 +211,15 @@ fun FilterRulesScreen(viewModel: FilterRulesViewModel = hiltViewModel()) {
                                             else -> null
                                         },
                                         headlineContent = { Text(rule.domain) },
-                                        supportingContent = rule.comment?.let { { Text(it) } },
+                                        supportingContent = {
+                                            Text(buildString {
+                                                rule.comment?.let { append(it) }
+                                                if (!rule.enabled) {
+                                                    if (rule.comment != null) append(" ")
+                                                    append("(disabled)")
+                                                }
+                                            })
+                                        },
                                         trailingContent = {
                                             Text(
                                                 text = dateTimeInstance.format(rule.dateAdded * 1000L)

From 162923966301d8f01dc7e62decd118a2e3154a0a Mon Sep 17 00:00:00 2001
From: Ben <mail@ben-nichols.net>
Date: Tue, 12 Nov 2024 11:04:19 -0600
Subject: [PATCH 2/3] Add translations for 'disabled'

---
 .../piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt  | 4 +++-
 app/src/main/res/values-de/strings.xml                        | 1 +
 app/src/main/res/values-pl/strings.xml                        | 1 +
 app/src/main/res/values-ro/strings.xml                        | 1 +
 app/src/main/res/values/strings.xml                           | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt b/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
index 40a110e..4becef0 100644
--- a/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
+++ b/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
@@ -216,7 +216,9 @@ fun FilterRulesScreen(viewModel: FilterRulesViewModel = hiltViewModel()) {
                                                 rule.comment?.let { append(it) }
                                                 if (!rule.enabled) {
                                                     if (rule.comment != null) append(" ")
-                                                    append("(disabled)")
+                                                    append("(")
+                                                    append(Text(stringResource(R.string.filter_rules_disabled)))
+                                                    append(")")
                                                 }
                                             })
                                         },
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8bb228a..d35eddd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -28,6 +28,7 @@
     <string name="filter_rules_desc_delete_filter">Netzwerkfilter löschen</string>
     <string name="filter_rules_reg_exr">RegExp</string>
     <string name="filter_rules_whitelist">Whitelist</string>
+    <string name="filter_rules_disabled">deaktiviert</string>
     <string name="home_ads_over_time">Blockiert</string>
     <string name="home_blocklist">Domains in Adlist</string>
     <string name="home_percent_blocked">Prozentual blockiert</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b494e39..418c2ec 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -28,6 +28,7 @@
     <string name="filter_rules_desc_delete_filter">Usuń filtr</string>
     <string name="filter_rules_reg_exr">RegEx</string>
     <string name="filter_rules_whitelist">Biała lista</string>
+    <string name="filter_rules_disabled">wyłączony</string>
     <string name="home_ads_over_time">Zablokowany</string>
     <string name="home_blocklist">Lista zablokowanych</string>
     <string name="home_percent_blocked">Procent zablokowania</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 21347ad..0cee99a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -28,6 +28,7 @@
     <string name="filter_rules_desc_delete_filter">Șterge filtru</string>
     <string name="filter_rules_reg_exr">RegEx</string>
     <string name="filter_rules_whitelist">Listă permise</string>
+    <string name="filter_rules_disabled">dezactivat</string>
     <string name="home_ads_over_time">blocate</string>
     <string name="home_blocklist">Listă blocate</string>
     <string name="home_percent_blocked">Procent Blocate</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1ff78ed..1389fb5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="filter_rules_desc_delete_filter">Delete filter</string>
     <string name="filter_rules_reg_exr">RegEx</string>
     <string name="filter_rules_whitelist">Whitelist</string>
+    <string name="filter_rules_disabled">disabled</string>
     <string name="home_ads_over_time">blocked</string>
     <string name="home_blocklist">Blocklist</string>
     <string name="home_percent_blocked">Percent Blocked</string>

From 9f08e5fd5495572cf8b77b0caffd7dda876a74f0 Mon Sep 17 00:00:00 2001
From: Ben <mail@ben-nichols.net>
Date: Wed, 13 Nov 2024 18:01:15 -0600
Subject: [PATCH 3/3] Compare enabled as int instead of bool

---
 .../piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt b/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
index 4becef0..31861a8 100644
--- a/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
+++ b/app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
@@ -214,7 +214,7 @@ fun FilterRulesScreen(viewModel: FilterRulesViewModel = hiltViewModel()) {
                                         supportingContent = {
                                             Text(buildString {
                                                 rule.comment?.let { append(it) }
-                                                if (!rule.enabled) {
+                                                if (rule.enabled == 0) {
                                                     if (rule.comment != null) append(" ")
                                                     append("(")
                                                     append(Text(stringResource(R.string.filter_rules_disabled)))