From 81b176b4d6d7485f6893942ced6153f0cc1b26b7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Tue, 28 Jun 2022 16:53:18 +0200
Subject: [PATCH] better description layout

---
 .../java/com/github/libretube/MainActivity.kt |   1 +
 .../libretube/fragments/PlayerFragment.kt     |   9 +-
 app/src/main/res/layout/chapter_column.xml    |  12 +-
 app/src/main/res/layout/fragment_player.xml   | 125 +++++++++---------
 4 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index ee7126cae..5c694a275 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -54,6 +54,7 @@ class MainActivity : AppCompatActivity() {
         DynamicColors.applyToActivityIfAvailable(this)
         super.onCreate(savedInstanceState)
 
+        // start service that gets called on closure
         startService(Intent(this, ClosingService::class.java))
 
         CronetHelper.initCronet(this.applicationContext)
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index d95443f9e..dbe0b78ff 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -252,14 +252,12 @@ class PlayerFragment : Fragment() {
             }
         }
 
+        // video description and chapters toggle
+        val descLinLayout = view.findViewById<LinearLayout>(R.id.desc_linLayout)
         view.findViewById<RelativeLayout>(R.id.player_title_layout).setOnClickListener {
             val arrowImageView = view.findViewById<ImageView>(R.id.player_description_arrow)
             arrowImageView.animate().rotationBy(180F).setDuration(100).start()
-            if (playerDescription.isVisible) {
-                playerDescription.visibility = View.GONE
-            } else {
-                playerDescription.visibility = View.VISIBLE
-            }
+            descLinLayout.visibility = if (descLinLayout.isVisible) View.GONE else View.VISIBLE
         }
 
         view.findViewById<MaterialCardView>(R.id.comments_toggle)
@@ -723,6 +721,7 @@ class PlayerFragment : Fragment() {
             chaptersRecView?.layoutManager =
                 LinearLayoutManager(this.context, LinearLayoutManager.HORIZONTAL, false)
             chaptersRecView?.adapter = ChaptersAdapter(chapters, exoPlayer)
+            chaptersRecView?.visibility = View.VISIBLE
         }
     }
 
diff --git a/app/src/main/res/layout/chapter_column.xml b/app/src/main/res/layout/chapter_column.xml
index bc9a2f45d..ff16c0e82 100644
--- a/app/src/main/res/layout/chapter_column.xml
+++ b/app/src/main/res/layout/chapter_column.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="80dp"
+    android:layout_width="100dp"
     android:layout_height="wrap_content"
-    android:layout_marginHorizontal="10dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_marginHorizontal="5dp"
     android:orientation="vertical">
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
+        app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
         android:id="@+id/chapter_image"
-        android:layout_width="80dp"
-        android:layout_height="45dp"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
         android:src="@mipmap/ic_launcher" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 05dda1320..7c9c382db 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -23,7 +23,8 @@
             android:id="@+id/linLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:animateLayoutChanges="true" >
 
             <RelativeLayout
                 android:id="@+id/player_title_layout"
@@ -55,78 +56,84 @@
 
             </RelativeLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="10dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/player_views_info"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="10dp"
-                    android:orientation="horizontal">
+                    android:layout_weight="1"
+                    android:text="10M views    2 days ago " />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="3dp"
+                    android:layout_marginTop="2dp">
+
+                    <ImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/ic_like" />
 
                     <TextView
-                        android:id="@+id/player_views_info"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="10M views    2 days ago " />
-
-                    <LinearLayout
+                        android:id="@+id/textLike"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="3dp"
-                        android:layout_marginTop="2dp">
+                        android:layout_marginHorizontal="5dp"
+                        android:text="4.2K" />
 
-                        <ImageView
-                            android:layout_gravity="center"
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
-                            android:src="@drawable/ic_like" />
+                    <ImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="5dp"
+                        android:rotation="180"
+                        android:src="@drawable/ic_like" />
 
-                        <TextView
-                            android:id="@+id/textLike"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginHorizontal="5dp"
-                            android:text="4.2K" />
-
-                        <ImageView
-                            android:layout_gravity="center"
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
-                            android:layout_marginLeft="5dp"
-                            android:src="@drawable/ic_like"
-                            android:rotation="180"/>
-
-                        <TextView
-                            android:id="@+id/textDislike"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginHorizontal="5dp"
-                            android:text="1.3K" />
-
-                    </LinearLayout>
+                    <TextView
+                        android:id="@+id/textDislike"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="5dp"
+                        android:text="1.3K" />
 
                 </LinearLayout>
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/chapters_recView"
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/desc_linLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/comments_toggle"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="10dp"
-                android:nestedScrollingEnabled="false"
-                android:visibility="gone" />
+                android:orientation="vertical"
+                android:visibility="gone">
 
-            <TextView
-                android:id="@+id/player_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autoLink="web"
-                android:padding="8dp"
-                android:textIsSelectable="true"
-                android:textSize="14sp"
-                android:visibility="gone" />
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/chapters_recView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/comments_toggle"
+                    android:layout_marginHorizontal="3dp"
+                    android:layout_marginTop="20dp"
+                    android:nestedScrollingEnabled="false"
+                    android:visibility="gone" />
 
+                <TextView
+                    android:id="@+id/player_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autoLink="web"
+                    android:padding="8dp"
+                    android:textIsSelectable="true"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
 
             <com.google.android.material.card.MaterialCardView
                 style="@style/Widget.Material3.CardView.Elevated"