From b3e9b86b614ff6af262d3c4b2c397412c9c9f515 Mon Sep 17 00:00:00 2001 From: Vavassor 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 c018cf9b..b09c0fc2 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 3bf96945..dba8966d 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 48d6a0ce..00000000 --- a/app/src/main/res/values/array.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - 5 minutes - 10 minutes - 15 minutes - 20 minutes - 25 minutes - 30 minutes - 45 minutes - 1 hour - 2 hours - - - - 5 - 10 - 15 - 20 - 25 - 30 - 45 - 60 - 120 - - - \ 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 323a49fd..b1bd2917 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -1,7 +1,9 @@ + + + + + + + + + +