From c59b719b92bdfe5578fdeff18462d971d382a32e Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sun, 3 Jul 2022 14:43:29 +0200
Subject: [PATCH] convert about to cardviews

---
 .../libretube/preferences/AboutFragment.kt    |   4 +-
 app/src/main/res/layout/fragment_about.xml    | 183 ++++++++++--------
 app/src/main/res/layout/fragment_player.xml   |   5 +-
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/style.xml             |  29 ++-
 5 files changed, 139 insertions(+), 83 deletions(-)

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 0584e92be..e0d34b2f1 100644
--- a/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
+++ b/app/src/main/java/com/github/libretube/preferences/AboutFragment.kt
@@ -16,6 +16,7 @@ import com.github.libretube.util.AUTHORS_URL
 import com.github.libretube.util.CONTRIBUTING_URL
 import com.github.libretube.util.DONATE_URL
 import com.github.libretube.util.PIPED_GITHUB_URL
+import com.github.libretube.util.ThemeHelper
 import com.github.libretube.util.WEBSITE_URL
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
@@ -33,6 +34,7 @@ class AboutFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
         val settingsActivity = activity as SettingsActivity
         settingsActivity.changeTopBarText(getString(R.string.about))
 
@@ -48,7 +50,7 @@ class AboutFragment : Fragment() {
         binding.donate.setOnClickListener {
             openLinkFromHref(DONATE_URL)
         }
-        binding.contributing.setOnClickListener {
+        binding.github.setOnClickListener {
             openLinkFromHref(CONTRIBUTING_URL)
         }
         binding.license.setOnClickListener {
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 1bf1f174b..9eef298de 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <ImageView
-            style="@style/roundedImageViewRounded"
+        <com.google.android.material.imageview.ShapeableImageView
+            app:shapeAppearanceOverlay="@style/CircleImageView"
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
-            android:src="@mipmap/ic_launcher" />
+            android:src="@mipmap/ic_launcher_round" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -26,107 +27,137 @@
             android:textSize="27sp"
             android:textStyle="bold" />
 
-        <LinearLayout
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/website"
-            style="@style/AboutItem">
+            style="@style/AboutCard">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/website"
-                android:textStyle="bold" />
+            <LinearLayout
+                style="@style/AboutItem">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/website_summary" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/website"
+                    android:textStyle="bold" />
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/website_summary" />
 
-        <LinearLayout
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/contributing"
-            style="@style/AboutItem">
+            style="@style/AboutCard">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/contributing"
-                android:textStyle="bold" />
+            <LinearLayout
+                style="@style/AboutItem">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/contributing_summary" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contributing"
+                    android:textStyle="bold" />
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/contributing_summary" />
 
-        <LinearLayout
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/authors"
-            style="@style/AboutItem">
+            style="@style/AboutCard">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/authors"
-                android:textStyle="bold" />
+            <LinearLayout
+                style="@style/AboutItem">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/authors_summary" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/authors"
+                    android:textStyle="bold" />
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/authors_summary" />
 
-        <LinearLayout
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/piped"
-            style="@style/AboutItem">
+            style="@style/AboutCard">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/piped"
-                android:textStyle="bold" />
+            <LinearLayout
+                style="@style/AboutItem">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/piped_summary" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/piped"
+                    android:textStyle="bold" />
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/piped_summary" />
 
-        <LinearLayout
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/donate"
-            style="@style/AboutItem">
+            style="@style/AboutCard">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/donate"
-                android:textStyle="bold" />
+            <LinearLayout
+                style="@style/AboutItem">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/donate_summary" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/donate"
+                    android:textStyle="bold" />
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/donate_summary" />
 
-        <LinearLayout
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/license"
-            style="@style/AboutItem">
+            style="@style/AboutCard">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/license"
-                android:textStyle="bold" />
+            <LinearLayout
+                style="@style/AboutItem">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/license_summary" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/license"
+                    android:textStyle="bold" />
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/license_summary" />
+
+            </LinearLayout>
+
+        </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index ddeefc704..9bcc7e86e 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -281,7 +281,10 @@
                     style="@style/Widget.Material3.CardView.Elevated"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginBottom="16dp"
                     app:cardCornerRadius="18dp">
 
                     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d31c6745f..16f5c7da0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,4 +214,5 @@
     <string name="auth_instance_summary">Use a different instance for authenticated calls.</string>
     <string name="auth_instances">Choose an auth instance</string>
     <string name="hls">Auto</string>
+    <string name="github">GitHub</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 7b63c7620..49c91f885 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -2,8 +2,17 @@
 <resources>
 
     <style name="roundedImageViewRounded">
+
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">10%</item>
+
+    </style>
+
+    <style name="CircleImageView">
+
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+
     </style>
 
     <style name="OLED">
@@ -28,11 +37,21 @@
         <item name="android:orientation">vertical</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
-        <item name="android:paddingTop">12dp</item>
-        <item name="android:paddingBottom">12dp</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginTop">12dp</item>
+        <item name="android:layout_marginBottom">12dp</item>
+
+    </style>
+
+    <style name="AboutCard" parent="Widget.Material3.CardView.Elevated">
+
+        <item name="android:layout_margin">5dp</item>
+        <item name="strokeWidth">0dp</item>
+        <item name="cardCornerRadius">20dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="cardElevation">5dp</item>
 
     </style>