#1308 - Added high contrast theme

ukanth · ukanth · commit fbc16cf166d0 · 2025-12-23T22:25:54.000+05:30
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "dev.ukanth.ufirewall"
         //applicationId "dev.ukanth.ufirewall.donate"
         minSdkVersion 21
-        versionCode 20251223
-        versionName "4.0.1"
+        versionCode 20260130
+        versionName "4.0.2"
         buildConfigField 'boolean', 'DONATE', 'false'
         vectorDrawables.useSupportLibrary = true
         ndk {
diff --git a/app/src/main/java/dev/ukanth/ufirewall/MainActivity.java b/app/src/main/java/dev/ukanth/ufirewall/MainActivity.java
@@ -363,6 +363,9 @@ private void initTheme() {
             case "L":
                 setTheme(R.style.AppLightTheme);
                 break;
+            case "LHC":
+                setTheme(R.style.AppLightHighContrastTheme);
+                break;
             case "B":
                 setTheme(R.style.AppBlackTheme);
                 break;
diff --git a/app/src/main/java/dev/ukanth/ufirewall/activity/AppDetailActivity.java b/app/src/main/java/dev/ukanth/ufirewall/activity/AppDetailActivity.java
@@ -146,6 +146,9 @@ private void initTheme() {
                 setTheme(R.style.AppLightTheme);
                 //set other colors
                 break;
+            case "LHC":
+                setTheme(R.style.AppLightHighContrastTheme);
+                break;
             case "B":
                 setTheme(R.style.AppBlackTheme);
                 break;
diff --git a/app/src/main/java/dev/ukanth/ufirewall/activity/CustomScriptActivity.java b/app/src/main/java/dev/ukanth/ufirewall/activity/CustomScriptActivity.java
@@ -91,6 +91,9 @@ private void initTheme() {
             case "L":
                 setTheme(R.style.AppLightTheme);
                 break;
+            case "LHC":
+                setTheme(R.style.AppLightHighContrastTheme);
+                break;
             case "B":
                 setTheme(R.style.AppBlackTheme);
                 break;
diff --git a/app/src/main/java/dev/ukanth/ufirewall/activity/DataDumpActivity.java b/app/src/main/java/dev/ukanth/ufirewall/activity/DataDumpActivity.java
@@ -288,6 +288,7 @@ private void initTheme() {
         switch (G.getSelectedTheme()) {
             case "D" -> setTheme(R.style.AppDarkTheme);
             case "L" -> setTheme(R.style.AppLightTheme);
+            case "LHC" -> setTheme(R.style.AppLightHighContrastTheme);
             case "B" -> setTheme(R.style.AppBlackTheme);
         }
     }
diff --git a/app/src/main/java/dev/ukanth/ufirewall/activity/HelpActivity.java b/app/src/main/java/dev/ukanth/ufirewall/activity/HelpActivity.java
@@ -53,6 +53,9 @@ private void initTheme() {
             case "L":
                 setTheme(R.style.AppLightTheme);
                 break;
+            case "LHC":
+                setTheme(R.style.AppLightHighContrastTheme);
+                break;
             case "B":
                 setTheme(R.style.AppBlackTheme);
                 break;
diff --git a/app/src/main/java/dev/ukanth/ufirewall/activity/LogDetailActivity.java b/app/src/main/java/dev/ukanth/ufirewall/activity/LogDetailActivity.java
@@ -112,6 +112,9 @@ private void initTheme() {
             case "L":
                 setTheme(R.style.AppLightTheme);
                 break;
+            case "LHC":
+                setTheme(R.style.AppLightHighContrastTheme);
+                break;
             case "B":
                 setTheme(R.style.AppBlackTheme);
                 break;
diff --git a/app/src/main/java/dev/ukanth/ufirewall/preferences/PreferencesActivity.java b/app/src/main/java/dev/ukanth/ufirewall/preferences/PreferencesActivity.java
@@ -77,6 +77,9 @@ private void initTheme() {
             case "L":
                 setTheme(R.style.AppLightTheme);
                 break;
+            case "LHC":
+                setTheme(R.style.AppLightHighContrastTheme);
+                break;
             case "B":
                 setTheme(R.style.AppBlackTheme);
                 break;
diff --git a/app/src/main/java/dev/ukanth/ufirewall/preferences/ThemePreferenceFragment.java b/app/src/main/java/dev/ukanth/ufirewall/preferences/ThemePreferenceFragment.java
@@ -66,6 +66,14 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
                             G.getSelectedTheme("D");
                         }
                         break;
+                    case "LHC":
+                        if ((G.isDoKey(ctx) || isDonate())) {
+                            G.getInstance().setTheme(R.style.AppLightHighContrastTheme);
+                        } else {
+                            Api.toast(ctx, ctx.getText(R.string.donate_only), Toast.LENGTH_LONG);
+                            G.getSelectedTheme("D");
+                        }
+                        break;
                     case "B":
                         if ((G.isDoKey(ctx) || isDonate())) {
                             G.getInstance().setTheme(R.style.AppBlackTheme);
diff --git a/app/src/main/java/dev/ukanth/ufirewall/util/G.java b/app/src/main/java/dev/ukanth/ufirewall/util/G.java
@@ -596,7 +596,7 @@ public static String storedProfile(String val) {
     }
 
     public static int userColor() {
-        if (G.getSelectedTheme().equals("L")) {
+        if (G.getSelectedTheme().equals("L") || G.getSelectedTheme().equals("LHC")) {
             return Color.parseColor("#000000");
         } else {
             return Color.parseColor("#FFFFFF");
@@ -606,6 +606,9 @@ public static int userColor() {
     public static int sysColor() {
         if (G.getSelectedTheme().equals("L")) {
             return gPrefs.getInt(SYSTEM_APP_COLOR, Color.parseColor("#000000"));
+        } else if (G.getSelectedTheme().equals("LHC")) {
+            // High contrast: always black, no custom colors
+            return Color.parseColor("#000000");
         } else {
             return gPrefs.getInt(SYSTEM_APP_COLOR, Color.parseColor("#0F9D58"));
         }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -208,12 +208,14 @@
     <string-array name="themeOptions">
         <item>Dark</item>
         <item>Light (Donate)</item>
+        <item>Light High Contrast (Donate)</item>
         <item>Black (Donate)</item>
     </string-array>
 
     <string-array name="themeValues">
         <item>D</item>
         <item>L</item>
+        <item>LHC</item>
         <item>B</item>
     </string-array>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -33,6 +33,26 @@
         <item name="tint">@color/black</item>
     </style>
 
+    <!-- High-contrast light theme for E-paper displays (Issue #1308) -->
+    <style name="AppLightHighContrastTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:textColor">@color/black</item>
+
+        <!-- White toolbar for maximum contrast with black text -->
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorPrimaryDark">@color/white</item>
+        <item name="colorAccent">@color/black</item>
+
+        <item name="itemBackground">@color/white</item>
+
+        <!-- Ensure all text is pure black -->
+        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColorSecondary">@color/black</item>
+
+        <item name="colorControlNormal">@color/black</item>
+        <item name="tint">@color/black</item>
+    </style>
+
     <!-- Dark style for all standard Locale and Locale plug-in Activity instances -->
     <style name="Theme.Locale.Dark" parent="android:Theme" />
 

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,7 @@ private void initTheme() {`
`288`	`288`	`switch (G.getSelectedTheme()) {`
`289`	`289`	`case "D" -> setTheme(R.style.AppDarkTheme);`
`290`	`290`	`case "L" -> setTheme(R.style.AppLightTheme);`
	`291`	`+ case "LHC" -> setTheme(R.style.AppLightHighContrastTheme);`
`291`	`292`	`case "B" -> setTheme(R.style.AppBlackTheme);`
`292`	`293`	`}`
`293`	`294`	`}`