From 0c0ebded5ad6982ee5672cb5a7f7244e9003424b Mon Sep 17 00:00:00 2001
From: shabinder <dev.shabinder@gmail.com>
Date: Mon, 4 Jan 2021 17:25:13 +0530
Subject: [PATCH] Use of proper logo.

---
 .../com/shabinder/spotiflyer/MainActivity.kt  | 32 -------------
 .../spotiflyer/ui/home/MainScreen.kt          | 43 ++++++++++++++++-
 .../shabinder/spotiflyer/ui/splash/Splash.kt  |  2 +-
 .../main/res/drawable/ic_spotiflyer_logo.xml  | 47 +++++++++++++++++++
 4 files changed, 90 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_spotiflyer_logo.xml

diff --git a/app/src/main/java/com/shabinder/spotiflyer/MainActivity.kt b/app/src/main/java/com/shabinder/spotiflyer/MainActivity.kt
index d48af196..f178b62e 100644
--- a/app/src/main/java/com/shabinder/spotiflyer/MainActivity.kt
+++ b/app/src/main/java/com/shabinder/spotiflyer/MainActivity.kt
@@ -272,38 +272,6 @@ class MainActivity: AppCompatActivity(), PaymentResultListener {
 
 }
 
-@Composable
-fun AppBar(
-    backgroundColor: Color,
-    modifier: Modifier = Modifier
-) {
-    TopAppBar(
-        backgroundColor = backgroundColor,
-        title = {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Image(
-                    imageVector = vectorResource(R.drawable.ic_launcher_foreground)
-                )
-                Text(
-                    text = "SpotiFlyer",
-                    style = appNameStyle
-                )
-            }
-        },
-        /*actions = {
-            Providers(AmbientContentAlpha provides ContentAlpha.medium) {
-                IconButton(
-                    onClick = { *//* TODO: Open Preferences*//* }
-                ) {
-                    Icon(Icons.Filled.Settings, tint = Color.Gray)
-                }
-            }
-        },*/
-        modifier = modifier,
-        elevation = 0.dp
-    )
-}
-
 enum class SplashState { Shown, Completed }
 
 private val splashAlphaKey = FloatPropKey("Splash alpha")
diff --git a/app/src/main/java/com/shabinder/spotiflyer/ui/home/MainScreen.kt b/app/src/main/java/com/shabinder/spotiflyer/ui/home/MainScreen.kt
index c2387cf8..8ba35d86 100644
--- a/app/src/main/java/com/shabinder/spotiflyer/ui/home/MainScreen.kt
+++ b/app/src/main/java/com/shabinder/spotiflyer/ui/home/MainScreen.kt
@@ -16,19 +16,26 @@
 
 package com.shabinder.spotiflyer.ui.home
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.example.jetcaster.util.verticalGradientScrim
-import com.shabinder.spotiflyer.AppBar
 import com.shabinder.spotiflyer.MainActivity
+import com.shabinder.spotiflyer.R
 import com.shabinder.spotiflyer.SharedViewModel
 import com.shabinder.spotiflyer.navigation.ComposeNavigation
+import com.shabinder.spotiflyer.ui.appNameStyle
 import dev.chrisbanes.accompanist.insets.statusBarsHeight
 
 @Composable
@@ -68,3 +75,37 @@ fun MainScreen(
         )
     }
 }
+
+@Composable
+fun AppBar(
+    backgroundColor: Color,
+    modifier: Modifier = Modifier
+) {
+    TopAppBar(
+        backgroundColor = backgroundColor,
+        title = {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Image(
+                    imageVector = vectorResource(R.drawable.ic_spotiflyer_logo),
+                    Modifier.preferredSize(32.dp)
+                )
+                Spacer(Modifier.padding(horizontal = 4.dp))
+                Text(
+                    text = "SpotiFlyer",
+                    style = appNameStyle
+                )
+            }
+        },
+        /*actions = {
+            Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+                IconButton(
+                    onClick = { *//* TODO: Open Preferences*//* }
+                ) {
+                    Icon(Icons.Filled.Settings, tint = Color.Gray)
+                }
+            }
+        },*/
+        modifier = modifier,
+        elevation = 0.dp
+    )
+}
diff --git a/app/src/main/java/com/shabinder/spotiflyer/ui/splash/Splash.kt b/app/src/main/java/com/shabinder/spotiflyer/ui/splash/Splash.kt
index 9304d6c4..99d06f0b 100644
--- a/app/src/main/java/com/shabinder/spotiflyer/ui/splash/Splash.kt
+++ b/app/src/main/java/com/shabinder/spotiflyer/ui/splash/Splash.kt
@@ -49,7 +49,7 @@ fun Splash(modifier: Modifier = Modifier, onTimeout: () -> Unit) {
             delay(SplashWaitTime)
             currentOnTimeout()
         }
