From 50f0856f673f75c51244f4a1807c6ba27f987642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 23 Aug 2013 14:29:50 +0200
Subject: [PATCH] Add "Light Theme" setting

Default theme is dark (Holo dark on >=11), addition is light on <11, Holo.Ligt
on >=11 and Holo.Light.DarkActionbar on >=14
---
 AndroidManifest.xml                           |  1 +
 res/values-v11/styles.xml                     | 11 ++++++
 res/values-v14/styles.xml                     | 11 ++++++
 res/values/strings.xml                        |  2 ++
 res/values/styles.xml                         | 19 ++++++++++
 res/xml/preferences.xml                       |  3 ++
 src/org/fdroid/fdroid/AppDetails.java         |  4 +++
 src/org/fdroid/fdroid/FDroid.java             | 15 +++++++-
 src/org/fdroid/fdroid/ManageRepo.java         |  4 +++
 .../fdroid/fdroid/PreferencesActivity.java    | 35 +++++++++++++++----
 10 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 res/values-v11/styles.xml
 create mode 100644 res/values-v14/styles.xml
 create mode 100644 res/values/styles.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 38a4c6d29..ab82e77f0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,6 +29,7 @@
         android:name="FDroidApp"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        android:theme="@style/AppTheme"
         android:supportsRtl="false" >
         <activity
             android:name="FDroid"
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100644
index 000000000..add5f23ce
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,11 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="AppBaseTheme" parent="android:Theme.Holo">
+        <!-- API 11 theme customizations go here -->
+    </style> 
+
+    <style name="AppBaseThemeLight" parent="android:Theme.Holo.Light">
+        <!-- API 11 theme customizations go here -->
+    </style> 
+
+</resources>
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
new file mode 100644
index 000000000..5a0ae091e
--- /dev/null
+++ b/res/values-v14/styles.xml
@@ -0,0 +1,11 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="AppBaseTheme" parent="android:Theme.Holo">
+        <!-- API 14 theme customizations go here -->
+    </style> 
+
+    <style name="AppBaseThemeLight" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- API 14 theme customizations go here -->
+    </style> 
+
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1c85531f..eea8584fd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -186,5 +186,7 @@
     <string name="no_handler_app">You don\'t have any available app that can handle %s</string>
     <string name="compactlayout">Compact Layout</string>
     <string name="compactlayout_long">Only show app names and summaries in list</string>
+    <string name="lightTheme">Light Theme</string>
+    <string name="lightTheme_long">Use a light theme</string>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 000000000..4abf37313
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,19 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="AppBaseTheme" parent="android:Theme.Black">
+        <!-- backward-compatibility theme options go here -->
+    </style>
+
+    <style name="AppBaseThemeLight" parent="android:Theme.Light">
+        <!-- backward-compatibility theme options go here -->
+    </style>
+
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- customizations that are not API-level specific go here. -->
+    </style>
+
+    <style name="AppThemeLight" parent="AppBaseThemeLight">
+        <!-- customizations that are not API-level specific go here. -->
+    </style>
+
+</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 67b8cc76a..1c71904c3 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -33,6 +33,9 @@
         <CheckBoxPreference android:title="@string/compactlayout"
             android:defaultValue="false" android:summary="@string/compactlayout_long"
             android:key="compactlayout"/>
+        <CheckBoxPreference android:title="@string/lightTheme"
+            android:defaultValue="false" android:summary="@string/lightTheme_long"
+            android:key="lightTheme"/>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/antifeatures">
 		<CheckBoxPreference android:title="@string/antiads"
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index b8e4b780a..158273c26 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -184,6 +184,10 @@ public class AppDetails extends ListActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean("lightTheme", false))
+            setTheme(R.style.AppThemeLight);
+
         super.onCreate(savedInstanceState);
         ActionBarCompat abCompat = ActionBarCompat.create(this);
         abCompat.setDisplayHomeAsUpEnabled(true);
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 1476719b9..52d03fd68 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -33,6 +33,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
+import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.view.ViewPager;
 import android.util.Log;
