From ef70b7758f5c1ce30adfdee63ae3dcc54ce3294e Mon Sep 17 00:00:00 2001
From: hacker <hacker@example.com>
Date: Mon, 28 Dec 2020 17:39:38 +0530
Subject: [PATCH 1/3] PlayQueue_Ui_Update

---
 res/drawable/default_artwork_blur_2.xml               | 8 ++++++++
 res/drawable/menu_button_light.xml                    | 2 +-
 res/layout/blur_scrim_image.xml                       | 2 +-
 res/layout/edit_queue_list_item.xml                   | 2 ++
 res/values/colors.xml                                 | 8 ++++----
 src/org/lineageos/eleven/widgets/AlbumScrimImage.java | 2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable/default_artwork_blur_2.xml

diff --git a/res/drawable/default_artwork_blur_2.xml b/res/drawable/default_artwork_blur_2.xml
new file mode 100644
index 00000000..30b4bbad
--- /dev/null
+++ b/res/drawable/default_artwork_blur_2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="@color/background_color"
+        />
+
+</shape>
diff --git a/res/drawable/menu_button_light.xml b/res/drawable/menu_button_light.xml
index ef6f6ba3..5d8af81b 100644
--- a/res/drawable/menu_button_light.xml
+++ b/res/drawable/menu_button_light.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/white"
+        android:fillColor="@color/list_item_text_color_light"
         android:pathData="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2
 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
 </vector>
diff --git a/res/layout/blur_scrim_image.xml b/res/layout/blur_scrim_image.xml
index 2126ae99..7bde73f5 100644
--- a/res/layout/blur_scrim_image.xml
+++ b/res/layout/blur_scrim_image.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/default_artwork_blur"/>
+        android:src="@drawable/default_artwork_blur_2"/>
     <LinearLayout
         android:id="@+id/blurScrim"
         android:layout_width="match_parent"
diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index 46a14fa3..36e0b7e2 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -26,6 +26,7 @@
         android:layout_height="@dimen/drag_and_drop_height"
         android:layout_centerVertical="true"
         android:scaleType="fitXY"
+        android:tint="@color/player_action_bar_subtitle_text_color"
         android:src="@drawable/gripper_light" />
 
     <FrameLayout
@@ -43,5 +44,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:tint="@color/player_action_bar_subtitle_text_color"
         android:src="@drawable/dnd_list_divider_light" />
 </RelativeLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 43b6fddf..be9c8183 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -65,7 +65,7 @@
     <color name="transparent_white">#99fafafa</color>
     <color name="transparent_blue">#993F51B5</color>
 
-    <color name="background_color">@color/white</color>
+    <color name="background_color">@color/header_action_bar_color</color>
 
     <!-- Color for the action bar -->
     <color name="header_action_bar_color">@color/primary</color>
@@ -98,7 +98,7 @@
     <color name="list_item_header_text_color">@color/black</color>
     <color name="list_item_search_footer_text_color">@color/accent</color>
     <color name="list_item_text_color">@color/default_text_color</color>
-    <color name="list_item_text_color_light">@color/default_text_color_light</color>
+    <color name="list_item_text_color_light">@color/player_action_bar_title_text_color</color>
     <color name="list_item_divider_color">#4c212121</color>
     <color name="list_item_divider_color_light">#34fafafa</color>
     <color name="grid_list_item_text_color">#b3212121</color>
@@ -121,7 +121,7 @@
 
     <!-- search no results text color -->
     <color name="no_results">@color/black</color>
-    <color name="no_results_light">@color/white</color>
+    <color name="no_results_light">@color/main_action_bar_text_color</color>
 
     <color name="now_playing_divider">@color/transparent</color>
 
@@ -163,7 +163,7 @@
 
     <!-- Separated and exposed values for themes -->
     <color name="widget_background_color">@color/black</color>
-    <color name="list_base_container_background_color">@color/white</color>
+    <color name="list_base_container_background_color">@color/background_color</color>
     <color name="activity_album_detail_background_color">@color/background_color</color>
     <color name="activity_artist_detail_background_color">@color/background_color</color>
     <color name="activity_base_background_color">@color/background_color</color>
