From 4732ff2477c56c6bc454694337ad739bc6d232c3 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 1 Feb 2023 18:36:39 +0100
Subject: [PATCH 1/5] Help & About: Use icon without background

---
 .../libretube/ui/activities/AboutActivity.kt       |  2 +-
 app/src/main/res/layout/activity_about.xml         | 14 ++++++++------
 app/src/main/res/layout/activity_help.xml          | 11 ++++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
index bc4cf4b13..5d65cf7b7 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
@@ -34,7 +34,7 @@ class AboutActivity : BaseActivity() {
         }
 
         binding.appIcon.setOnClickListener {
-            val sendIntent: Intent = Intent().apply {
+            val sendIntent = Intent().apply {
                 action = Intent.ACTION_SEND
                 putExtra(Intent.EXTRA_TEXT, GITHUB_URL)
                 type = "text/plain"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 3d2884f8e..ece2000c5 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView 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="match_parent">
 
@@ -16,14 +17,15 @@
             app:navigationIcon="?homeAsUpIndicator"
             app:title="@string/about" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/appIcon"
-            android:layout_width="90dp"
-            android:layout_height="90dp"
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
-            android:src="@mipmap/ic_launcher_round"
-            app:shapeAppearance="@style/CircleImageView" />
+            android:src="@drawable/ic_launcher_lockscreen"
+            app:tint="?attr/colorSecondary"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index b806269f7..bf77fa7d3 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -17,14 +17,15 @@
             app:navigationIcon="?homeAsUpIndicator"
             app:title="@string/community" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:layout_width="90dp"
-            android:layout_height="90dp"
+        <ImageView
+            android:layout_width="120dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
             android:layout_marginBottom="40dp"
-            android:src="@mipmap/ic_launcher_round"
-            app:shapeAppearance="@style/CircleImageView" />
+            android:src="@drawable/ic_launcher_lockscreen"
+            app:tint="?attr/colorSecondary"
+            tools:ignore="ContentDescription" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/faq"

From 2d12d7ce5b3bf1c1cfa73b1e18266a1692c98cd7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 1 Feb 2023 18:39:58 +0100
Subject: [PATCH 2/5] Increase the about item padding & fix help section title

---
 app/src/main/res/layout/activity_help.xml | 2 +-
 app/src/main/res/values/style.xml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index bf77fa7d3..729a33e2d 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:navigationIcon="?homeAsUpIndicator"
-            app:title="@string/community" />
+            app:title="@string/help" />
 
         <ImageView
             android:layout_width="120dp"
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 6d2f47d50..487c1f216 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -39,8 +39,8 @@
         <item name="android:drawablePadding">20dp</item>
         <item name="android:paddingStart">15dp</item>
         <item name="android:paddingEnd">15dp</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingTop">15dp</item>
+        <item name="android:paddingBottom">15dp</item>
     </style>
 
     <style name="CustomDialogButton" parent="@style/Widget.Material3.Button.TextButton">

From 59a56f84672c608ac6616ac80c9bbace3eef14cb Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 1 Feb 2023 18:42:35 +0100
Subject: [PATCH 3/5] Cleanup the `HelpActivity.kt`

---
 .../libretube/ui/activities/HelpActivity.kt   | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
index fcdad85a0..01380eec3 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
@@ -7,10 +7,10 @@ import com.github.libretube.constants.DISCORD_URL
 import com.github.libretube.constants.FAQ_URL
 import com.github.libretube.constants.MASTODON_URL
 import com.github.libretube.constants.MATRIX_URL
-import com.github.libretube.constants.REDDIT_URL
 import com.github.libretube.constants.TELEGRAM_URL
 import com.github.libretube.databinding.ActivityHelpBinding
 import com.github.libretube.ui.base.BaseActivity
+import com.google.android.material.card.MaterialCardView
 
 class HelpActivity : BaseActivity() {
     private lateinit var binding: ActivityHelpBinding
@@ -25,28 +25,17 @@ class HelpActivity : BaseActivity() {
             onBackPressedDispatcher.onBackPressed()
         }
 
-        binding.faq.setOnClickListener {
-            openLinkFromHref(FAQ_URL)
-        }
+        setupCard(binding.faq, FAQ_URL)
+        setupCard(binding.matrix, MATRIX_URL)
+        setupCard(binding.mastodon, MASTODON_URL)
+        setupCard(binding.telegram, TELEGRAM_URL)
+        setupCard(binding.discord, DISCORD_URL)
+        setupCard(binding.mastodon, MASTODON_URL)
+    }
 
-        binding.matrix.setOnClickListener {
-            openLinkFromHref(MATRIX_URL)
-        }
-
-        binding.telegram.setOnClickListener {
-            openLinkFromHref(TELEGRAM_URL)
-        }
-
-        binding.discord.setOnClickListener {
-            openLinkFromHref(DISCORD_URL)
-        }
-
-        binding.reddit.setOnClickListener {
-            openLinkFromHref(REDDIT_URL)
-        }
-
-        binding.mastodon.setOnClickListener {
-            openLinkFromHref(MASTODON_URL)
+    private fun setupCard(card: MaterialCardView, link: String) {
+        card.setOnClickListener {
+            openLinkFromHref(link)
         }
     }
 

From 766c7c82d90ffbdc9c48a787ec05ae2c87e82564 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 1 Feb 2023 18:45:40 +0100
Subject: [PATCH 4/5] Cleanup the `AboutActivity.kt`

---
 .../libretube/ui/activities/AboutActivity.kt  | 46 ++++++-------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
index 5d65cf7b7..616d241f0 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
@@ -17,6 +17,7 @@ import com.github.libretube.constants.WEBLATE_URL
 import com.github.libretube.constants.WEBSITE_URL
 import com.github.libretube.databinding.ActivityAboutBinding
 import com.github.libretube.ui.base.BaseActivity
+import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 
@@ -44,37 +45,10 @@ class AboutActivity : BaseActivity() {
             startActivity(shareIntent)
         }
 
-        binding.website.setOnClickListener {
-            openLinkFromHref(WEBSITE_URL)
-        }
-        binding.website.setOnLongClickListener {
-            onLongClick(WEBSITE_URL)
-            true
-        }
-
-        binding.piped.setOnClickListener {
-            openLinkFromHref(PIPED_GITHUB_URL)
-        }
-        binding.piped.setOnLongClickListener {
-            onLongClick(PIPED_GITHUB_URL)
-            true
-        }
-
-        binding.translate.setOnClickListener {
-            openLinkFromHref(WEBLATE_URL)
-        }
-        binding.translate.setOnLongClickListener {
-            onLongClick(WEBLATE_URL)
-            true
-        }
-
-        binding.github.setOnClickListener {
-            openLinkFromHref(GITHUB_URL)
-        }
-        binding.github.setOnLongClickListener {
-            onLongClick(GITHUB_URL)
-            true
-        }
+        setupCard(binding.website, WEBSITE_URL)
+        setupCard(binding.piped, PIPED_GITHUB_URL)
+        setupCard(binding.translate, WEBLATE_URL)
+        setupCard(binding.github, GITHUB_URL)
 
         binding.license.setOnClickListener {
             showLicense()
@@ -89,6 +63,16 @@ class AboutActivity : BaseActivity() {
         }
     }
 
+    private fun setupCard(card: MaterialCardView, link: String) {
+        card.setOnClickListener {
+            openLinkFromHref(link)
+        }
+        card.setOnLongClickListener {
+            onLongClick(link)
+            true
+        }
+    }
+
     private fun openLinkFromHref(link: String) {
         val uri = Uri.parse(link)
         val intent = Intent(Intent.ACTION_VIEW).setData(uri)

From 81568e21359c48c72117c9c3254dde9eec240cb7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 1 Feb 2023 18:49:59 +0100
Subject: [PATCH 5/5] Cleanup common methods in the about and help acitvities

---
 .../com/github/libretube/helpers/IntentHelper.kt   | 13 +++++++++++++
 .../libretube/ui/activities/AboutActivity.kt       | 12 +++---------
 .../github/libretube/ui/activities/HelpActivity.kt | 14 ++++----------
 3 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/com/github/libretube/helpers/IntentHelper.kt

diff --git a/app/src/main/java/com/github/libretube/helpers/IntentHelper.kt b/app/src/main/java/com/github/libretube/helpers/IntentHelper.kt
new file mode 100644
index 000000000..0c3c3f095
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/helpers/IntentHelper.kt
@@ -0,0 +1,13 @@
+package com.github.libretube.helpers
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+
+object IntentHelper {
+    fun openLinkFromHref(context: Context, link: String) {
+        val uri = Uri.parse(link)
+        val launchIntent = Intent(Intent.ACTION_VIEW).setData(uri)
+        context.startActivity(launchIntent)
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
index 616d241f0..61a80bdd5 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt
@@ -4,7 +4,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import androidx.core.text.HtmlCompat
@@ -16,6 +15,7 @@ import com.github.libretube.constants.PIPED_GITHUB_URL
 import com.github.libretube.constants.WEBLATE_URL
 import com.github.libretube.constants.WEBSITE_URL
 import com.github.libretube.databinding.ActivityAboutBinding
+import com.github.libretube.helpers.IntentHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -65,7 +65,7 @@ class AboutActivity : BaseActivity() {
 
     private fun setupCard(card: MaterialCardView, link: String) {
         card.setOnClickListener {
-            openLinkFromHref(link)
+            IntentHelper.openLinkFromHref(this, link)
         }
         card.setOnLongClickListener {
             onLongClick(link)
@@ -73,12 +73,6 @@ class AboutActivity : BaseActivity() {
         }
     }
 
-    private fun openLinkFromHref(link: String) {
-        val uri = Uri.parse(link)
-        val intent = Intent(Intent.ACTION_VIEW).setData(uri)
-        startActivity(intent)
-    }
-
     private fun onLongClick(href: String) {
         // copy the link to the clipboard
         val clipboard: ClipboardManager =
@@ -92,7 +86,7 @@ class AboutActivity : BaseActivity() {
             Snackbar.LENGTH_LONG
         )
             .setAction(R.string.open_copied) {
-                openLinkFromHref(href)
+                IntentHelper.openLinkFromHref(this, href)
             }
             .setAnimationMode(Snackbar.ANIMATION_MODE_FADE)
             .show()
diff --git a/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
index 01380eec3..bff219596 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
@@ -1,14 +1,14 @@
 package com.github.libretube.ui.activities
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import com.github.libretube.constants.DISCORD_URL
 import com.github.libretube.constants.FAQ_URL
 import com.github.libretube.constants.MASTODON_URL
 import com.github.libretube.constants.MATRIX_URL
+import com.github.libretube.constants.REDDIT_URL
 import com.github.libretube.constants.TELEGRAM_URL
 import com.github.libretube.databinding.ActivityHelpBinding
+import com.github.libretube.helpers.IntentHelper
 import com.github.libretube.ui.base.BaseActivity
 import com.google.android.material.card.MaterialCardView
 
@@ -30,18 +30,12 @@ class HelpActivity : BaseActivity() {
         setupCard(binding.mastodon, MASTODON_URL)
         setupCard(binding.telegram, TELEGRAM_URL)
         setupCard(binding.discord, DISCORD_URL)
-        setupCard(binding.mastodon, MASTODON_URL)
+        setupCard(binding.reddit, REDDIT_URL)
     }
 
     private fun setupCard(card: MaterialCardView, link: String) {
         card.setOnClickListener {
-            openLinkFromHref(link)
+            IntentHelper.openLinkFromHref(this, link)
         }
     }
-
-    private fun openLinkFromHref(link: String) {
-        val uri = Uri.parse(link)
-        val intent = Intent(Intent.ACTION_VIEW).setData(uri)
-        startActivity(intent)
-    }
 }