Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'disabled' state to rule list #223

Merged
merged 3 commits into from
Nov 30, 2024
+15 −1
Merged

Add 'disabled' state to rule list #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77e854b
Add 'disabled' state to rule list
bnichs Nov 1, 2024
1629239
Add translations for 'disabled'
bnichs Nov 12, 2024
9f08e5f
Compare enabled as int instead of bool
bnichs Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,17 @@ 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 == 0) {
if (rule.comment != null) append(" ")
append("(")
append(Text(stringResource(R.string.filter_rules_disabled)))
append(")")
}
})
},
trailingContent = {
Text(
text = dateTimeInstance.format(rule.dateAdded * 1000L)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-pl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ro/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down