From eb172ef92fe95dbbd520bd57ef476f63062bdc87 Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Sat, 26 Oct 2019 19:44:09 +0530
Subject: [PATCH] Fixing pixel perfect things :)

---
 .../retromusic/providers/interfaces/Repository.kt    |  5 -----
 app/src/main/res/layout-land/pager_item.xml          |  1 +
 app/src/main/res/layout-xlarge-land/pager_item.xml   |  3 ++-
 app/src/main/res/layout-xlarge/item_artist.xml       |  3 ++-
 app/src/main/res/layout-xlarge/pager_item.xml        |  1 +
 app/src/main/res/layout/image.xml                    |  5 +++--
 app/src/main/res/layout/item_album_card.xml          |  3 ++-
 app/src/main/res/layout/item_artist.xml              |  3 ++-
 app/src/main/res/layout/item_artist_square.xml       |  1 +
 app/src/main/res/layout/item_card.xml                |  3 ++-
 app/src/main/res/layout/item_card_color.xml          |  3 ++-
 app/src/main/res/layout/item_grid.xml                |  4 ++--
 app/src/main/res/layout/item_grid_circle.xml         |  4 ++--
 app/src/main/res/layout/item_image_gradient.xml      |  6 +++---
 app/src/main/res/layout/item_list_quick_actions.xml  |  7 ++-----
 app/src/main/res/layout/pager_item.xml               |  3 ++-
 ...preference_dialog_library_categories_listitem.xml |  2 +-
 .../layout/preference_now_playing_screen_item.xml    |  5 +++--
 .../main/res/layout/sliding_music_panel_layout.xml   | 12 ------------
 app/src/main/res/layout/volume_controls.xml          |  1 -
 app/src/main/res/values/styles.xml                   |  7 +++++++
 21 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
