From d8dc39d293d3ed8a1b4925c3ba939545d4ff160c Mon Sep 17 00:00:00 2001
From: h4h13 <hemanths@live.com>
Date: Thu, 6 Feb 2020 21:52:47 +0530
Subject: [PATCH] Fix full screen layout issue

---
 app/src/main/assets/retro-changelog.html      |  2 +-
 .../res/layout/activity_album_content.xml     |  2 +-
 .../res/layout/activity_artist_content.xml    | 11 ++-
 .../layout/fragment_full_player_controls.xml  | 79 ++++++++++---------
 4 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 4e4bceafc..72af2878f 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: {link-color};        }        a:active {        color: {link-color-active};        }        ol {        list-style-position: inside;        padding-left: 0;        padding-right: 0;        }        li {        padding-top: 8px;        }    </style></head><body><h4>v3.4.900</h4><ul>    <li>Added playlist search</li>    <li>Added Drive mode</li>    <li>Added Album and Artist layout change option in library</li>    <li>Added Show more album and artist information in details</li>    <li>Added Pixel style scroller bar</li>    <li>Added current now playing share</li>    <li>Fix font issues and colors in some places</li>    <li>Improved Full now playing theme</li></ul><h4>v3.4.850</h4><ul>    <li>Added new theme called circle</li>    <li>Added tiny color card style for home artists</li>    <li>Added extra track info details to now playing themes</li>    <li>Added scroll animation</li>    <li>Added smooth transition animations 🤔</li>    <li>Added current playing tab options for Bottom Navigation View</li>    <li>Added search in genre</li>    <li>Improved selecting feedback effect(ripple with corners)</li>    <li>Fix bugs & crashes</li>    <li>Fix crashing on lyrics</li>    <li>Fix genre details last song is under mini player</li>    <li>Fix colors mistakes and font sizes</li>    <li>Fix slider jumping while scrolling in now playing themes</li></ul><h4>v3.4.800</h4><ul>    <li>Improved dark theme colors and Follow system theme</li>    <li>Rounded rectangle ripple for BottomNavigationView</li>    <li>Follow sleep timer dialog checkbox color as accent</li>    <li>Added song list selection for Album and Artist details</li>    <li>Fixed Toolbar popup text color when selecting songs</li></ul><h4>v3.4.700</h4><ul>    <li>Added splash screen(for app loading time)</li>    <li>Updated dark theme colors</li>    <li>Added circular progress view</li>    <li>Hiding year if not showing</li></ul><h4>v3.4.600</h4><ul>    <li>Fix notification layout height</li>    <li>Fix folder list last item not showing</li>    <li>Added auto hide/ show controls according to first and last item</li></ul><h4>v3.4.500</h4><ul>    <li>Added peak theme</li>    <li>Added app rating dialog</li>    <li>Fix song name scrolling in now playing themes if it's long</li>    <li>Fix playing queue last item hiding FAB</li>    <li>Added desaturated color option for dark mode</li>    <li>Fix slow search loading</li>    <li>Fix last added slow loading</li>    <li>Fix home banner toolbar corner</li>    <li>Fix home crashing when switching between two tabs</li>    <li>Fix remaining time in playing queue</li>    <li>Fix font not applied for some components</li>    <li>Fix crashing on album details sorting</li>    <li>Fixed lot of internal bugs</li>    <li>Fix dialog expand</li>    <li>Fix list card color</li>    <li>Removed SlidingUpPanel to replace with BottomSheet</li>    <li>Removed color theme as per material design guidelines</li>    <li>Removed classic theme(We're bringing back)</li>    <li>Replace line switch to Material Switch in settings</li>    <li>Performance improved</li>    <li>Updated internal libraries</li>    <li>Updated translation</li>    <li>Limiting the use of Theme engine for making use of system colors</li>    <li>Change home icon from the user icon</li>    <li>Corrected all toolbar with elevation when scrolling</li></ul><p>If you see entire app white or dark or black select same theme in settings to fix </p><p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p><p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its    not working try to    uninstall and install again. </p></body>
