From b3e9b86b614ff6af262d3c4b2c397412c9c9f515 Mon Sep 17 00:00:00 2001
From: Vavassor <copernicus-@hotmail.com>
Date: Tue, 21 Mar 2017 20:40:00 -0400
Subject: [PATCH] Remove array.xml and re-enable (partially working) light
 theme.

---
 .../com/keylesspalace/tusky/BaseActivity.java |  3 --
 .../com/keylesspalace/tusky/MainActivity.java |  4 +--
 app/src/main/res/values/array.xml             | 28 -------------------
 app/src/main/res/xml/preferences.xml          | 13 +++++++++
 4 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 app/src/main/res/values/array.xml

diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
index c018cf9b4..b09c0fc21 100644
--- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
@@ -64,12 +64,9 @@ public class BaseActivity extends AppCompatActivity {
         createMastodonAPI();
         createTuskyAPI();
 
-        /* Note from Andrew March 13, 2017: Keep this and restore it when the light theme is no
-           longer bugged.
         if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("lightTheme", false)) {
             setTheme(R.style.AppTheme_Light);
         }
-        */
     }
 
     @Override
diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index 3bf969457..dba8966d9 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -153,9 +153,7 @@ public class MainActivity extends BaseActivity {
             }
 
             @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
+            public void onTabReselected(TabLayout.Tab tab) {}
         });
 
         Intent intent = getIntent();
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
deleted file mode 100644
index 48d6a0ce5..000000000
--- a/app/src/main/res/values/array.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    
-    <string-array name="pull_notification_check_interval_names" tools:ignore="MissingTranslation">
-        <item>5 minutes</item>
-        <item>10 minutes</item>
-        <item>15 minutes</item>
-        <item>20 minutes</item>
-        <item>25 minutes</item>
-        <item>30 minutes</item>
-        <item>45 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-    </string-array>
-
-    <string-array name="pull_notification_check_intervals" inputType="integer" translatable="false">
-        <item>5</item>
-        <item>10</item>
-        <item>15</item>
-        <item>20</item>
-        <item>25</item>
-        <item>30</item>
-        <item>45</item>
-        <item>60</item>
-        <item>120</item>
-    </string-array>
-    
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 323a49fda..b1bd2917d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:key="@string/preferences_file_key">
+
     <PreferenceCategory android:title="@string/pref_title_notification_settings">
+
         <CheckBoxPreference
             android:key="notificationsEnabled"
             android:title="@string/pref_title_notifications_enabled"
@@ -24,5 +26,16 @@
             android:key="notificationStyleLight"
             android:title="@string/pref_title_notification_style_light"
             android:defaultValue="true" />
+
     </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_title_appearance_settings">
+
+        <CheckBoxPreference
+            android:key="lightTheme"
+            android:title="@string/pref_title_light_theme"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>