From c199d35913f760a95d7402a6fff526673f2a7342 Mon Sep 17 00:00:00 2001
From: Faisal Khan <faisalknx@gmail.com>
Date: Tue, 14 Feb 2023 16:05:24 +0530
Subject: [PATCH] Fixes: Labels under icons are not visible (#3066)

* Made improvement to player double-tap further.

* Minor fixes.

* fix ktlint

* Filter out null comments returned from Piped API.

* Fixes: Labels under icons are not visible

* Minor player controls UI improvements

---------

Co-authored-by: Bnyro <bnyro@tutanota.com>
---
 app/release/output-metadata.json              | 86 +++++++++----------
 .../libretube/ui/fragments/PlayerFragment.kt  |  4 +
 app/src/main/res/drawable/ic_download.xml     | 14 +--
 app/src/main/res/layout/fragment_player.xml   | 19 ++--
 app/src/main/res/values/style.xml             | 14 +--
 5 files changed, 75 insertions(+), 62 deletions(-)

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index e26bef14b..cbf3376d0 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,49 +11,10 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 26,
-      "versionName": "0.10.0",
+      "versionCode": 29,
+      "versionName": "0.12.0",
       "outputFile": "app-universal-release.apk"
     },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "arm64-v8a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 26,
-      "versionName": "0.10.0",
-      "outputFile": "app-arm64-v8a-release.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86_64"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 26,
-      "versionName": "0.10.0",
-      "outputFile": "app-x86_64-release.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "armeabi-v7a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 26,
-      "versionName": "0.10.0",
-      "outputFile": "app-armeabi-v7a-release.apk"
-    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -63,9 +24,48 @@
         }
       ],
       "attributes": [],
-      "versionCode": 26,
-      "versionName": "0.10.0",
+      "versionCode": 29,
+      "versionName": "0.12.0",
       "outputFile": "app-x86-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "armeabi-v7a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 29,
+      "versionName": "0.12.0",
+      "outputFile": "app-armeabi-v7a-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86_64"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 29,
+      "versionName": "0.12.0",
+      "outputFile": "app-x86_64-release.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "arm64-v8a"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 29,
+      "versionName": "0.12.0",
+      "outputFile": "app-arm64-v8a-release.apk"
     }
   ],
   "elementType": "File"
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index 2438b8718..a4c970a4c 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -1419,6 +1419,10 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
             binding.linLayout.visibility = View.VISIBLE
 
             updateCaptionsLanguage(captionLanguage)
+
+            binding.optionsLL.post {
+                binding.optionsLL.requestLayout()
+            }
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index 30044b189..de7af3886 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -2,9 +2,13 @@
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M24,32.1 L13.9,22.05 16.35,19.6 22.3,25.55V7.15H25.7V25.55L31.65,19.6L34.1,22.05ZM10.8,40.55Q9.45,40.55 8.425,39.55Q7.4,38.55 7.4,37.15V29.45H10.8V37.15Q10.8,37.15 10.8,37.15Q10.8,37.15 10.8,37.15H37.15Q37.15,37.15 37.15,37.15Q37.15,37.15 37.15,37.15V29.45H40.55V37.15Q40.55,38.55 39.55,39.55Q38.55,40.55 37.15,40.55Z" />
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,11L12,15M12,15L8,11M12,15L12,3M21,15L21,17C21,18.105 20.105,19 19,19L5,19C3.895,19 3,18.105 3,17L3,15"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 01fb7a38f..1bb8a92a9 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -128,8 +128,9 @@
             <com.google.android.material.card.MaterialCardView
                 style="@style/Widget.Material3.CardView.Elevated"
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:layout_margin="17dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="10dp"
+                android:layout_marginVertical="17dp"
                 app:cardCornerRadius="27dp">
 
                 <LinearLayout
@@ -137,36 +138,36 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginHorizontal="8dp"
+                    android:layout_marginVertical="18dp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
-                    <TextView
+                    <com.github.libretube.ui.views.DrawableTextView
                         android:id="@+id/relPlayer_share"
                         style="@style/PlayerActionsText"
                         android:text="@string/share"
                         app:drawableTopCompat="@drawable/ic_share" />
 
-                    <TextView
+                    <com.github.libretube.ui.views.DrawableTextView
                         android:id="@+id/relPlayer_download"
                         style="@style/PlayerActionsText"
                         android:text="@string/download"
                         app:drawableTopCompat="@drawable/ic_download" />
 
-                    <TextView
+                    <com.github.libretube.ui.views.DrawableTextView
                         android:id="@+id/relPlayer_pip"
                         style="@style/PlayerActionsText"
                         android:text="@string/pop_up"
                         app:drawableTopCompat="@drawable/ic_open" />
 
-                    <TextView
+                    <com.github.libretube.ui.views.DrawableTextView
                         android:id="@+id/relPlayer_background"
                         style="@style/PlayerActionsText"
                         android:text="@string/audio"
                         app:drawableTopCompat="@drawable/ic_headphones" />
 
-                    <TextView
+                    <com.github.libretube.ui.views.DrawableTextView
                         android:id="@+id/relPlayer_save"
                         style="@style/PlayerActionsText"
                         android:text="@string/save"
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 487c1f216..c4a246769 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -76,18 +76,22 @@
     </style>
 
     <style name="PlayerActionsText">
+
         <item name="android:autoSizeTextType" tools:targetApi="o">uniform</item>
         <item name="android:autoSizeMinTextSize" tools:targetApi="o">10sp</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:autoSizeMaxTextSize" tools:targetApi="p">16sp</item>
+        <item name="android:autoSizeMaxTextSize" tools:targetApi="p">14sp</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:maxLines">1</item>
-        <item name="android:gravity">bottom</item>
-        <item name="android:textAlignment">center</item>
+        <item name="android:gravity">center</item>
         <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
-        <item name="android:layout_gravity">bottom</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
+        <item name="drawableTopDimen">24dp</item>
+        <item name="android:drawablePadding">3dp</item>
+
     </style>
 
     <style name="PlayerControlBottom">