From 4bcf9b202eaae2aacccb4040295834287361f142 Mon Sep 17 00:00:00 2001
From: Hemanth S <hemanths@live.com>
Date: Sun, 10 May 2020 01:20:49 +0530
Subject: [PATCH] Fix full theme shadow

---
 app/build.gradle                                      |  4 ++--
 .../monkey/retromusic/fragments/NowPlayingScreen.kt   |  2 +-
 app/src/main/res/drawable/shadow_down_full_theme.xml  |  7 +++++++
 app/src/main/res/drawable/shadow_up_full_theme.xml    |  1 +
 app/src/main/res/layout/fragment_full.xml             |  9 +++++++++
 .../main/res/layout/sliding_music_panel_layout.xml    |  4 ++--
 app/src/main/res/values-v23/styles.xml                | 11 ++---------
 app/src/main/res/values/styles.xml                    | 11 ++++-------
 8 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/drawable/shadow_down_full_theme.xml

diff --git a/app/build.gradle b/app/build.gradle
index 4df52f8a..6c73663a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,8 +24,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 424
-        versionName '3.5.200'
+        versionCode 425
+        versionName '3.5.210'
 
         multiDexEnabled true
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
index 4020fba1..e29d54a0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
@@ -16,6 +16,7 @@ enum class NowPlayingScreen constructor(
     BLUR_CARD(R.string.blur_card, R.drawable.np_blur_card, 9),
     CARD(R.string.card, R.drawable.np_card, 6),
     CIRCLE(R.string.circle, R.drawable.np_minimalistic_circle, 15),
+    CLASSIC(R.string.classic, R.drawable.np_classic, 16),
     COLOR(R.string.color, R.drawable.np_color, 5),
     FIT(R.string.fit, R.drawable.np_fit, 12),
     FLAT(R.string.flat, R.drawable.np_flat, 1),
@@ -26,5 +27,4 @@ enum class NowPlayingScreen constructor(
     PLAIN(R.string.plain, R.drawable.np_plain, 3),
     SIMPLE(R.string.simple, R.drawable.np_simple, 8),
     TINY(R.string.tiny, R.drawable.np_tiny, 7),
-    CLASSIC(R.string.classic, R.drawable.np_classic, 16),
 }
diff --git a/app/src/main/res/drawable/shadow_down_full_theme.xml b/app/src/main/res/drawable/shadow_down_full_theme.xml
new file mode 100644
index 00000000..02009af3
--- /dev/null
+++ b/app/src/main/res/drawable/shadow_down_full_theme.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="270"
+        android:endColor="#00000000"
+        android:startColor="#80000000" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up_full_theme.xml b/app/src/main/res/drawable/shadow_up_full_theme.xml
index 4807206b..c1d1226d 100644
--- a/app/src/main/res/drawable/shadow_up_full_theme.xml
+++ b/app/src/main/res/drawable/shadow_up_full_theme.xml
@@ -3,5 +3,6 @@
     <gradient
         android:angle="90"
         android:endColor="@android:color/transparent"
+        android:centerColor="#80000000"
         android:startColor="@color/md_black_1000" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index a9751df4..1e3f5e13 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -42,6 +42,14 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:layout="@layout/fragment_full_player_controls" />
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/shadow_down_full_theme"
+        app:layout_constraintBottom_toBottomOf="@id/playerToolbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/statusBarContainer" />
 
     <FrameLayout
         android:id="@+id/statusBarContainer"
@@ -59,6 +67,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+        android:paddingBottom="24dp"
         app:contentInsetEndWithActions="0dp"
         app:contentInsetStart="0dp"
         app:contentInsetStartWithNavigation="0dp"
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 b7dfdfda..e1b9dfd2 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -54,8 +54,8 @@
         android:visibility="gone"
         app:itemHorizontalTranslationEnabled="false"
         app:itemIconTint="@drawable/bottom_navigation_item_colors"
-        app:itemTextAppearanceActive="@style/BottomSheetItemTextAppearanceActive"
-        app:itemTextAppearanceInactive="@style/BottomSheetItemTextAppearanceInactive"
+        app:itemTextAppearanceActive="@style/BottomSheetItemTextAppearance"
+        app:itemTextAppearanceInactive="@style/BottomSheetItemTextAppearance"
         app:itemTextColor="@drawable/bottom_navigation_item_colors"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_navigation_main"
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 4c62f6f2..5b291830 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -18,17 +18,10 @@
         <item name="android:hyphenationFrequency">none</item>
     </style>
 
-    <style name="BottomSheetItemTextAppearanceInactive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+    <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
         <item name="android:breakStrategy">simple</item>
         <item name="android:hyphenationFrequency">none</item>
         <item name="android:fontFamily">@font/circular</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="BottomSheetItemTextAppearanceActive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
-        <item name="android:breakStrategy">simple</item>
-        <item name="android:hyphenationFrequency">none</item>
-        <item name="android:fontFamily">@font/circular</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">13sp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6ec32bad..4b6d9fb4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,7 +62,8 @@
     </style>
 
     <style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
+        </item>
     </style>
 
     <style name="BigTitleTextAppearanceToolbar">
@@ -83,15 +84,11 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="BottomSheetItemTextAppearanceInactive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+    <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
         <item name="android:fontFamily">@font/circular</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">13sp</item>
     </style>
 
-    <style name="BottomSheetItemTextAppearanceActive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
-        <item name="android:fontFamily">@font/circular</item>
-        <item name="android:textSize">14sp</item>
-    </style>
 
     <style name="Fab" parent="FabParent" />