Added blank theme

M66B · Jul 12, 2024 · 3cd927f · 3cd927f
1 parent 52020aa
commit 3cd927f
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 5 deletions.
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
@@ -231,6 +231,10 @@ else if (dark || black)
                 rgTheme.check(R.id.rbThemeSolarized);
                 break;
 
+            case "blank":
+                rgTheme.check(R.id.rbThemeBlank);
+                break;
+
             case "black":
             case "white":
             case "bw_system":
@@ -346,7 +350,9 @@ public void onClick(DialogInterface dialog, int which) {
                             else
                                 editor.putString("theme",
                                         "solarized" + (dark ? "_dark" : "_light")).apply();
-                        } else if (checkedRadioButtonId == R.id.rbThemeBlackOrWhite) {
+                        } else if (checkedRadioButtonId == R.id.rbThemeBlank)
+                            editor.putString("theme", "blank").apply();
+                        else if (checkedRadioButtonId == R.id.rbThemeBlackOrWhite) {
                             if (system)
                                 editor.putString("theme", "bw_system").apply();
                             else
@@ -499,6 +505,9 @@ static int getTheme(Context context) {
                     return R.style.AppThemeSolarizedDark;
 
                 // Black
+            case "blank":
+                return R.style.AppThemeBlank;
+
             case "black":
                 if (light)
                     return R.style.AppThemeGreySteelBlueLight;

diff --git a/app/src/main/res/drawable/selected_count_background.xml b/app/src/main/res/drawable/selected_count_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorPrimary" />
+    <solid android:color="?attr/colorInfoBackground" />
     <corners android:radius="6dp" />
 </shape>
diff --git a/app/src/main/res/layout-v31/dialog_theme.xml b/app/src/main/res/layout-v31/dialog_theme.xml
@@ -73,6 +73,14 @@
                 android:text="@string/title_setup_theme_solarized"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
+            <RadioButton
+                android:id="@+id/rbThemeBlank"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="6dp"
+                android:text="@string/title_setup_theme_white"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
             <RadioButton
                 android:id="@+id/rbThemeBlackOrWhite"
                 android:layout_width="match_parent"

diff --git a/app/src/main/res/layout-v34/dialog_theme.xml b/app/src/main/res/layout-v34/dialog_theme.xml
@@ -73,6 +73,14 @@
                 android:text="@string/title_setup_theme_solarized"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
+            <RadioButton
+                android:id="@+id/rbThemeBlank"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="6dp"
+                android:text="@string/title_setup_theme_white"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
             <RadioButton
                 android:id="@+id/rbThemeBlackOrWhite"
                 android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
@@ -73,6 +73,14 @@
                 android:text="@string/title_setup_theme_solarized"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
+            <RadioButton
+                android:id="@+id/rbThemeBlank"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="6dp"
+                android:text="@string/title_setup_theme_white"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
             <RadioButton
                 android:id="@+id/rbThemeBlackOrWhite"
                 android:layout_width="match_parent"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -153,6 +153,7 @@
 
     <color name="white">#ffffffff</color>
     <color name="black">#ff000000</color>
+    <color name="smoke">#fff5f5f5</color>
     <color name="grey">#ff7f7f7f</color>
     <color name="red">#ffff0000</color>
     <color name="transparent">#00000000</color>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -431,6 +431,17 @@
         <item name="snackbarStyle">@style/WhiteSnackBar</item>
     </style>
 
+    <style name="AppThemeBlank" parent="AppThemeBlueOrangeLight">
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorPrimaryDark">@color/white</item>
+        <item name="colorAccent">@color/blackAccent</item>
+
+        <item name="colorInfoForeground">@color/blackPrimary</item>
+        <item name="colorInfoBackground">@color/smoke</item>
+
+        <item name="snackbarStyle">@style/WhiteSnackBar</item>
+    </style>
+
     <style name="WhiteSnackBar" parent="Widget.Design.Snackbar">
         <item name="android:paddingLeft">0dp</item>
         <item name="android:paddingRight">0dp</item>
@@ -466,7 +477,7 @@
         <item name="colorFabBackground">@color/blackAndWhitePrimaryLight</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/blackPrimary</item>
+        <item name="colorInfoBackground">@color/blackAndWhitePrimary</item>
 
         <item name="android:windowBackground">@drawable/background_black</item>
         <item name="colorDrawerBackground">@color/black</item>
@@ -523,7 +534,7 @@
         <item name="colorFabBackground">@color/darkSolarizedAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/darkSolarizedAccent</item>
+        <item name="colorInfoBackground">@color/darkSolarizedPrimary</item>
 
         <item name="android:textColorLink">@color/darkSolarizedAccent</item>
         <item name="android:textColorLinkInverse">@color/darkSolarizedAccent</item>
@@ -547,7 +558,7 @@
         <item name="colorFabBackground">@color/darkSolarizedAccent</item>
 
         <item name="colorInfoForeground">@color/white</item>
-        <item name="colorInfoBackground">@color/darkSolarizedAccent</item>
+        <item name="colorInfoBackground">@color/darkSolarizedPrimary</item>
 
         <item name="android:textColorLink">@color/darkSolarizedAccent</item>
         <item name="android:textColorLinkInverse">@color/darkSolarizedAccent</item>