From c5fabd625e1861adde6706920c0f0eb00ae97144 Mon Sep 17 00:00:00 2001
From: Muntashir Al-Islam <muntashir.islam96@gmail.com>
Date: Sat, 24 Oct 2020 19:00:12 +0600
Subject: [PATCH] Reduce font size to display better

---
 .../layout-land/fragment_album_details.xml    |  2 +-
 .../layout-land/fragment_artist_details.xml   |  2 +-
 app/src/main/res/layout-sw600dp/item_list.xml |  6 +-
 .../res/layout-sw600dp/item_list_no_image.xml |  6 +-
 .../main/res/layout-sw600dp/item_queue.xml    |  6 +-
 .../res/layout/fragment_album_content.xml     |  7 +-
 .../res/layout/fragment_album_details.xml     |  4 +-
 .../res/layout/fragment_artist_content.xml    |  7 +-
 .../res/layout/fragment_artist_details.xml    |  4 +-
 .../main/res/layout/item_donation_option.xml  | 71 -------------------
 app/src/main/res/layout/item_list.xml         |  4 +-
 .../main/res/layout/item_list_no_image.xml    |  4 +-
 app/src/main/res/layout/item_queue.xml        |  4 +-
 13 files changed, 29 insertions(+), 98 deletions(-)
 delete mode 100644 app/src/main/res/layout/item_donation_option.xml

diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml
index df2f76714..4d2acbb3a 100644
--- a/app/src/main/res/layout-land/fragment_album_details.xml
+++ b/app/src/main/res/layout-land/fragment_album_details.xml
@@ -113,7 +113,7 @@
                         android:ellipsize="end"
                         android:paddingTop="4dp"
                         android:singleLine="true"
-                        android:textAppearance="@style/TextViewSubtitle2"
+                        android:textAppearance="@style/TextViewCaption"
                         android:textColor="?android:attr/textColorSecondary"
                         app:lineHeightHint="24sp"
                         tools:ignore="MissingPrefix"
diff --git a/app/src/main/res/layout-land/fragment_artist_details.xml b/app/src/main/res/layout-land/fragment_artist_details.xml
index 166efcfde..e173ac42a 100644
--- a/app/src/main/res/layout-land/fragment_artist_details.xml
+++ b/app/src/main/res/layout-land/fragment_artist_details.xml
@@ -94,7 +94,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingTop="4dp"
-                    android:textAppearance="@style/TextViewSubtitle2"
+                    android:textAppearance="@style/TextViewCaption"
                     android:textColor="?android:attr/textColorSecondary"
                     app:lineHeightHint="24sp"
                     tools:ignore="MissingPrefix"
diff --git a/app/src/main/res/layout-sw600dp/item_list.xml b/app/src/main/res/layout-sw600dp/item_list.xml
index 7a5f59b12..62de198d6 100644
--- a/app/src/main/res/layout-sw600dp/item_list.xml
+++ b/app/src/main/res/layout-sw600dp/item_list.xml
@@ -72,7 +72,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewSubtitle1"
+        android:textAppearance="@style/TextViewBody2"
         android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toBottomOf="@id/imageTextContainer"
         app:layout_constraintEnd_toStartOf="@id/text"
@@ -87,7 +87,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
+        android:textAppearance="@style/TextViewCaption"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="@id/title"
         app:layout_constraintEnd_toStartOf="@id/text2"
@@ -102,7 +102,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
+        android:textAppearance="@style/TextViewCaption"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="@id/text"
         app:layout_constraintEnd_toStartOf="@id/menu"
diff --git a/app/src/main/res/layout-sw600dp/item_list_no_image.xml b/app/src/main/res/layout-sw600dp/item_list_no_image.xml
index dfcbafa8b..1b0e6803f 100644
--- a/app/src/main/res/layout-sw600dp/item_list_no_image.xml
+++ b/app/src/main/res/layout-sw600dp/item_list_no_image.xml
@@ -28,7 +28,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextViewSubtitle1"
+        android:textAppearance="@style/TextViewBody2"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/text"
         app:layout_constraintStart_toStartOf="parent"
@@ -40,7 +40,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextViewBody2"
+        android:textAppearance="@style/TextViewCaption"
         android:textColor="?android:textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/text2"
@@ -53,7 +53,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextViewBody2"
+        android:textAppearance="@style/TextViewCaption"
         android:textColor="?android:textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/item_queue.xml b/app/src/main/res/layout-sw600dp/item_queue.xml
index 7917c4ea8..a8587f9d6 100644
--- a/app/src/main/res/layout-sw600dp/item_queue.xml
+++ b/app/src/main/res/layout-sw600dp/item_queue.xml
@@ -81,7 +81,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingHorizontal="6dp"
-                android:textAppearance="@style/TextViewSubtitle1"
+                android:textAppearance="@style/TextViewBody2"
                 android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintBottom_toBottomOf="@id/imageContainer"
                 app:layout_constraintEnd_toStartOf="@id/text"
@@ -96,7 +96,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewBody2"
+                android:textAppearance="@style/TextViewCaption"
                 android:textColor="?android:attr/textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintEnd_toStartOf="@id/text2"
