Add 1 more theme (gray 800) and bump to 2.4.1.2

Signed-off-by: enricocid <enrico2588@gmail.com>
enricocid · May 26, 2018 · 28b472d · 28b472d
1 parent e312966
commit 28b472d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 ### Very slim music player! (<1000KB)
 
-### Current version: (52) 2.4.1.1
+### Current version: (53) 2.4.1.2
 
 
 
@@ -41,9 +41,9 @@ https://plus.google.com/+JulianGomezAxinen
 ### Open settings directly from UI. Available settings: 
 
 - Equalizer;
-- Themes (Light and Inverted)
+- Themes (light and inverted)
 - Link to git page;
-- UI accents;
+- 16 UI accents!;
 
 
 ### Minimal code:

diff --git a/project/app/build.gradle b/project/app/build.gradle
@@ -7,8 +7,8 @@ android {
  applicationId "com.iven.musicplayergo"
  minSdkVersion 21
  targetSdkVersion 27
- versionCode 52
- versionName "2.4.1.1"
+ versionCode 53
+ versionName "2.4.1.2"
  }
  buildTypes {
  release {

diff --git a/project/app/src/main/java/com/iven/musicplayergo/adapters/ColorsAdapter.java b/project/app/src/main/java/com/iven/musicplayergo/adapters/ColorsAdapter.java
@@ -34,6 +34,7 @@ public class ColorsAdapter extends RecyclerView.Adapter<ColorsAdapter.SimpleView
  R.color.deep_orange_A400,
  R.color.brown_400,
  R.color.gray_400,
+ R.color.gray_800,
  R.color.blue_gray_400
  };
 

diff --git a/project/app/src/main/java/com/iven/musicplayergo/utils/SettingsUtils.java b/project/app/src/main/java/com/iven/musicplayergo/utils/SettingsUtils.java
@@ -133,7 +133,11 @@ private static int resolveTheme(boolean isThemeDark, int accent) {
  break;
 
  case R.color.gray_400:
- selectedTheme = isThemeDark ? R.style.AppThemeGrayInverted : R.style.AppThemeGray;
+ selectedTheme = isThemeDark ? R.style.AppThemeGrayLightInverted : R.style.AppThemeGrayLight;
+ break;
+
+ case R.color.gray_800:
+ selectedTheme = isThemeDark ? R.style.AppThemeGrayDarkInverted : R.style.AppThemeGrayDark;
  break;
 
  case R.color.blue_gray_400:

diff --git a/project/app/src/main/res/values/colors.xml b/project/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
- <color name="light">#fafafa</color>
+ <color name="light">#FAFAFA</color>
  <color name="inverted">#060606</color>
  <color name="red_A400">#FF1744</color> <!-- LIGHT -->
  <color name="pink_A400">#F50057</color> <!-- LIGHT -->
@@ -17,5 +17,6 @@
  <color name="deep_orange_A400">#FF3D00</color> <!-- LIGHT -->
  <color name="brown_400">#8D6E63</color> <!-- LIGHT -->
  <color name="gray_400">#BDBDBD</color> <!-- DARK -->
+ <color name="gray_800">#212121</color> <!-- LIGHT -->
  <color name="blue_gray_400">#78909C</color> <!-- LIGHT -->
 </resources>
diff --git a/project/app/src/main/res/values/themes_inverted.xml b/project/app/src/main/res/values/themes_inverted.xml
@@ -71,11 +71,16 @@
  <item name="android:seekBarStyle">@style/SeekBarStyle</item>
  </style>
 
- <style name="AppThemeGrayInverted" parent="AppThemeInverted">
+ <style name="AppThemeGrayLightInverted" parent="AppThemeInverted">
  <item name="accent_color">@color/gray_400</item>
  <item name="android:seekBarStyle">@style/SeekBarStyle</item>
  </style>
 
+ <style name="AppThemeGrayDarkInverted" parent="AppThemeInverted">
+ <item name="accent_color">@color/gray_800</item>
+ <item name="android:seekBarStyle">@style/SeekBarStyle</item>
+ </style>
+
  <style name="AppThemeBlueGrayInverted" parent="AppThemeInverted">
  <item name="accent_color">@color/blue_gray_400</item>
  <item name="android:seekBarStyle">@style/SeekBarStyle</item>

diff --git a/project/app/src/main/res/values/themes_light.xml b/project/app/src/main/res/values/themes_light.xml
@@ -76,6 +76,16 @@
  <item name="android:seekBarStyle">@style/SeekBarStyle</item>
  </style>
 
+ <style name="AppThemeGrayLight" parent="AppTheme">
+ <item name="accent_color">@color/gray_400</item>
+ <item name="android:seekBarStyle">@style/SeekBarStyle</item>
+ </style>
+
+ <style name="AppThemeGrayDark" parent="AppTheme">
+ <item name="accent_color">@color/gray_800</item>
+ <item name="android:seekBarStyle">@style/SeekBarStyle</item>
+ </style>
+
  <style name="AppThemeBlueGray" parent="AppTheme">
  <item name="accent_color">@color/blue_gray_400</item>
  <item name="android:seekBarStyle">@style/SeekBarStyle</item>