From e8dfbbc7f68115a5c97b9c58a5d07e0568862290 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Mon, 4 Jul 2022 18:09:20 +0200
Subject: [PATCH 1/4] fix line count in snackbar

---
 .../java/com/github/libretube/preferences/AboutFragment.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
index a881b4e6c..24db4013c 100644
--- a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
@@ -93,8 +93,14 @@ class AboutFragment : Fragment() {
     private fun showSnackBar(text: String) {
         val snackBar = Snackbar
             .make(binding.root, text, Snackbar.LENGTH_LONG)
+
+        // set snackBar color
         snackBar.setBackgroundTint(getThemeColor(requireContext(), R.attr.colorSurface))
         snackBar.setTextColor(getThemeColor(requireContext(), R.attr.colorPrimary))
+
+        // prevent the text from being partially hidden
+        snackBar.setTextMaxLines(3)
+
         snackBar.show()
     }
 

From 21198a7ec9301f3c790b6e1eb6050076e9ae57b7 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Mon, 4 Jul 2022 18:12:24 +0200
Subject: [PATCH 2/4] improve comments padding

---
 app/src/main/res/layout/comments_row.xml    | 5 ++++-
 app/src/main/res/layout/fragment_player.xml | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index a694c0029..bf8363b95 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -8,7 +8,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 3f6b28538..e5c26c1a0 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -333,9 +333,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/comments_recView"
-                    android:layout_marginStart="10dp"
                     android:layout_marginTop="10dp"
-                    android:layout_marginEnd="10dp"
                     android:layout_marginBottom="10dp"
                     android:nestedScrollingEnabled="false" />
             </RelativeLayout>

From 215ac51d133f1a61f6be5239eeb5cda7ed495987 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Mon, 4 Jul 2022 18:22:21 +0200
Subject: [PATCH 3/4] fix comments

---
 app/src/main/res/layout/comments_row.xml    | 10 +++++-----
 app/src/main/res/layout/fragment_player.xml |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index bf8363b95..06b9b9574 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -9,14 +9,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="16dp"
+            android:layout_marginBottom="16dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -109,8 +110,7 @@
             android:id="@+id/replies_recView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginBottom="10dp"
+            android:background="@null"
             android:nestedScrollingEnabled="false" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index e5c26c1a0..942be70dc 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -322,9 +322,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/comments_toggle"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:nestedScrollingEnabled="false"
                     android:visibility="gone" />
 
@@ -333,7 +332,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/comments_recView"
+                    android:layout_marginStart="10dp"
                     android:layout_marginTop="10dp"
+                    android:layout_marginEnd="10dp"
                     android:layout_marginBottom="10dp"
                     android:nestedScrollingEnabled="false" />
             </RelativeLayout>

From 6cd5cf608a42a31b4044730acff9f6cb3c849da1 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Mon, 4 Jul 2022 18:26:14 +0200
Subject: [PATCH 4/4] fix selection background

---
 app/src/main/res/layout/comments_row.xml | 4 ++--
 app/src/main/res/layout/replies_row.xml  | 3 +--
 app/src/main/res/values/drawables.xml    | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index 06b9b9574..53523d9c1 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -3,13 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground">
+    android:background="?android:attr/selectableItemBackground" >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:layout_marginTop="10dp"
+        android:orientation="vertical"
         android:paddingStart="20dp"
         android:paddingEnd="20dp"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/replies_row.xml b/app/src/main/res/layout/replies_row.xml
index 4e448955b..5eec53aa3 100644
--- a/app/src/main/res/layout/replies_row.xml
+++ b/app/src/main/res/layout/replies_row.xml
@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground">
+    android:layout_height="wrap_content" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
index 8534441e6..ba8b31ed0 100644
--- a/app/src/main/res/values/drawables.xml
+++ b/app/src/main/res/values/drawables.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Replaces the drawables of the default exoplayer controls (see https://github.com/google/ExoPlayer/blob/release-v2/library/ui/src/main/res/values/drawables.xml) -->
+<?xml version="1.0" encoding="utf-8"?><!-- Replaces the drawables of the default exoplayer controls (see https://github.com/google/ExoPlayer/blob/release-v2/library/ui/src/main/res/values/drawables.xml) -->
 <resources>
 
     <drawable name="exo_styled_controls_play">@drawable/ic_play</drawable>