diff --git a/src/org/lineageos/eleven/widgets/AlbumScrimImage.java b/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
index 8dfbda20..2a3d4a3d 100644
--- a/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
+++ b/src/org/lineageos/eleven/widgets/AlbumScrimImage.java
@@ -71,7 +71,7 @@ public class AlbumScrimImage extends FrameLayout {
         }
 
         Bitmap blurredBitmap = ((BitmapDrawable) ContextCompat.getDrawable(
-                getContext(), R.drawable.default_artwork_blur)).getBitmap();
+                getContext(), R.drawable.default_artwork_blur_2)).getBitmap();
 
         TransitionDrawable imageTransition = ImageWorker.createImageTransitionDrawable(
                 getResources(), mImageView.getDrawable(), blurredBitmap,
-- 
GitLab


From fcefd2ee9ce30be758a776e7c2b7c7a74c411b9f Mon Sep 17 00:00:00 2001
From: hacker <hacker@example.com>
Date: Mon, 28 Dec 2020 18:16:09 +0530
Subject: [PATCH 2/3] Ui_Update_IconChanges

---
 res/layout/activity_base.xml        | 4 ++--
 res/layout/album_detail_song.xml    | 2 +-
 res/layout/artist_detail_album.xml  | 2 +-
 res/layout/artist_detail_song.xml   | 2 +-
 res/layout/grid_items_normal.xml    | 2 +-
 res/layout/header_bar.xml           | 2 +-
 res/layout/list_item_common.xml     | 2 +-
 res/layout/list_item_queue.xml      | 2 +-
 res/layout/list_item_simple.xml     | 2 +-
 res/layout/list_item_top_tracks.xml | 2 +-
 res/values/styles.xml               | 3 ++-
 11 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 1d80530e..0ef05759 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -112,8 +112,8 @@
                         android:layout_gravity="center_horizontal"
                         android:scaleType="centerInside"
                         android:tint="@color/white"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginEnd="5dp"
+                        android:layout_marginStart="20dp"
+                        android:layout_marginEnd="20dp"
                         android:src="@drawable/drag_indicator" />
 
                 </LinearLayout>
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index 2e3c45cd..de709c1e 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -23,7 +23,7 @@
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
             android:gravity="center"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
     <RelativeLayout
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 23b8f63b..344fe048 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -46,7 +46,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginBottom="1dp"
             android:gravity="center_vertical"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index 66611a43..3cfff98b 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -33,7 +33,7 @@
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 
     <TextView
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index e72220e6..3b87761a 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -68,7 +68,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/grid_item_padding_right"
-                android:src="@drawable/menu_button" />
+                android:src="@lineageos.platform:drawable/ic_menu" />
 
         </LinearLayout>
 
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index d209147a..3e953ee7 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -55,6 +55,6 @@
         android:layout_weight="0"
         android:scaleType="centerInside"
         android:background="@drawable/selectable_background"
-        android:src="@drawable/menu_button_light"/>
+        android:src="@lineageos.platform:drawable/ic_menu"/>
 
 </org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index da1b3e00..18c5a8d6 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -56,6 +56,6 @@
             android:id="@+id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index 9e2f2e58..5608e595 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -71,5 +71,5 @@
         android:layout_height="@dimen/overflow_height"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:src="@drawable/menu_button_light" />
+        android:src="@lineageos.platform:drawable/ic_menu" />
 </RelativeLayout>
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
index f04bef79..aeefcb99 100644
--- a/res/layout/list_item_simple.xml
+++ b/res/layout/list_item_simple.xml
@@ -65,7 +65,7 @@
             android:layout_height="@dimen/overflow_height"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:src="@drawable/menu_button" />
+            android:src="@lineageos.platform:drawable/ic_menu" />
     </RelativeLayout>
 
     <ImageView
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index 7880dd23..1d72be5e 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -95,7 +95,7 @@
                 android:id="@+id/popup_menu_button"
                 android:layout_width="@dimen/overflow_width"
                 android:layout_height="@dimen/overflow_height"
-                android:src="@drawable/menu_button" />
+                android:src="@lineageos.platform:drawable/ic_menu" />
         </LinearLayout>
     </RelativeLayout>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index df10fdad..ee8dde54 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,6 +31,7 @@
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">false</item>
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
     <style name="ActionBarWidgetTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
@@ -77,7 +78,7 @@
 
     <!-- Sets the action bar menu icon -->
     <style name="ActionOverFlowButton" parent="@style/Widget.AppCompat.ActionButton">
-        <item name="android:src">@drawable/menu_button_light</item>
+        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
         <item name="android:minWidth">0dip</item>
         <item name="android:paddingLeft">8dip</item>
         <item name="android:paddingRight">8dip</item>
-- 
GitLab


From ca5f4281770780df7af2f647436ec24a09777241 Mon Sep 17 00:00:00 2001
From: Mohit Mali <futuretechnoworld.mohit@gmail.com>
Date: Tue, 29 Dec 2020 15:53:11 +0530
Subject: [PATCH 3/3] Change ArtistDetailFragment action bar and back icon

---
 res/layout/artist_detail_header.xml                           | 1 +
 res/values/styles.xml                                         | 1 +
 .../lineageos/eleven/ui/fragments/ArtistDetailFragment.java   | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/res/layout/artist_detail_header.xml b/res/layout/artist_detail_header.xml
index d1a20264..6e39e15d 100644
--- a/res/layout/artist_detail_header.xml
+++ b/res/layout/artist_detail_header.xml
@@ -7,6 +7,7 @@
         android:id="@+id/hero"
         android:layout_width="match_parent"
         android:layout_height="222dp"
+        android:layout_marginTop="?android:attr/actionBarSize"
         android:gravity="center" />
 
     <TextView
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ee8dde54..a5609eb3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,6 +32,7 @@
         <item name="android:windowAllowEnterTransitionOverlap">false</item>
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
         <item name="android:windowLightStatusBar">true</item>
+        <item name="android:homeAsUpIndicator">@lineageos.platform:drawable/ic_back</item>
     </style>
 
     <style name="ActionBarWidgetTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
index a47b312e..e5a0deef 100644
--- a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
@@ -15,6 +15,7 @@
 */
 package org.lineageos.eleven.ui.fragments;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -97,6 +98,9 @@ public class ArtistDetailFragment extends FadingBarFragment implements IChildFra
         LoaderManager lm = getLoaderManager();
         lm.initLoader(ALBUM_LOADER_ID, arguments, mAlbumAdapter);
         lm.initLoader(SONG_LOADER_ID, arguments, mSongAdapter);
+        if (getContainingActivity().getActionBar() != null)
+            getContainingActivity().getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.primary_dark)));
+
     }
 
     @Override // DetailFragment
-- 
GitLab