Code refactoring

Signed-off-by: enricocid <enrico2588@gmail.com>
enricocid · Nov 14, 2018 · 009dd59 · 009dd59
1 parent 36d4ca4
commit 009dd59
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 41 deletions.
diff --git a/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java b/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java
@@ -41,7 +41,7 @@
 import com.iven.musicplayergo.indexbar.IndexBarRecyclerView;
 import com.iven.musicplayergo.indexbar.IndexBarView;
 import com.iven.musicplayergo.loaders.ArtistProvider;
-import com.iven.musicplayergo.loaders.ArtistViewModel;
+import com.iven.musicplayergo.loaders.ArtistsViewModel;
 import com.iven.musicplayergo.loaders.SongProvider;
 import com.iven.musicplayergo.models.Album;
 import com.iven.musicplayergo.models.Artist;
@@ -466,7 +466,7 @@ private void initializeColorsSettings() {
  }
 
  private void onPermissionGranted() {
- final ArtistViewModel model = ViewModelProviders.of(this).get(ArtistViewModel.class);
+ final ArtistsViewModel model = ViewModelProviders.of(this).get(ArtistsViewModel.class);
  final List<Artist> artists = model.getArtists(this).getValue();
 
  if (artists != null) {

diff --git a/project/app/src/main/java/com/iven/musicplayergo/loaders/ArtistViewModel.java b/project/app/src/main/java/com/iven/musicplayergo/loaders/ArtistViewModel.java
diff --git a/project/app/src/main/res/values-v27/styles.xml b/project/app/src/main/res/values-v27/styles.xml
@@ -9,6 +9,7 @@
  <item name="android:windowBackground">@color/white</item>
  <item name="android:alertDialogTheme">@style/AlertDialogStyle</item>
  <item name="card_color">@color/white</item>
+ <item name="controls_panel_stroke">@color/gray_900</item>
  <item name="android:windowLightStatusBar">true</item>
  </style>
 
@@ -20,6 +21,7 @@
  <item name="android:windowLightNavigationBar">false</item>
  <item name="android:windowBackground">@color/black</item>
  <item name="card_color">@color/black</item>
+ <item name="controls_panel_stroke">@color/gray_900</item>
  <item name="android:alertDialogTheme">@style/AlertDialogStyle</item>
  <item name="android:windowLightStatusBar">true</item>
  </style>

diff --git a/project/app/src/main/res/values/styles.xml b/project/app/src/main/res/values/styles.xml
@@ -1,28 +1,33 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
  <!-- LIGHT THEME -->
  <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
  <item name="icon_color">@color/black</item>
+ <item name="card_color">@color/white</item>
+ <item name="controls_panel_stroke">@color/gray_50</item>
  <item name="theme_icon">@drawable/ic_invert_theme</item>
- <item name="android:navigationBarColor">@color/white</item>
- <item name="android:windowLightNavigationBar">true</item>
  <item name="android:windowBackground">@color/white</item>
+ <item name="android:navigationBarColor">@color/black</item>
  <item name="android:alertDialogTheme">@style/AlertDialogStyle</item>
- <item name="card_color">@color/white</item>
- <item name="controls_panel_stroke">@color/gray_900</item>
- <item name="android:windowLightStatusBar">true</item>
+ <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
  </style>
 
  <!-- INVERTED THEME -->
  <style name="AppThemeInverted" parent="Theme.MaterialComponents.NoActionBar">
  <item name="icon_color">@color/white</item>
- <item name="theme_icon">@drawable/ic_invert_theme_off</item>
- <item name="android:navigationBarColor">@color/black</item>
- <item name="android:windowLightNavigationBar">false</item>
- <item name="android:windowBackground">@color/black</item>
  <item name="card_color">@color/black</item>
  <item name="controls_panel_stroke">@color/gray_900</item>
+ <item name="android:windowBackground">@color/black</item>
+ <item name="theme_icon">@drawable/ic_invert_theme_off</item>
+ <item name="android:navigationBarColor">@color/black</item>
  <item name="android:alertDialogTheme">@style/AlertDialogStyle</item>
- <item name="android:windowLightStatusBar">true</item>
+ <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
+ </style>
+
+ <style name="AlertDialogStyle" parent="Theme.MaterialComponents.Light.Dialog.Alert" />
+
+ <style name="SeekBarStyle" parent="Widget.AppCompat.SeekBar">
+ <item name="android:progressBackgroundTint">?attr/colorAccent</item>
+ <item name="android:progressTint">?attr/colorAccent</item>
  </style>
 </resources>