\ No newline at end of file
+<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: {link-color};        }        a:active {        color: {link-color-active};        }        ol {        list-style-position: inside;        padding-left: 0;        padding-right: 0;        }        li {        padding-top: 8px;        }    </style></head><body><h4>v.3.5.000</h4><ul>    <li>Major code refactor</li>    <li></li></ul><h4>v3.4.900</h4><ul>    <li>Added playlist search</li>    <li>Added Drive mode</li>    <li>Added Album and Artist layout change option in library</li>    <li>Added Show more album and artist information in details</li>    <li>Added Pixel style scroller bar</li>    <li>Added current now playing share</li>    <li>Fix font issues and colors in some places</li>    <li>Improved Full now playing theme</li></ul><h4>v3.4.850</h4><ul>    <li>Added new theme called circle</li>    <li>Added tiny color card style for home artists</li>    <li>Added extra track info details to now playing themes</li>    <li>Added scroll animation</li>    <li>Added smooth transition animations 🤔</li>    <li>Added current playing tab options for Bottom Navigation View</li>    <li>Added search in genre</li>    <li>Improved selecting feedback effect(ripple with corners)</li>    <li>Fix bugs & crashes</li>    <li>Fix crashing on lyrics</li>    <li>Fix genre details last song is under mini player</li>    <li>Fix colors mistakes and font sizes</li>    <li>Fix slider jumping while scrolling in now playing themes</li></ul><h4>v3.4.800</h4><ul>    <li>Improved dark theme colors and Follow system theme</li>    <li>Rounded rectangle ripple for BottomNavigationView</li>    <li>Follow sleep timer dialog checkbox color as accent</li>    <li>Added song list selection for Album and Artist details</li>    <li>Fixed Toolbar popup text color when selecting songs</li></ul><h4>v3.4.700</h4><ul>    <li>Added splash screen(for app loading time)</li>    <li>Updated dark theme colors</li>    <li>Added circular progress view</li>    <li>Hiding year if not showing</li></ul><h4>v3.4.600</h4><ul>    <li>Fix notification layout height</li>    <li>Fix folder list last item not showing</li>    <li>Added auto hide/ show controls according to first and last item</li></ul><h4>v3.4.500</h4><ul>    <li>Added peak theme</li>    <li>Added app rating dialog</li>    <li>Fix song name scrolling in now playing themes if it's long</li>    <li>Fix playing queue last item hiding FAB</li>    <li>Added desaturated color option for dark mode</li>    <li>Fix slow search loading</li>    <li>Fix last added slow loading</li>    <li>Fix home banner toolbar corner</li>    <li>Fix home crashing when switching between two tabs</li>    <li>Fix remaining time in playing queue</li>    <li>Fix font not applied for some components</li>    <li>Fix crashing on album details sorting</li>    <li>Fixed lot of internal bugs</li>    <li>Fix dialog expand</li>    <li>Fix list card color</li>    <li>Removed SlidingUpPanel to replace with BottomSheet</li>    <li>Removed color theme as per material design guidelines</li>    <li>Removed classic theme(We're bringing back)</li>    <li>Replace line switch to Material Switch in settings</li>    <li>Performance improved</li>    <li>Updated internal libraries</li>    <li>Updated translation</li>    <li>Limiting the use of Theme engine for making use of system colors</li>    <li>Change home icon from the user icon</li>    <li>Corrected all toolbar with elevation when scrolling</li></ul><p>If you see entire app white or dark or black select same theme in settings to fix </p><p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p><p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its    not working try to    uninstall and install again. </p></body>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album_content.xml b/app/src/main/res/layout/activity_album_content.xml
index cb216a64d..c8d87be03 100644
--- a/app/src/main/res/layout/activity_album_content.xml
+++ b/app/src/main/res/layout/activity_album_content.xml
@@ -48,7 +48,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline5"
+        android:textAppearance="@style/TextViewHeadline6"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_artist_content.xml b/app/src/main/res/layout/activity_artist_content.xml
index 034bc4a91..420ad22ae 100644
--- a/app/src/main/res/layout/activity_artist_content.xml
+++ b/app/src/main/res/layout/activity_artist_content.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:padding="12dp"
         android:text="@string/albums"
-        android:textAppearance="@style/TextViewHeadline5"
+        android:textAppearance="@style/TextViewHeadline6"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -69,7 +69,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline5"
+        android:textAppearance="@style/TextViewHeadline6"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -83,8 +83,7 @@
         android:nestedScrollingEnabled="false"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/songTitle"
-        tools:listitem="@layout/item_song"
-        tools:visibility="gone" />
+        tools:listitem="@layout/item_song" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/biographyTitle"
@@ -92,7 +91,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/biography"
-        android:textAppearance="@style/TextViewHeadline5"
+        android:textAppearance="@style/TextViewHeadline6"
         android:textStyle="bold"
         android:visibility="gone"
         app:layout_constrainedWidth="true"
@@ -104,13 +103,13 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/biographyText"
-        style="@style/TextAppearance.MaterialComponents.Body1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:lineSpacingExtra="5dp"
         android:maxLines="4"
         android:padding="16dp"
+        android:textAppearance="@style/TextViewBody1"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml
index c6c50f6ff..6b4c52e50 100644
--- a/app/src/main/res/layout/fragment_full_player_controls.xml
+++ b/app/src/main/res/layout/fragment_full_player_controls.xml
@@ -12,58 +12,63 @@
         android:id="@+id/playerMenu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
         android:background="?attr/roundSelector"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/titleContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_more_vert_white_24dp" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="315dp"
+    <LinearLayout
+        android:id="@+id/titleContainer"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="@color/md_white_1000"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toStartOf="@+id/playerMenu"
-        app:layout_constraintStart_toEndOf="@+id/songFavourite"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="315dp"
-        android:layout_height="wrap_content"
-        android:alpha="0.75"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:padding="8dp"
-        android:textColor="@color/md_white_1000"
+        android:orientation="vertical"
         app:layout_constraintBottom_toTopOf="@+id/progressSlider"
         app:layout_constraintEnd_toStartOf="@+id/playerMenu"
         app:layout_constraintStart_toEndOf="@+id/songFavourite"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:layout_editor_absoluteX="48dp"
-        tools:text="@tools:sample/lorem/random" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="@color/md_white_1000"
+            android:textStyle="bold"
+            tools:text="@tools:sample/lorem/random" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:alpha="0.75"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:padding="8dp"
+            android:textColor="@color/md_white_1000"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/songFavourite"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:background="?attr/roundSelector"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/titleContainer"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/title"
+        app:layout_constraintTop_toTopOf="@+id/titleContainer"
         app:srcCompat="@drawable/ic_favorite_border_white_24dp" />
 
 
@@ -95,7 +100,7 @@
         android:splitTrack="false"
         app:layout_constraintEnd_toStartOf="@id/songTotalTime"
         app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toBottomOf="@id/text"
+        app:layout_constraintTop_toBottomOf="@id/titleContainer"
         tools:ignore="RtlHardcoded,UnusedAttribute"
         tools:progress="20" />
 