-        Image(imageVector = vectorResource(id = R.drawable.ic_launcher_foreground),Modifier.preferredSize(300.dp))
+        Image(imageVector = vectorResource(id = R.drawable.ic_spotiflyer_logo))
         MadeInIndia(Modifier.align(Alignment.BottomCenter))
     }
 }
diff --git a/app/src/main/res/drawable/ic_spotiflyer_logo.xml b/app/src/main/res/drawable/ic_spotiflyer_logo.xml
new file mode 100644
index 00000000..bc68c3c7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_spotiflyer_logo.xml
@@ -0,0 +1,47 @@
+<!--
+  ~ Copyright (c)  2021  Shabinder Singh
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector android:height="150dp" android:viewportHeight="512"
+    android:viewportWidth="512" android:width="150dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:pathData="M256,256m-256,0a256,256 0,1 1,512 0a256,256 0,1 1,-512 0">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="437.019" android:endY="74.981"
+                android:startX="74.981" android:startY="437.019" android:type="linear">
+                <item android:color="#FF736BFD" android:offset="0"/>
+                <item android:color="#FFF54187" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#FF000000" android:pathData="M377,356.7c-68.9,-45.4 -155.6,-56.4 -257.6,-32.7c-20.5,4.8 -13.6,35.8 7.3,31.2C290.7,317 351.6,386 368.2,386C384,386 390.2,365.4 377,356.7z"/>
+    <path android:fillColor="#FF000000" android:pathData="M112.1,275.1C203.9,253.4 308.1,266 384,308c18.5,10.2 34,-17.8 15.5,-28c-82.7,-45.7 -195.6,-59.5 -294.7,-36C84.2,248.8 91.5,280 112.1,275.1L112.1,275.1z"/>
+    <path android:fillColor="#FF000000" android:pathData="M100,191.9c96.6,-29.6 232.2,-13.4 308.7,36.9c17.6,11.5 35.3,-15.1 17.6,-26.7c-84.9,-55.8 -229.2,-73.3 -335.6,-40.8C70.4,167.5 79.9,198.1 100,191.9L100,191.9z"/>
+    <path android:pathData="M507.8,438.2c-1.6,97.2 -141.9,97.1 -143.5,0C365.9,341 506.2,341 507.8,438.2z">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="384.197" android:endY="490.009"
+                android:startX="487.832" android:startY="386.374" android:type="linear">
+                <item android:color="#FF736BFD" android:offset="0"/>
+                <item android:color="#FFF54187" android:offset="1"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#FF000000"
+        android:pathData="M486.8,456.8c-0.6,-2.4 -6.9,-1 -8.5,-1.4c11.5,-82 -82.4,-86.7 -87.1,-22.2c0.3,1.8 -1,6.7 2.2,6.6c0,0 8.6,0 8.6,0c3.1,0.1 2,-4.7 2.2,-6.6c0.1,-23.3 35,-23.3 35.2,0c0,0 0,6.9 0,6.9c-0.1,2.8 4.4,2.8 4.3,0c5,-35.2 -43.8,-40.1 -43.8,-4.7h-4.3c-1.6,-53.7 77.2,-55.9 78.4,-2.2c0,0 0,24.4 0,24.4c-0.1,2.9 3.8,2.1 5.6,2.2l-20.7,21l-20.7,-21c1.8,-0.1 5.6,0.7 5.6,-2.2c0,0 0,-8.8 0,-8.8c0,-2.8 -4.4,-2.8 -4.3,0c0,0 0,6.6 0,6.6c-2.2,0.2 -11.3,-1.3 -8,3.7c0,0 25.9,26.3 25.9,26.3c0.8,0.9 2.2,0.9 3.1,0C460.6,484.4 489.4,458.3 486.8,456.8z"
+        android:strokeColor="#000" android:strokeWidth=".75"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M510,437.5c-1.7,96.2 -142.1,96.2 -143.8,0C367.9,341.3 508.4,341.3 510,437.5z"
+        android:strokeColor="#000" android:strokeWidth="6"/>
+</vector>