From 77f04ea0c3a5247f41c8460c6a73eebe6229d529 Mon Sep 17 00:00:00 2001
From: Stefano Sansone <stefanosansone.dev@gmail.com>
Date: Fri, 23 Feb 2024 00:40:45 +0000
Subject: [PATCH] add social icons

---
 .../app/omnivore/omnivore/core/ui/LinkIcon.kt | 33 +++++++++++++++
 .../omnivore/feature/settings/LogoHeader.kt   |  4 +-
 .../feature/settings/about/AboutScreen.kt     | 41 +++++++++++++++++++
 .../app/src/main/res/drawable/ic_discord.xml  |  9 ++++
 .../app/src/main/res/drawable/ic_github.xml   | 10 +++++
 .../app/src/main/res/drawable/ic_omnivore.xml |  4 +-
 .../app/src/main/res/drawable/ic_x.xml        |  9 ++++
 .../app/src/main/res/values/strings.xml       |  1 +
 8 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 android/Omnivore/app/src/main/java/app/omnivore/omnivore/core/ui/LinkIcon.kt
 create mode 100644 android/Omnivore/app/src/main/res/drawable/ic_discord.xml
 create mode 100644 android/Omnivore/app/src/main/res/drawable/ic_github.xml
 create mode 100644 android/Omnivore/app/src/main/res/drawable/ic_x.xml

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/core/ui/LinkIcon.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/core/ui/LinkIcon.kt
new file mode 100644
index 000000000..79e6f83fa
--- /dev/null
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/core/ui/LinkIcon.kt
@@ -0,0 +1,33 @@
+package app.omnivore.omnivore.core.ui
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun LinkIcon(
+    label: String,
+    icon: ImageVector,
+    url: String,
+    modifier: Modifier = Modifier,
+) {
+    val uriHandler = LocalUriHandler.current
+    IconButton(
+        modifier = modifier.padding(4.dp),
+        onClick = { uriHandler.openUri(url) },
+    ) {
+        Icon(
+            imageVector = icon,
+            contentDescription = label,
+            modifier = Modifier.size(24.dp),
+            tint = MaterialTheme.colorScheme.onSurface
+        )
+    }
+}
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/LogoHeader.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/LogoHeader.kt
index e32491e03..9fc95df41 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/LogoHeader.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/LogoHeader.kt
@@ -25,8 +25,8 @@ fun LogoHeader() {
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onSurface,
             modifier = Modifier
-                .padding(vertical = 56.dp)
-                .size(64.dp),
+                .padding(vertical = 32.dp)
+                .size(128.dp),
         )
 
         HorizontalDivider()
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/about/AboutScreen.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/about/AboutScreen.kt
index 9e0b1220c..984c62301 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/about/AboutScreen.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/settings/about/AboutScreen.kt
@@ -1,8 +1,13 @@
 package app.omnivore.omnivore.feature.settings.about
 
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material.icons.outlined.Public
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -12,11 +17,16 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import app.omnivore.omnivore.BuildConfig
 import app.omnivore.omnivore.R
+import app.omnivore.omnivore.core.ui.LinkIcon
 import app.omnivore.omnivore.feature.settings.LogoHeader
 import app.omnivore.omnivore.feature.settings.RELEASE_URL
 import app.omnivore.omnivore.feature.settings.SettingRow
@@ -95,6 +105,37 @@ internal fun AboutScreen(
                     navController.navigate(Routes.TermsAndConditions.route)
                 }
             }
