From 3741c0c62b00ed14e26af23ddfb147b4c16d6d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 1 Sep 2013 14:03:55 +0200
Subject: [PATCH] Revert all Light Theme changes

Should be done differently. Light theme before Holo is buggy.
---
 AndroidManifest.xml                           |  1 -
 res/values-v11/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             | 17 ++-------
 src/org/fdroid/fdroid/ManageRepo.java         |  4 ---
 .../fdroid/fdroid/PreferencesActivity.java    | 35 +++++--------------
 src/org/fdroid/fdroid/SearchResults.java      |  4 ---
 10 files changed, 11 insertions(+), 89 deletions(-)
 delete mode 100644 res/values-v11/styles.xml
 delete mode 100644 res/values/styles.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8f9b2f466..ecf3e8b0a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,7 +29,6 @@
         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
deleted file mode 100644
index add5f23ce..000000000
--- a/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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/strings.xml b/res/values/strings.xml
index 41d12eef6..1d93cba46 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -187,7 +187,5 @@
     <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
deleted file mode 100644
index 4abf37313..000000000
--- a/res/values/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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 cda401ff6..d3a39c021 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -23,9 +23,6 @@
         <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 fce61639c..ee3b9829b 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -186,10 +186,6 @@ 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 7d261cad7..24eb2d383 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -33,7 +33,6 @@ 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;
@@ -62,7 +61,6 @@ public class FDroid extends FragmentActivity {
     private ProgressDialog pd;
 
     private ViewPager viewPager;
-    private AppListFragmentPageAdapter viewPageAdapter;
 
     private AppListManager manager = null;
 
@@ -75,10 +73,6 @@ 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);
@@ -248,13 +242,8 @@ 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();
             }
             break;
 
@@ -263,7 +252,7 @@ public class FDroid extends FragmentActivity {
 
     private void createViews() {
         viewPager = (ViewPager)findViewById(R.id.main_pager);
-        viewPageAdapter = new AppListFragmentPageAdapter(this);
+        AppListFragmentPageAdapter 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 64e419714..f8cd95e17 100644
--- a/src/org/fdroid/fdroid/ManageRepo.java
+++ b/src/org/fdroid/fdroid/ManageRepo.java
@@ -77,10 +77,6 @@ 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 0250fffe0..4326177dd 100644
--- a/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -24,7 +24,6 @@ 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;
@@ -33,43 +32,25 @@ import org.fdroid.fdroid.compat.ActionBarCompat;
 public class PreferencesActivity extends PreferenceActivity implements
         OnPreferenceClickListener {
 
-
-    private boolean ignoreTouchscreenChanged = 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",
-                "lightTheme" }) {
-            Preference pref = findPreference(prefkey);
-            pref.setOnPreferenceClickListener(this);
-        }
-        ret = new Intent();
+        //for (String prefkey : new String[] { }) {
+            //Preference pref = findPreference(prefkey);
+            //pref.setOnPreferenceClickListener(this);
+        //}
     }
 
     @Override
     public boolean onPreferenceClick(Preference preference) {
-        String key = preference.getKey();
-        if (key.equals("ignoreTouchscreen"))
-            ignoreTouchscreenChanged ^= true;
-        else
-            lightThemeChanged ^= true;
-
-        if (lightThemeChanged)
-            ret.putExtra("restart", true);
-        else if (ignoreTouchscreenChanged)
-            ret.putExtra("update", true);
-
+        // Currently no actions are returned
+        //String key = preference.getKey();
+        //if (key.equals("...")) {
+        Intent ret = new Intent();
         setResult(RESULT_OK, ret);
         return true;
     }
diff --git a/src/org/fdroid/fdroid/SearchResults.java b/src/org/fdroid/fdroid/SearchResults.java
index 38b3c78e1..2443b1915 100644
--- a/src/org/fdroid/fdroid/SearchResults.java
+++ b/src/org/fdroid/fdroid/SearchResults.java
@@ -52,10 +52,6 @@ public class SearchResults extends ListActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
-        if (PreferenceManager.getDefaultSharedPreferences(this)
-                .getBoolean("lightTheme", false))
-            setTheme(R.style.AppThemeLight);
-
         super.onCreate(savedInstanceState);
         ActionBarCompat.create(this).setDisplayHomeAsUpEnabled(true);
         applist = new AvailableAppListAdapter(this);