Improving Share card pt 2

shub39 · Aug 17, 2024 · ae3ea03 · ae3ea03
1 parent cc8db97
commit ae3ea03
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 19 deletions.
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
diff --git a/app/src/main/java/com/shub39/rush/page/SharePage.kt b/app/src/main/java/com/shub39/rush/page/SharePage.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -209,11 +210,21 @@ fun SharePage(
                                         text = it.value,
                                         style = MaterialTheme.typography.bodyLarge,
                                         fontWeight = FontWeight.Bold,
-                                        modifier = Modifier.padding(bottom = 8.dp)
+                                        modifier = Modifier.padding(bottom = 10.dp)
                                     )
                                 }
                             }
                         }
+
+                        Spacer(modifier = Modifier.padding(8.dp))
+
+                        AnimatedVisibility (logo == "Spotify") {
+                            Icon(
+                                painter = painterResource(id = R.drawable.spotify_logo_with_text),
+                                contentDescription = null,
+                                modifier = Modifier.width(100.dp)
+                            )
+                        }
                     }
                 }
 
@@ -273,22 +284,25 @@ fun SharePage(
                         )
                     }
 
-//                    Spacer(modifier = Modifier.padding(4.dp))
-//
-//                    FloatingActionButton(
-//                        onClick = {
-//                            coroutineScope.launch {
-//                                when (logo) {
-//                                    "Spotify" -> SettingsDataStore.updateLogo(context, "None")
-//                                    else -> SettingsDataStore.updateLogo(context, "Spotify")
-//                                }
-//                            }
-//                        },
-//                        containerColor = if (logo == "Spotify") MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.surface,
-//                        shape = MaterialTheme.shapes.extraLarge
-//                    ) {
-//
-//                    }
+                    Spacer(modifier = Modifier.padding(4.dp))
+
+                    FloatingActionButton(
+                        onClick = {
+                            coroutineScope.launch {
+                                when (logo) {
+                                    "Spotify" -> SettingsDataStore.updateLogo(context, "None")
+                                    else -> SettingsDataStore.updateLogo(context, "Spotify")
+                                }
+                            }
+                        },
+                        containerColor = if (logo == "Spotify") MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.primaryContainer,
+                        shape = MaterialTheme.shapes.extraLarge
+                    ) {
+                        Icon(
+                            painter = painterResource(id = R.drawable.spotify_logo_svgrepo_com),
+                            contentDescription = null
+                        )
+                    }
 
                     Spacer(modifier = Modifier.padding(4.dp))
 

diff --git a/app/src/main/res/drawable/spotify_logo_svgrepo_com.xml b/app/src/main/res/drawable/spotify_logo_svgrepo_com.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="200dp"
+    android:width="30dp"
+    android:height="30dp"
     android:viewportWidth="186.85"
     android:viewportHeight="186.85">
   <path