@@ -111,7 +111,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewBody2"
+                android:textAppearance="@style/TextViewCaption"
                 android:textColor="?android:attr/textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="@id/text"
                 app:layout_constraintEnd_toStartOf="@id/menu"
diff --git a/app/src/main/res/layout/fragment_album_content.xml b/app/src/main/res/layout/fragment_album_content.xml
index 520c55c18..1b396fd19 100644
--- a/app/src/main/res/layout/fragment_album_content.xml
+++ b/app/src/main/res/layout/fragment_album_content.xml
@@ -50,7 +50,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -75,7 +75,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         android:visibility="gone"
@@ -108,7 +108,7 @@
         android:layout_height="wrap_content"
         android:padding="12dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         android:visibility="gone"
@@ -126,6 +126,7 @@
         android:lineSpacingExtra="5dp"
         android:maxLines="4"
         android:padding="16dp"
+        android:textSize="14sp"
         android:textAppearance="@style/TextViewBody1"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_album_details.xml b/app/src/main/res/layout/fragment_album_details.xml
index a5a58a375..62cff9ef8 100644
--- a/app/src/main/res/layout/fragment_album_details.xml
+++ b/app/src/main/res/layout/fragment_album_details.xml
@@ -84,7 +84,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:maxLines="3"
-                android:textAppearance="@style/TextViewHeadline4.Compress"
+                android:textAppearance="@style/TextViewHeadline6"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textStyle="bold"
                 app:layout_constrainedWidth="true"
@@ -101,7 +101,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:singleLine="true"
-                android:textAppearance="@style/TextViewSubtitle1"
+                android:textAppearance="@style/TextViewCaption"
                 android:textColor="?android:attr/textColorSecondary"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_artist_content.xml b/app/src/main/res/layout/fragment_artist_content.xml
index 869ea4bdf..7f512ab01 100644
--- a/app/src/main/res/layout/fragment_artist_content.xml
+++ b/app/src/main/res/layout/fragment_artist_content.xml
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/albums"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
@@ -77,7 +77,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
@@ -101,7 +101,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp"
         android:text="@string/biography"
-        android:textAppearance="@style/TextViewHeadline6"
+        android:textAppearance="@style/TextViewOverline"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold"
         android:visibility="gone"
@@ -122,6 +122,7 @@
         android:maxLines="4"
         android:padding="16dp"
         android:visibility="gone"
+        android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/biographyTitle"
diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml
index 0adba0e62..5be17a54a 100644
--- a/app/src/main/res/layout/fragment_artist_details.xml
+++ b/app/src/main/res/layout/fragment_artist_details.xml
@@ -73,7 +73,7 @@
                 android:layout_marginTop="24dp"
                 android:layout_marginEnd="16dp"
                 android:maxLines="2"
-                android:textAppearance="@style/TextViewHeadline4.Compress"
+                android:textAppearance="@style/TextViewHeadline6"
                 android:textColor="?android:attr/textColorPrimary"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -88,7 +88,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
-                android:textAppearance="@style/TextViewSubtitle1"
+                android:textAppearance="@style/TextViewCaption"
                 android:textColor="?android:attr/textColorSecondary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml
deleted file mode 100644
index 203d7b20d..000000000
--- a/app/src/main/res/layout/item_donation_option.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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">
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        app:cardCornerRadius="8dp"
-
-        app:contentPadding="12dp">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?rectSelector"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/itemPrice"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewSubtitle1"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="MissingPrefix"
-                tools:text="$9" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/itemImage"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:scaleType="centerInside"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/itemPrice"
-                app:srcCompat="@drawable/ic_github_circle"
-                app:tint="?attr/colorControlNormal" />
-
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/itemTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewBody2"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/itemImage"
-                tools:text="@tools:sample/full_names" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/itemText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/TextViewBody1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/itemTitle"
-                tools:text="@tools:sample/full_names" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index aefd963be..af0bd16a4 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -71,7 +71,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewSubtitle1"
+        android:textAppearance="@style/TextViewBody2"
         android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toStartOf="@id/menu"
@@ -88,7 +88,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
+        android:textAppearance="@style/TextViewCaption"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/menu"
diff --git a/app/src/main/res/layout/item_list_no_image.xml b/app/src/main/res/layout/item_list_no_image.xml
index 6331125d8..e210319dc 100644
--- a/app/src/main/res/layout/item_list_no_image.xml
+++ b/app/src/main/res/layout/item_list_no_image.xml
@@ -28,7 +28,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextViewSubtitle1"
+        android:textAppearance="@style/TextViewBody2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -39,7 +39,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextViewBody2"
+        android:textAppearance="@style/TextViewCaption"
         android:textColor="?android:textColorSecondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml
index 0df8c24b6..923a46544 100644
--- a/app/src/main/res/layout/item_queue.xml
+++ b/app/src/main/res/layout/item_queue.xml
@@ -82,7 +82,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewSubtitle1"
+                android:textAppearance="@style/TextViewBody2"
                 android:textColor="?android:attr/textColorPrimary"
                 app:layout_constraintBottom_toTopOf="@+id/text"
                 app:layout_constraintEnd_toStartOf="@id/menu"
@@ -99,7 +99,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewBody2"
+                android:textAppearance="@style/TextViewCaption"
                 android:textColor="?android:attr/textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/menu"