Fixed app crashing

BobbyESP · Dec 3, 2022 · 8d56cd2 · 8d56cd2
1 parent ac559f9
commit 8d56cd2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,7 +14,7 @@ apply(plugin = "dagger.hilt.android.plugin")
 
 val versionMajor = 0
 val versionMinor = 1
-val versionPatch = 0
+val versionPatch = 1
 val versionBuild = 0
 val isStable = true
 
@@ -87,7 +87,7 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = true
-            isShrinkResources = true
+            isShrinkResources = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -127,7 +127,7 @@ android {
     applicationVariants.all {
         outputs.all {
             (this as com.android.build.gradle.internal.api.BaseVariantOutputImpl).outputFileName =
-                "Spowlo-${defaultConfig.versionName}-${name}.apk"
+                "Jetispot-${defaultConfig.versionName}-${name}.apk"
         }
     }
 

diff --git a/app/src/main/java/bruhcollective/itaysonlab/jetispot/ui/blocks/TwoColumnAndImageBlock.kt b/app/src/main/java/bruhcollective/itaysonlab/jetispot/ui/blocks/TwoColumnAndImageBlock.kt
@@ -20,28 +20,38 @@ fun TwoColumnAndImageBlock(
     text: String,
     modifier: Modifier = Modifier
 ) {
+
     Row(
         modifier
             .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 12.dp)) {
-        PreviewableAsyncImage(
-            imageUrl = remember(artworkUri) {
-                artworkUri?.let {
-                    "https://i.scdn.co/image/" + ImageId.fromUri(
-                        if (artworkUri.startsWith(
-                                "spotify:mosaic"
-                            )
-                        ) "spotify:image:ab67706c0000bebb8d0ce13d55f634e290f744ba" else it
-                    ).hexId()
-                }
-            }, placeholderType = "track", modifier = Modifier
-                .size(48.dp)
-        )
+            .padding(horizontal = 16.dp, vertical = 12.dp)
+    ) {
+        if (artworkUri!!.startsWith("spotify:image")) {
+            val imageId = remember { artworkUri }
+            PreviewableAsyncImage(
+                imageUrl = remember(artworkUri) {
+                    artworkUri.let {
+                        "https://i.scdn.co/image/" + ImageId.fromUri(
+                            imageId
+                        ).hexId()
+                    }
+                }, placeholderType = "track", modifier = Modifier
+                    .size(48.dp)
+            )
+        } else {
+            PreviewableAsyncImage(
+                imageUrl = artworkUri,
+                modifier = Modifier
+                    .size(48.dp),
+                placeholderType = "track"
+            )
+        }
 
         Column(
             Modifier
                 .padding(horizontal = 12.dp)
-                .align(Alignment.CenterVertically)) {
+                .align(Alignment.CenterVertically)
+        ) {
             MediumText(title, fontWeight = FontWeight.Normal, fontSize = 18.sp)
             Spacer(Modifier.height(4.dp))
             Subtext(text, modifier = Modifier, maxLines = 1)

diff --git a/app/src/main/java/bruhcollective/itaysonlab/jetispot/ui/screens/hub/HubScreen.kt b/app/src/main/java/bruhcollective/itaysonlab/jetispot/ui/screens/hub/HubScreen.kt
@@ -49,7 +49,7 @@ fun HubScreen(
 
   LaunchedEffect(Unit) {
     viewModel.load(onAppBarTitleChange, loader)
-      launch(Dispatchers.IO) {
+      /*launch(Dispatchers.IO) {
         kotlin.runCatching {
           val temp = UpdateUtil.checkForUpdate()
           if (temp != null) {
@@ -59,7 +59,7 @@ fun HubScreen(
         }.onFailure {
           it.printStackTrace()
         }
-      }
+      }*/
   }
 
   if(showUpdateDialog) {