From a516cc0007ba6978a5fc562411c9bdaecf41932d Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 25 Nov 2015 20:51:44 +0100 Subject: [PATCH] Low/highlight rule conditions too --- .../main/java/eu/faircode/netguard/RuleAdapter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/RuleAdapter.java b/app/src/main/java/eu/faircode/netguard/RuleAdapter.java index 4af108de..8e2f0c54 100644 --- a/app/src/main/java/eu/faircode/netguard/RuleAdapter.java +++ b/app/src/main/java/eu/faircode/netguard/RuleAdapter.java @@ -242,18 +242,22 @@ public class RuleAdapter extends RecyclerView.Adapter im color = Color.argb(128, Color.red(color), Color.green(color), Color.blue(color)); holder.tvName.setTextColor(color); - holder.cbWifi.setAlpha(wifiActive ? 1 : 0.4f); + holder.cbWifi.setAlpha(wifiActive ? 1 : 0.5f); holder.cbWifi.setOnCheckedChangeListener(null); holder.cbWifi.setChecked(rule.wifi_blocked); holder.cbWifi.setOnCheckedChangeListener(cbListener); - holder.cbOther.setAlpha(otherActive ? 1 : 0.4f); + holder.ivScreenWifi.setAlpha(wifiActive ? 1 : 0.5f); + holder.ivScreenWifi.setVisibility(rule.screen_wifi && rule.wifi_blocked ? View.VISIBLE : View.INVISIBLE); + + holder.cbOther.setAlpha(otherActive ? 1 : 0.5f); holder.cbOther.setOnCheckedChangeListener(null); holder.cbOther.setChecked(rule.other_blocked); holder.cbOther.setOnCheckedChangeListener(cbListener); - holder.ivScreenWifi.setVisibility(rule.screen_wifi && rule.wifi_blocked ? View.VISIBLE : View.INVISIBLE); + holder.ivScreenOther.setAlpha(otherActive ? 1 : 0.5f); holder.ivScreenOther.setVisibility(rule.screen_other && rule.other_blocked ? View.VISIBLE : View.INVISIBLE); + holder.tvRoaming.setAlpha(otherActive ? 1 : 0.5f); holder.tvRoaming.setVisibility(rule.roaming && (!rule.other_blocked || rule.screen_other) ? View.VISIBLE : View.INVISIBLE); holder.llConfiguration.setVisibility(rule.expanded ? View.VISIBLE : View.GONE);