From 46f6b7d9a682726bd39791e7ad6bf6222db546c9 Mon Sep 17 00:00:00 2001
From: Luke Myers <19lmyers@gmail.com>
Date: Sat, 14 Apr 2018 23:28:23 -0700
Subject: [PATCH] I lied. THIS is 2018.2-beta1. I'll sneak in a theme setting
too.
---
.../team980/thunderscout/ThunderScout.java | 6 ++++
.../preferences/SettingsActivity.java | 22 +++++++++++++++
app/src/main/res/values-night/colors.xml | 28 +++++++++++++++++++
app/src/main/res/values/strings.xml | 2 +-
app/src/main/res/xml/pref_appearance.xml | 9 ++++--
app/src/main/res/xml/pref_main.xml | 15 +++++-----
6 files changed, 72 insertions(+), 10 deletions(-)
create mode 100644 app/src/main/res/values-night/colors.xml
diff --git a/app/src/main/java/com/team980/thunderscout/ThunderScout.java b/app/src/main/java/com/team980/thunderscout/ThunderScout.java
index 16fe5928..1e36a1a8 100644
--- a/app/src/main/java/com/team980/thunderscout/ThunderScout.java
+++ b/app/src/main/java/com/team980/thunderscout/ThunderScout.java
@@ -31,6 +31,7 @@
import android.preference.PreferenceManager;
import android.service.quicksettings.TileService;
import android.support.multidex.MultiDexApplication;
+import android.support.v7.app.AppCompatDelegate;
import com.crashlytics.android.Crashlytics;
import com.crashlytics.android.core.CrashlyticsCore;
@@ -106,6 +107,11 @@ public void onCreate() { //This isn't why loading is slow
Fabric.with(this, crashlyticsKit);
}
+ if (sharedPref.getBoolean(getResources().getString(R.string.pref_app_theme), false)) {
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+ } else {
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+ }
}
@Override
diff --git a/app/src/main/java/com/team980/thunderscout/preferences/SettingsActivity.java b/app/src/main/java/com/team980/thunderscout/preferences/SettingsActivity.java
index 6367a6ab..11aa9494 100644
--- a/app/src/main/java/com/team980/thunderscout/preferences/SettingsActivity.java
+++ b/app/src/main/java/com/team980/thunderscout/preferences/SettingsActivity.java
@@ -32,6 +32,7 @@
import android.provider.Settings;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
@@ -245,6 +246,27 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
}
}
+ public static class AppearancePreferenceFragment extends PreferenceFragmentCompat {
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+ addPreferencesFromResource(R.xml.pref_appearance);
+
+ SettingsActivity activity = (SettingsActivity) getActivity();
+ activity.getSupportActionBar().setTitle("Theme settings [BETA]");
+
+ findPreference(getResources().getString(R.string.pref_app_theme))
+ .setOnPreferenceChangeListener((preference, newValue) -> {
+ if ((boolean) newValue) {
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+ } else {
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+ }
+ activity.recreate();
+ return true;
+ });
+ }
+ }
+
public static class MatchScoutPreferenceFragment extends PreferenceFragmentCompat {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..b5f0382e
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,28 @@
+
+
+
+ #222
+ #111
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 246720da..d4ad6095 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,7 +49,7 @@
\n
\n(Oh, and the team info screen now incorporates individual match tabs.)
\n
- \nTechnical note: ThunderCloud is being in a separate branch from the rest of the app, and may change significantly or disappear in subsequent releases.
+ \nTechnical note: ThunderCloud is being developed in a separate branch from the rest of the app, and may change significantly or disappear in subsequent releases.
diff --git a/app/src/main/res/xml/pref_appearance.xml b/app/src/main/res/xml/pref_appearance.xml
index f197bdaa..9b223b8a 100644
--- a/app/src/main/res/xml/pref_appearance.xml
+++ b/app/src/main/res/xml/pref_appearance.xml
@@ -22,7 +22,12 @@
~ SOFTWARE.
-->
-
+
+
+
-
+
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index 1713e19b..41be90ef 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -33,13 +33,6 @@
android:title="General settings"
app:allowDividerBelow="false" />
-
-
+
+