@@ -61,6 +62,7 @@ public class FDroid extends FragmentActivity {
     private ProgressDialog pd;
 
     private ViewPager viewPager;
+    private AppListFragmentPageAdapter viewPageAdapter;
 
     private AppListManager manager = null;
 
@@ -73,6 +75,10 @@ public class FDroid extends FragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean("lightTheme", false))
+            setTheme(R.style.AppThemeLight);
+
         super.onCreate(savedInstanceState);
         manager = new AppListManager(this);
         setContentView(R.layout.fdroid);
@@ -242,6 +248,13 @@ public class FDroid extends FragmentActivity {
             UpdateService.schedule(getBaseContext());
             if (data != null && data.hasExtra("update")) {
                 updateRepos();
+            } else if (data != null && data.hasExtra("restart")) {
+                final Intent intent = getIntent();
+                overridePendingTransition(0, 0);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+                finish();
+                overridePendingTransition(0, 0);
+                startActivity(intent);
             } else {
                 repopulateViews();
             }
@@ -252,7 +265,7 @@ public class FDroid extends FragmentActivity {
 
     private void createViews() {
         viewPager = (ViewPager)findViewById(R.id.main_pager);
-        AppListFragmentPageAdapter viewPageAdapter = new AppListFragmentPageAdapter(this);
+        viewPageAdapter = new AppListFragmentPageAdapter(this);
         viewPager.setAdapter(viewPageAdapter);
         viewPager.setOnPageChangeListener( new ViewPager.SimpleOnPageChangeListener() {
             public void onPageSelected(int position) {
diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java
index f8cd95e17..64e419714 100644
--- a/src/org/fdroid/fdroid/ManageRepo.java
+++ b/src/org/fdroid/fdroid/ManageRepo.java
@@ -77,6 +77,10 @@ public class ManageRepo extends ListActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean("lightTheme", false))
+            setTheme(R.style.AppThemeLight);
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.repolist);
 
diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/src/org/fdroid/fdroid/PreferencesActivity.java
index c5f71766a..bdc397fc5 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -24,6 +24,7 @@ import android.app.ActionBar;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
+import android.preference.PreferenceManager;
 import android.preference.PreferenceActivity;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.widget.Toast;
@@ -32,28 +33,48 @@ import org.fdroid.fdroid.compat.ActionBarCompat;
 public class PreferencesActivity extends PreferenceActivity implements
         OnPreferenceClickListener {
 
+
+    private boolean ignoreTouchscreenChanged = false;
+    private boolean showIncompatibleChanged = false;
+    private boolean lightThemeChanged = false;
+
+    Intent ret;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
+        if (PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean("lightTheme", false))
+            setTheme(R.style.AppThemeLight);
+
         super.onCreate(savedInstanceState);
         ActionBarCompat.create(this).setDisplayHomeAsUpEnabled(true);
         addPreferencesFromResource(R.xml.preferences);
         for (String prefkey : new String[] { "ignoreTouchscreen",
-                "showIncompatible" }) {
+                "showIncompatible", "lightTheme" }) {
             Preference pref = findPreference(prefkey);
             pref.setOnPreferenceClickListener(this);
         }
+        ret = new Intent();
     }
 
     @Override
     public boolean onPreferenceClick(Preference preference) {
-        // Currently only one action is returned.
-        //String key = preference.getKey();
-        //if (key.equals("ignoreTouchscreen") || key.equals("showIncompatible")) {
-        Intent ret = new Intent();
-        ret.putExtra("update", true);
+        String key = preference.getKey();
+        if (key.equals("ignoreTouchscreen"))
+            ignoreTouchscreenChanged ^= true;
+        else if (key.equals("showIncompatible"))
+            showIncompatibleChanged ^= true;
+        else
+            lightThemeChanged ^= true;
+
+        if (lightThemeChanged)
+            ret.putExtra("restart", true);
+        else if (ignoreTouchscreenChanged || showIncompatibleChanged)
+            ret.putExtra("update", true);
+
         setResult(RESULT_OK, ret);
         return true;
-        //}
     }
 
 }