From cc837bc6f509148045c57f1a3e79f154af308384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Font=C3=A1n?= <gabilessto@gmail.com>
Date: Sat, 15 Jul 2023 18:40:38 +0200
Subject: [PATCH] - Added more spotDL dependencies and added largeHeap property
 to the app - Disabled spotDL updates

---
 .idea/compiler.xml                            |  6 +-
 app/build.gradle.kts                          |  2 +-
 app/src/main/AndroidManifest.xml              |  4 +-
 .../spowlo/ui/components/WarningCard.kt       | 66 +++++++++++++++++++
 .../bobbyesp/spowlo/ui/pages/InitialEntry.kt  | 32 ++++-----
 .../settings/general/GeneralSettingsPage.kt   | 33 ++++------
 app/src/main/res/values/strings.xml           |  2 +
 gradle/libs.versions.toml                     |  2 +-
 8 files changed, 103 insertions(+), 44 deletions(-)
 create mode 100644 app/src/main/java/com/bobbyesp/spowlo/ui/components/WarningCard.kt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4faf3c41..05c2d10d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8">
+    <bytecodeTargetLevel target="17">
       <module name="Spowlo.appModules.auth" target="17" />
       <module name="Spowlo.appModules.core" target="17" />
       <module name="Spowlo.appModules.hub" target="17" />
