From bb5449c9d795105cacea739dfde504471e03e9e5 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Thu, 16 May 2019 14:22:04 +0530 Subject: [PATCH] Added daynight theme --- .../retromusic/util/PreferenceUtil.java | 20 +++---- .../main/res/values-night/styles-parents.xml | 51 ++++++++++++++++++ app/src/main/res/values/arrays.xml | 2 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/styles_parents.xml | 52 +++++++++++++++++-- 5 files changed, 113 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/values-night/styles-parents.xml diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java index 26fdd4fa..f67e2cfc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java @@ -21,16 +21,15 @@ import android.content.SharedPreferences.Editor; import android.content.res.TypedArray; import android.preference.PreferenceManager; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.StyleRes; -import androidx.viewpager.widget.ViewPager; - import com.google.android.material.bottomnavigation.LabelVisibilityMode; import java.io.File; import java.util.Objects; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.viewpager.widget.ViewPager; import code.name.monkey.retromusic.App; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.activities.MainActivity; @@ -151,23 +150,24 @@ public final class PreferenceUtil { return R.style.Theme_RetroMusic_Black; case "black": return R.style.Theme_RetroMusic_Black; + case "daynight": + return R.style.Theme_RetroMusic_DayNight; case "dark": default: return R.style.Theme_RetroMusic; } } + public boolean getSleepTimerFinishMusic() { + return mPreferences.getBoolean(SLEEP_TIMER_FINISH_SONG, false); + } + public void setSleepTimerFinishMusic(final boolean value) { final SharedPreferences.Editor editor = mPreferences.edit(); editor.putBoolean(SLEEP_TIMER_FINISH_SONG, value); editor.apply(); } - public boolean getSleepTimerFinishMusic() { - return mPreferences.getBoolean(SLEEP_TIMER_FINISH_SONG, false); - } - - public String getUserBio() { return mPreferences.getString(USER_BIO, ""); } diff --git a/app/src/main/res/values-night/styles-parents.xml b/app/src/main/res/values-night/styles-parents.xml new file mode 100644 index 00000000..8783b222 --- /dev/null +++ b/app/src/main/res/values-night/styles-parents.xml @@ -0,0 +1,51 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 8c11e717..2fb85b5c 100755 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -45,6 +45,7 @@ @string/dark_theme_name @string/black_theme_name @string/color_theme_name + @string/day_night_theme_name @@ -97,6 +98,7 @@ dark black color + daynight diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f9276039..be6b12b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -124,6 +124,7 @@ Color Color + Day Night(alpha) Colors diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index b5a4e80d..d6510ac0 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -1,6 +1,55 @@ + +