From 2f7ee04032aba5bfd57bd67ea2cb2bac2a6fbe03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 5 Aug 2014 12:53:28 +0200
Subject: [PATCH] Make it possible to fetch the current theme directly

---
 src/org/fdroid/fdroid/FDroidApp.java                        | 6 +++++-
 .../fdroid/views/fragments/AvailableAppsFragment.java       | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/org/fdroid/fdroid/FDroidApp.java b/src/org/fdroid/fdroid/FDroidApp.java
index ac6bd08bb..0fd33551d 100644
--- a/src/org/fdroid/fdroid/FDroidApp.java
+++ b/src/org/fdroid/fdroid/FDroidApp.java
@@ -86,7 +86,7 @@ public class FDroidApp extends Application {
 
     BluetoothAdapter bluetoothAdapter = null;
 
-    private static enum Theme {
+    public static enum Theme {
         dark, light, lightWithDarkActionBar
     }
 
@@ -112,6 +112,10 @@ public class FDroidApp extends Application {
         }
     }
 
+    public static Theme getCurTheme() {
+        return curTheme;
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
diff --git a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index e8325ecd4..a608c684f 100644
--- a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -23,6 +23,7 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.Spinner;
 
+import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.compat.ArrayAdapterCompat;
@@ -112,9 +113,8 @@ public class AvailableAppsFragment extends AppListFragment implements
         // with holo, the menu gets lost since it looks the same as an app list item
         if (Build.VERSION.SDK_INT >= 14) {
             Drawable menuButton = getResources().getDrawable(android.R.drawable.btn_dropdown);
-            if (TextUtils.equals("dark",
-                    PreferenceManager.getDefaultSharedPreferences(getActivity())
-                            .getString(Preferences.PREF_THEME, "dark"))) {
+            if (((FDroidApp)getActivity().getApplication()).getCurTheme()
+                    == FDroidApp.Theme.dark) {
                 menuButton.setAlpha(32); // make it darker via alpha
             }
             categorySpinner.setBackgroundDrawable(menuButton);