+      <module name="Spowlo.ffmpeg" target="17" />
+      <module name="Spowlo.miniplayer_service" target="17" />
+      <module name="Spowlo.spotdl-android" target="17" />
+      <module name="Spowlo.spotdl_utilities" target="17" />
       <module name="Spowlo.uisdk" target="17" />
     </bytecodeTargetLevel>
   </component>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d18e2c2a..9759b8f0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -44,7 +44,7 @@ sealed class Version(
 val currentVersion: Version = Version.Stable(
     versionMajor = 1,
     versionMinor = 3,
-    versionPatch = 1,
+    versionPatch = 3,
 )
 
 val keystorePropertiesFile = rootProject.file("keystore.properties")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95ba6492..73f86e48 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,8 +37,8 @@
         android:localeConfig="@xml/locales_config"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        tools:targetApi="tiramisu">
-        <!--        android:largeHeap="true" -->
+        tools:targetApi="tiramisu"
+        android:largeHeap="true">
 
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/com/bobbyesp/spowlo/ui/components/WarningCard.kt b/app/src/main/java/com/bobbyesp/spowlo/ui/components/WarningCard.kt
new file mode 100644
index 00000000..b3fb599e
--- /dev/null
+++ b/app/src/main/java/com/bobbyesp/spowlo/ui/components/WarningCard.kt
@@ -0,0 +1,66 @@
+package com.bobbyesp.spowlo.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.WarningAmber
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedCard
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun WarningCard(
+    modifier: Modifier = Modifier,
+    title: String,
+    warningText : String,
+) {
+    OutlinedCard(
+        modifier = modifier,
+        shape = MaterialTheme.shapes.small,
+        colors = CardDefaults.outlinedCardColors(
+            containerColor = MaterialTheme.colorScheme.primaryContainer,
+        )
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                modifier = Modifier.weight(0.175f),
+                imageVector = Icons.Default.WarningAmber,
+                tint = MaterialTheme.colorScheme.onPrimaryContainer,
+                contentDescription = "Warning icon"
+            )
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(6.dp)
+                    .weight(1f),
+            ) {
+                Text(
+                    text = title,
+                    style = MaterialTheme.typography.bodyLarge,
+                    fontWeight = FontWeight.Bold
+                )
+                Text(
+                    text = warningText,
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.6f),
+                    fontWeight = FontWeight.Normal,
+                    textAlign = TextAlign.Justify
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bobbyesp/spowlo/ui/pages/InitialEntry.kt b/app/src/main/java/com/bobbyesp/spowlo/ui/pages/InitialEntry.kt
index b61768ec..3be5de5a 100644
--- a/app/src/main/java/com/bobbyesp/spowlo/ui/pages/InitialEntry.kt
+++ b/app/src/main/java/com/bobbyesp/spowlo/ui/pages/InitialEntry.kt
@@ -55,7 +55,6 @@ import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
 import androidx.navigation.navOptions
 import androidx.navigation.navigation
-import com.bobbyesp.library.SpotDL
 import com.bobbyesp.spowlo.App
 import com.bobbyesp.spowlo.MainActivity
 import com.bobbyesp.spowlo.R
@@ -100,8 +99,6 @@ import com.bobbyesp.spowlo.ui.pages.settings.general.GeneralSettingsPage
 import com.bobbyesp.spowlo.ui.pages.settings.spotify.SpotifySettingsPage
 import com.bobbyesp.spowlo.ui.pages.settings.updater.UpdaterPage
 import com.bobbyesp.spowlo.utils.PreferencesUtil
-import com.bobbyesp.spowlo.utils.PreferencesUtil.getString
-import com.bobbyesp.spowlo.utils.SPOTDL
 import com.bobbyesp.spowlo.utils.ToastUtil
 import com.bobbyesp.spowlo.utils.UpdateUtil
 import com.google.accompanist.navigation.animation.AnimatedNavHost
@@ -116,7 +113,6 @@ import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 private const val TAG = "InitialEntry"
 
@@ -623,20 +619,20 @@ fun InitialEntry(
             }
     }
 
-    LaunchedEffect(Unit) {
-        if (SPOTDL.getString().isNotEmpty()) return@LaunchedEffect
-        kotlin.runCatching {
-            withContext(Dispatchers.IO) {
-                val result = UpdateUtil.updateSpotDL()
-                if (result == SpotDL.UpdateStatus.DONE) {
-                    ToastUtil.makeToastSuspend(
-                        App.context.getString(R.string.spotdl_update_success)
-                            .format(SPOTDL.getString())
-                    )
-                }
-            }
-        }
-    }
+//    LaunchedEffect(Unit) {
+//        if (SPOTDL.getString().isNotEmpty()) return@LaunchedEffect
+//        kotlin.runCatching {
+//            withContext(Dispatchers.IO) {
+//                val result = UpdateUtil.updateSpotDL()
+//                if (result == SpotDL.UpdateStatus.DONE) {
+//                    ToastUtil.makeToastSuspend(
+//                        App.context.getString(R.string.spotdl_update_success)
+//                            .format(SPOTDL.getString())
+//                    )
+//                }
+//            }
+//        }
+//    }
 
     if (showUpdateDialog) {
         UpdaterBottomDrawer(latestRelease = latestRelease)
diff --git a/app/src/main/java/com/bobbyesp/spowlo/ui/pages/settings/general/GeneralSettingsPage.kt b/app/src/main/java/com/bobbyesp/spowlo/ui/pages/settings/general/GeneralSettingsPage.kt
index 9ddeb389..d96c93ec 100644
--- a/app/src/main/java/com/bobbyesp/spowlo/ui/pages/settings/general/GeneralSettingsPage.kt
+++ b/app/src/main/java/com/bobbyesp/spowlo/ui/pages/settings/general/GeneralSettingsPage.kt
@@ -38,6 +38,7 @@ import com.bobbyesp.spowlo.ui.common.booleanState
 import com.bobbyesp.spowlo.ui.components.BackButton
 import com.bobbyesp.spowlo.ui.components.LargeTopAppBar
 import com.bobbyesp.spowlo.ui.components.PreferenceSubtitle
+import com.bobbyesp.spowlo.ui.components.WarningCard
 import com.bobbyesp.spowlo.ui.components.settings.ElevatedSettingsCard
 import com.bobbyesp.spowlo.ui.components.settings.SettingsItemNew
 import com.bobbyesp.spowlo.ui.components.settings.SettingsSwitch
@@ -46,10 +47,6 @@ import com.bobbyesp.spowlo.utils.CONFIGURE
 import com.bobbyesp.spowlo.utils.DEBUG
 import com.bobbyesp.spowlo.utils.NOTIFICATION
 import com.bobbyesp.spowlo.utils.PreferencesUtil
-import com.bobbyesp.spowlo.utils.PreferencesUtil.getString
-import com.bobbyesp.spowlo.utils.SPOTDL
-import com.bobbyesp.spowlo.utils.ToastUtil
-import com.bobbyesp.spowlo.utils.UpdateUtil
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -126,25 +123,18 @@ fun GeneralSettingsPage(
                     .padding(it)
                     .padding(horizontal = 20.dp, vertical = 10.dp)
             ) {
+                item {
+                    WarningCard(
+                        modifier = Modifier.padding(vertical = 10.dp),
+                        title = stringResource(id = R.string.updates_blocked),
+                        warningText = stringResource(
+                            id = R.string.updates_blocked_description
+                        )
+                    )
+                }
                 item {
                     ElevatedSettingsCard {
                         SettingsItemNew(
-                            onClick = {
-                                scope.launch {
-                                    runCatching {
-                                        isUpdatingLib = true
-                                        UpdateUtil.updateSpotDL()
-                                        spotDLVersion = SPOTDL.getString()
-                                    }.onFailure {
-                                        ToastUtil.makeToastSuspend(App.context.getString(R.string.spotdl_update_failed))
-                                    }.onSuccess {
-                                        ToastUtil.makeToastSuspend(
-                                            App.context.getString(R.string.spotdl_update_success)
-                                                .format(spotDLVersion)
-                                        )
-                                    }
-                                }
-                            },
                             title = {
                                 Text(
                                     text = stringResource(id = R.string.spotdl_version),
@@ -152,7 +142,8 @@ fun GeneralSettingsPage(
                                 )
                             },
                             icon = Icons.Outlined.Info,
-                            description = { Text(text = spotDLVersion) })
+                            description = { Text(text = spotDLVersion) }
+                        )
 
                         SettingsSwitch(
                             onCheckedChange = {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e628103..ea268d24 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -327,4 +327,6 @@
     <string name="metadata_viewer">Metadata viewer</string>
     <string name="albums">Albums</string>
     <string name="see_album">See album</string>
+    <string name="updates_blocked">SpotDL updates blocked</string>
+    <string name="updates_blocked_description">We have blocked the SpotDL updates. This is because we can be focused on the next version of Spowlo, the 2.0.0 (will come with big changes)!</string>
 </resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5765d895..2fbce925 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ androidxHiltNavigationCompose = "1.0.0"
 
 androidxTestExt = "1.1.5"
 
-spotdlAndroidVersion = "0.1.10"
+spotdlAndroidVersion = "4e49ca9ba5"
 spotifyApiKotlinVersion = "3.8.8"
 
 shimmerLibrary = "1.0.4"