From 009dd597cb14fd96e1e1e98159c67348575ea96d Mon Sep 17 00:00:00 2001
From: enricocid <enrico2588@gmail.com>
Date: Wed, 14 Nov 2018 13:11:38 +0100
Subject: [PATCH] Code refactoring

Signed-off-by: enricocid <enrico2588@gmail.com>
---
 .../com/iven/musicplayergo/MainActivity.java  |  4 +--
 .../loaders/ArtistViewModel.java              | 28 -------------------
 .../app/src/main/res/values-v27/styles.xml    |  2 ++
 project/app/src/main/res/values/styles.xml    | 27 ++++++++++--------
 4 files changed, 20 insertions(+), 41 deletions(-)
 delete mode 100644 project/app/src/main/java/com/iven/musicplayergo/loaders/ArtistViewModel.java

diff --git a/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java b/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java
index c99b46c3c..43ba22e9d 100644
--- 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
deleted file mode 100644
index 8e4ea5e83..000000000
--- a/project/app/src/main/java/com/iven/musicplayergo/loaders/ArtistViewModel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.iven.musicplayergo.loaders;
-
-import android.content.Context;
-
-import com.iven.musicplayergo.models.Artist;
-
-import java.util.List;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class ArtistViewModel extends ViewModel {
-    private MutableLiveData<List<Artist>> artists;
-
-    public LiveData<List<Artist>> getArtists(@NonNull final Context context) {
-        if (artists == null) {
-            artists = new MutableLiveData<>();
-            loadUsers(context);
-        }
-        return artists;
-    }
-
-    private void loadUsers(@NonNull Context context) {
-        artists.setValue(ArtistProvider.getAllArtists(context));
-    }
-}
\ No newline at end of file
diff --git a/project/app/src/main/res/values-v27/styles.xml b/project/app/src/main/res/values-v27/styles.xml
index ed33e679c..2269c34a7 100644
--- 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
index 2269c34a7..799b5878e 100644
--- 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>