index 4ebeaa857..b815fd279 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
@@ -59,21 +59,16 @@ interface Repository {
 
     val recentAlbumsFlowable: Observable<ArrayList<Album>>
 
-
     val topAlbumsFlowable: Observable<ArrayList<Album>>
 
-
     val allArtistsFlowable: Observable<ArrayList<Artist>>
 
     val recentArtistsFlowable: Observable<ArrayList<Artist>>
 
-
     val topArtistsFlowable: Observable<ArrayList<Artist>>
 
-
     val allPlaylistsFlowable: Observable<ArrayList<Playlist>>
 
-
     val allGenresFlowable: Observable<ArrayList<Genre>>
 
     fun getSongFlowable(id: Int): Observable<Song>
diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml
index ad16241b0..d2228454b 100644
--- a/app/src/main/res/layout-land/pager_item.xml
+++ b/app/src/main/res/layout-land/pager_item.xml
@@ -16,6 +16,7 @@
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
+            tools:src="@tools:sample/avatars"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop" />
diff --git a/app/src/main/res/layout-xlarge-land/pager_item.xml b/app/src/main/res/layout-xlarge-land/pager_item.xml
index 4efd6139d..a014fb220 100644
--- a/app/src/main/res/layout-xlarge-land/pager_item.xml
+++ b/app/src/main/res/layout-xlarge-land/pager_item.xml
@@ -18,7 +18,8 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            tools:src="@tools:sample/avatars" />
 
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/playSongs"
diff --git a/app/src/main/res/layout-xlarge/item_artist.xml b/app/src/main/res/layout-xlarge/item_artist.xml
index 63fa5b990..079a62581 100644
--- a/app/src/main/res/layout-xlarge/item_artist.xml
+++ b/app/src/main/res/layout-xlarge/item_artist.xml
@@ -15,7 +15,8 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:civ_border="false" />
+            app:civ_border="false"
+            tools:src="@tools:sample/avatars" />
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
 
diff --git a/app/src/main/res/layout-xlarge/pager_item.xml b/app/src/main/res/layout-xlarge/pager_item.xml
index 0ae6ab0bc..af262680b 100644
--- a/app/src/main/res/layout-xlarge/pager_item.xml
+++ b/app/src/main/res/layout-xlarge/pager_item.xml
@@ -16,6 +16,7 @@
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
+            tools:src="@tools:sample/avatars"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop" />
diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml
index 5430e8b08..0ac655941 100644
--- a/app/src/main/res/layout/image.xml
+++ b/app/src/main/res/layout/image.xml
@@ -6,13 +6,14 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
         android:transitionName="@string/transition_album_art"
-        tools:ignore="ContentDescription" />
+        tools:ignore="ContentDescription"
+        tools:src="@tools:sample/avatars" />
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_album_card.xml b/app/src/main/res/layout/item_album_card.xml
index 1b8936ef2..03e04e5e0 100644
--- a/app/src/main/res/layout/item_album_card.xml
+++ b/app/src/main/res/layout/item_album_card.xml
@@ -17,7 +17,8 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            tools:src="@tools:sample/avatars" />
     </com.google.android.material.card.MaterialCardView>
 
 
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index 9130a0644..f82bdb05a 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -16,7 +16,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@android:color/transparent"
-            app:civ_border="false" />
+            app:civ_border="false"
+            tools:src="@tools:sample/avatars" />
     </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/item_artist_square.xml b/app/src/main/res/layout/item_artist_square.xml
index d63bdfe83..48d8c79f5 100644
--- a/app/src/main/res/layout/item_artist_square.xml
+++ b/app/src/main/res/layout/item_artist_square.xml
@@ -16,6 +16,7 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
             android:layout_width="112dp"
+            tools:src="@tools:sample/avatars"
             android:layout_height="156dp"
             android:scaleType="centerCrop" />
 
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 66c7c8fde..70cd95c12 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -26,7 +26,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                tools:ignore="ContentDescription" />
+                tools:ignore="ContentDescription"
+                tools:src="@tools:sample/avatars" />
 
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index f32f5448e..96bb12e86 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -27,7 +27,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                tools:ignore="ContentDescription" />
+                tools:ignore="ContentDescription"
+                tools:src="@tools:sample/avatars" />
 
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index cc8d30b29..fca013ab8 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -41,9 +41,9 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="vertical"
-            android:paddingStart="4dp"
+            android:paddingStart="12dp"
             android:paddingTop="8dp"
-            android:paddingEnd="4dp"
+            android:paddingEnd="12dp"
             android:paddingBottom="8dp">
 
             <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml
index 99cd2630f..f46e5fab5 100644
--- a/app/src/main/res/layout/item_grid_circle.xml
+++ b/app/src/main/res/layout/item_grid_circle.xml
@@ -27,8 +27,8 @@
                 android:scaleType="centerCrop"
                 app:civ_border="false"
                 app:civ_shadow="false"
-                tools:background="@color/md_red_400"
-                tools:ignore="ContentDescription" />
+                tools:ignore="ContentDescription"
+                tools:src="@tools:sample/avatars" />
 
         </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
diff --git a/app/src/main/res/layout/item_image_gradient.xml b/app/src/main/res/layout/item_image_gradient.xml
index 665d020b9..401bfd975 100644
--- a/app/src/main/res/layout/item_image_gradient.xml
+++ b/app/src/main/res/layout/item_image_gradient.xml
@@ -7,8 +7,7 @@
     android:orientation="vertical"
     app:cardCornerRadius="8dp"
     app:cardElevation="4dp"
-    app:cardUseCompatPadding="true"
-    tools:backgroundTint="@color/md_red_400">
+    app:cardUseCompatPadding="true">
 
     <code.name.monkey.retromusic.views.WidthFitSquareLayout
         android:id="@+id/image_container"
@@ -22,7 +21,8 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             android:transitionName="@string/transition_album_art"
-            tools:ignore="ContentDescription" />
+            tools:ignore="ContentDescription"
+            tools:src="@tools:sample/avatars" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml
index afb280ecf..b70552e01 100644
--- a/app/src/main/res/layout/item_list_quick_actions.xml
+++ b/app/src/main/res/layout/item_list_quick_actions.xml
@@ -14,7 +14,6 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
@@ -35,8 +34,7 @@
         android:textAppearance="@style/TextViewNormal"
         app:cornerRadius="6dp"
         app:icon="@drawable/ic_play_arrow_white_24dp"
-        app:iconGravity="textStart"
-        tools:backgroundTint="@color/md_grey_900" />
+        app:iconGravity="textStart" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
@@ -52,7 +50,6 @@
         android:textAppearance="@style/TextViewNormal"
         app:cornerRadius="6dp"
         app:icon="@drawable/ic_shuffle_white_24dp"
-        app:iconGravity="textStart"
-        tools:backgroundTint="@color/md_grey_900" />
+        app:iconGravity="textStart" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
index 0af0a27da..56d06b808 100644
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@@ -18,7 +18,8 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            tools:src="@tools:sample/avatars" />
 
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/playSongs"
diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
index 255d7643f..e99e445d5 100644
--- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
+++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
@@ -51,7 +51,7 @@
         android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
         android:singleLine="true"
         android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnSurface"
+        android:textColor="?colorOnPrimary"
         android:textSize="@dimen/md_listitem_textsize"
         tools:text="Item" />
 
diff --git a/app/src/main/res/layout/preference_now_playing_screen_item.xml b/app/src/main/res/layout/preference_now_playing_screen_item.xml
index 3ecac44e2..7ce569568 100644
--- a/app/src/main/res/layout/preference_now_playing_screen_item.xml
+++ b/app/src/main/res/layout/preference_now_playing_screen_item.xml
@@ -17,10 +17,11 @@
         tools:text="Card layout" />
 
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        tools:src="@tools:sample/avatars" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 9d8c3c720..2f07a739a 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -6,16 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!--<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/slidingLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="bottom"
-        sothree:umanoOverlay="false"
-        sothree:umanoPanelHeight="0dp"
-        sothree:umanoScrollableView="@+id/recycler_view"
-        sothree:umanoShadowHeight="0dp">-->
-
     <FrameLayout
         android:id="@+id/mainContentFrame"
         android:layout_width="match_parent"
@@ -46,9 +36,7 @@
             android:layout_height="48dp"
             tools:layout="@layout/fragment_mini_player" />
 
-
     </com.google.android.material.card.MaterialCardView>
-    <!-- </com.sothree.slidinguppanel.SlidingUpPanelLayout>-->
 
     <code.name.monkey.retromusic.views.BottomNavigationBarTinted
         android:id="@+id/bottomNavigationView"
diff --git a/app/src/main/res/layout/volume_controls.xml b/app/src/main/res/layout/volume_controls.xml
index e38fc85ce..c200200b9 100644
--- a/app/src/main/res/layout/volume_controls.xml
+++ b/app/src/main/res/layout/volume_controls.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/volumeFragmentContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 166d986fa..5ba325cd0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -218,6 +218,13 @@
         <item name="android:fontFamily">@font/circular</item>
     </style>
 
+    <style name="TopCornerCardView">
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerSizeTopLeft">16dp</item>
+        <item name="cornerSizeTopRight">16dp</item>
+    </style>
+
     <style name="ToolbarCornerCardView">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">8dp</item>