+
+            item {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 8.dp),
+                    horizontalArrangement = Arrangement.Center,
+                ) {
+                    LinkIcon(
+                        label = stringResource(R.string.website),
+                        icon = Icons.Outlined.Public,
+                        url = "https://omnivore.app",
+                    )
+                    LinkIcon(
+                        label = "Discord",
+                        icon = ImageVector.vectorResource(R.drawable.ic_discord),
+                        url = "https://discord.gg/h2z5rppzz9",
+                    )
+                    LinkIcon(
+                        label = "X",
+                        icon = ImageVector.vectorResource(R.drawable.ic_x),
+                        url = "https://x.com/omnivoreapp",
+                    )
+
+                    LinkIcon(
+                        label = "GitHub",
+                        icon = ImageVector.vectorResource(R.drawable.ic_github),
+                        url = "https://github.com/omnivore-app",
+                    )
+                }
+            }
         }
     }
 }
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_discord.xml b/android/Omnivore/app/src/main/res/drawable/ic_discord.xml
new file mode 100644
index 000000000..bdec4191f
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable/ic_discord.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="127.14dp"
+    android:height="96.36dp"
+    android:viewportWidth="127.14"
+    android:viewportHeight="96.36">
+  <path
+      android:pathData="M107.7,8.07A105.15,105.15 0,0 0,81.47 0a72.06,72.06 0,0 0,-3.36 6.83A97.68,97.68 0,0 0,49 6.83,72.37 72.37,0 0,0 45.64,0 105.89,105.89 0,0 0,19.39 8.09C2.79,32.65 -1.71,56.6 0.54,80.21h0A105.73,105.73 0,0 0,32.71 96.36,77.7 77.7,0 0,0 39.6,85.25a68.42,68.42 0,0 1,-10.85 -5.18c0.91,-0.66 1.8,-1.34 2.66,-2a75.57,75.57 0,0 0,64.32 0c0.87,0.71 1.76,1.39 2.66,2a68.68,68.68 0,0 1,-10.87 5.19,77 77,0 0,0 6.89,11.1A105.25,105.25 0,0 0,126.6 80.22h0C129.24,52.84 122.09,29.11 107.7,8.07ZM42.45,65.69C36.18,65.69 31,60 31,53s5,-12.74 11.43,-12.74S54,46 53.89,53 48.84,65.69 42.45,65.69ZM84.69,65.69C78.41,65.69 73.25,60 73.25,53s5,-12.74 11.44,-12.74S96.23,46 96.12,53 91.08,65.69 84.69,65.69Z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_github.xml b/android/Omnivore/app/src/main/res/drawable/ic_github.xml
new file mode 100644
index 000000000..34241eaa3
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable/ic_github.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="98dp"
+    android:height="96dp"
+    android:viewportWidth="98"
+    android:viewportHeight="96">
+  <path
+      android:pathData="M48.854,0C21.839,0 0,22 0,49.217c0,21.756 13.993,40.172 33.405,46.69 2.427,0.49 3.316,-1.059 3.316,-2.362 0,-1.141 -0.08,-5.052 -0.08,-9.127 -13.59,2.934 -16.42,-5.867 -16.42,-5.867 -2.184,-5.704 -5.42,-7.17 -5.42,-7.17 -4.448,-3.015 0.324,-3.015 0.324,-3.015 4.934,0.326 7.523,5.052 7.523,5.052 4.367,7.496 11.404,5.378 14.235,4.074 0.404,-3.178 1.699,-5.378 3.074,-6.6 -10.839,-1.141 -22.243,-5.378 -22.243,-24.283 0,-5.378 1.94,-9.778 5.014,-13.2 -0.485,-1.222 -2.184,-6.275 0.486,-13.038 0,0 4.125,-1.304 13.426,5.052a46.97,46.97 0,0 1,12.214 -1.63c4.125,0 8.33,0.571 12.213,1.63 9.302,-6.356 13.427,-5.052 13.427,-5.052 2.67,6.763 0.97,11.816 0.485,13.038 3.155,3.422 5.015,7.822 5.015,13.2 0,18.905 -11.404,23.06 -22.324,24.283 1.78,1.548 3.316,4.481 3.316,9.126 0,6.6 -0.08,11.897 -0.08,13.526 0,1.304 0.89,2.853 3.316,2.364 19.412,-6.52 33.405,-24.935 33.405,-46.691C97.707,22 75.788,0 48.854,0z"
+      android:fillColor="#24292f"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_omnivore.xml b/android/Omnivore/app/src/main/res/drawable/ic_omnivore.xml
index 8608e8300..ecaad383b 100644
--- a/android/Omnivore/app/src/main/res/drawable/ic_omnivore.xml
+++ b/android/Omnivore/app/src/main/res/drawable/ic_omnivore.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:width="108dp"
-    android:height="108dp"
+    android:width="256dp"
+    android:height="256dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_x.xml b/android/Omnivore/app/src/main/res/drawable/ic_x.xml
new file mode 100644
index 000000000..9177522c5
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable/ic_x.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1200dp"
+    android:height="1227dp"
+    android:viewportWidth="1200"
+    android:viewportHeight="1227">
+  <path
+      android:pathData="M714.2,519.3L1160.9,0H1055L667.1,450.9L357.3,0H0L468.5,681.8L0,1226.4H105.9L515.5,750.2L842.7,1226.4H1200L714.1,519.3H714.2ZM569.2,687.8L521.7,619.9L144,79.7H306.6L611.4,515.7L658.9,583.6L1055.1,1150.3H892.5L569.2,687.9V687.8Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/android/Omnivore/app/src/main/res/values/strings.xml b/android/Omnivore/app/src/main/res/values/strings.xml
index d737b53fd..451b66fa4 100644
--- a/android/Omnivore/app/src/main/res/values/strings.xml
+++ b/android/Omnivore/app/src/main/res/values/strings.xml
@@ -216,6 +216,7 @@
     <string name="about_view_title">About</string>
     <string name="about_view_row_version">Version</string>
     <string name="about_view_row_whats_new">What\'s new</string>
+    <string name="website">Website</string>
 
     <!-- stock filters -->
     <string name="library_filter_inbox">Inbox</string>