From a052dc2ff14feca2be777fe493de3fc58c4fb3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 3 Oct 2015 17:42:05 -0700
Subject: [PATCH] Add night theme

Similar to the dark theme, but dropping blue in favour of very dark shades of
grey.

Removed colorEdgeEffect to simplify the sharing of the style between dark and
night themes. It should default to colorPrimary anyway, so we're good.

Fixes #345.
---
 F-Droid/res/values-v21/styles.xml                        | 1 -
 F-Droid/res/values/array.xml                             | 1 +
 F-Droid/res/values/colors.xml                            | 4 +++-
 F-Droid/res/values/donottranslate.xml                    | 1 +
 F-Droid/res/values/strings.xml                           | 1 +
 F-Droid/res/values/styles.xml                            | 7 +++++++
 F-Droid/src/org/fdroid/fdroid/FDroidApp.java             | 9 ++++++---
 .../fdroid/views/fragments/AvailableAppsFragment.java    | 8 ++++++--
 8 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/F-Droid/res/values-v21/styles.xml b/F-Droid/res/values-v21/styles.xml
index 04093aaad..454cb114a 100644
--- a/F-Droid/res/values-v21/styles.xml
+++ b/F-Droid/res/values-v21/styles.xml
@@ -4,7 +4,6 @@
     <style name="AppThemeDark" parent="AppBaseThemeDark">
         <!-- customizations that are not API-level specific go here. -->
         <item name="android:alertDialogTheme">@style/AlertDialogThemeDark</item>
-        <item name="android:colorEdgeEffect">@color/fdroid_blue</item>
         <item name="android:colorControlActivated">@color/fdroid_green</item>
         <item name="android:colorControlHighlight">@color/fdroid_green</item>
     </style>
diff --git a/F-Droid/res/values/array.xml b/F-Droid/res/values/array.xml
index ca2253a25..de5f1f86b 100644
--- a/F-Droid/res/values/array.xml
+++ b/F-Droid/res/values/array.xml
@@ -13,6 +13,7 @@
     <string-array name="themeNames">
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
+        <item>@string/theme_night</item>
     </string-array>
 
 </resources>
diff --git a/F-Droid/res/values/colors.xml b/F-Droid/res/values/colors.xml
index 8c8cdeb75..4ed5312dd 100644
--- a/F-Droid/res/values/colors.xml
+++ b/F-Droid/res/values/colors.xml
@@ -8,6 +8,8 @@
     <color name="fdroid_blue">#ff1976d2</color>
     <color name="fdroid_blue_dark">#ff0d47a1</color>
     <color name="fdroid_green">#ff8ab000</color>
+    <color name="fdroid_night">#ff222222</color>
+    <color name="fdroid_night_dark">#ff111111</color>
 
     <color name="swap_incompatible">#ff7900</color>
     <color name="swap_light_blue">#27aae1</color>
@@ -22,4 +24,4 @@
 
     <color name="perms_costs_money">#fff4511e</color>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/F-Droid/res/values/donottranslate.xml b/F-Droid/res/values/donottranslate.xml
index 724228e8a..de790d03d 100644
--- a/F-Droid/res/values/donottranslate.xml
+++ b/F-Droid/res/values/donottranslate.xml
@@ -20,6 +20,7 @@
     <string-array name="themeValues">
         <item>light</item>
         <item>dark</item>
+        <item>night</item>
     </string-array>
 
     <string-array name="languageValues">
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index fe5dd259d..7aeff7da0 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -376,4 +376,5 @@
 
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
+    <string name="theme_night">Night</string>
 </resources>
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 0766a4a84..0339e3313 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -29,6 +29,13 @@
         <!-- customizations that are not API-level specific go here. -->
     </style>
 
+    <style name="AppThemeNight" parent="AppThemeDark">
+        <!-- customizations that are not API-level specific go here. -->
+
+        <item name="colorPrimary">@color/fdroid_night</item>
+        <item name="colorPrimaryDark">@color/fdroid_night_dark</item>
+    </style>
+
     <style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert" />
     <style name="AlertDialogThemeDark" parent="AlertDialogBaseThemeDark">
         <item name="colorAccent">@color/fdroid_green</item>
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index 1f43e8f93..e854b1263 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -86,8 +86,9 @@ public class FDroidApp extends Application {
     }
 
     public enum Theme {
-        dark,
         light,
+        dark,
+        night,
         lightWithDarkActionBar, // Obsolete
     }
 
@@ -109,10 +110,12 @@ public class FDroidApp extends Application {
 
     public static int getCurThemeResId() {
         switch (curTheme) {
-            case dark:
-                return R.style.AppThemeDark;
             case light:
                 return R.style.AppThemeLight;
+            case dark:
+                return R.style.AppThemeDark;
+            case night:
+                return R.style.AppThemeNight;
             default:
                 return R.style.AppThemeLight;
         }
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index 8ce67a395..590277831 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -129,8 +129,12 @@ public class AvailableAppsFragment extends AppListFragment implements
     private void styleSpinner(Spinner spinner) {
 
         Drawable menuButton = getResources().getDrawable(android.R.drawable.btn_dropdown);
-        if (FDroidApp.getCurTheme() == FDroidApp.Theme.dark) {
-            menuButton.setAlpha(32); // make it darker via alpha
+        switch (FDroidApp.getCurTheme()) {
+            case dark:
+                // fallthrough
+            case night:
+                menuButton.setAlpha(32); // make it darker via alpha
+                break;
         }
         if (Build.VERSION.SDK_INT >= 16) {
             spinner.setBackground(menuButton);