6.5.0

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.5.0
+- Updated Translations
+- Added new Card Style - Brat
+- Improved existing card styles
+- Removed underused customization options
+- Miscellaneous UI fixes
+
 ## 6.4.2
 - Updated Translations
 - Performance improvements

androidApp/build.gradle.kts

@@ -23,8 +23,8 @@ plugins {
 }
 
 val appName = "Rush"
-val appVersionName = "6.4.2"
-val appVersionCode = 6420
+val appVersionName = "6.5.0"
+val appVersionCode = 6500
 
 val gitHash = execute("git", "rev-parse", "HEAD").take(7)
 

androidApp/src/foss/java/com/shub39/rush/billing/BillingHandlerImpl.kt

@@ -20,7 +20,7 @@ import com.shub39.rush.shared.core.interfaces.BillingHandler
 import com.shub39.rush.shared.core.interfaces.SubscriptionResult
 
 class BillingHandlerImpl : BillingHandler {
-    override suspend fun isProUser(): Boolean = true
+    override suspend fun isProUser(): Boolean = false
 
-    override suspend fun userResult(): SubscriptionResult = SubscriptionResult.Subscribed
+    override suspend fun userResult(): SubscriptionResult = SubscriptionResult.NotSubscribed
 }

androidApp/src/main/java/com/shub39/rush/app/App.kt

@@ -119,8 +119,6 @@ fun App() {
                                 },
                                 state = shareState,
                                 onAction = shareVM::onAction,
-                                isProUser = globalState.isProUser,
-                                onShowPaywall = { backStack.add(Routes.PaywallPage) },
                             )
                         }
 
@@ -135,7 +133,6 @@ fun App() {
                                 onNavigateBack = {
                                     if (backStack.size != 1) backStack.removeLastOrNull()
                                 },
-                                isProUser = globalState.isProUser,
                                 onShowPaywall = { backStack.add(Routes.PaywallPage) },
                                 onUpdateNotificationAccess = {
                                     globalVM.onAction(GlobalAction.OnCheckNotificationAccess)

desktopApp/src/commonMain/kotlin/com/shub39/rush/app/App.kt

@@ -111,8 +111,6 @@ fun App() {
                             onDismiss = { if (backStack.size != 1) backStack.removeLastOrNull() },
                             state = shareState,
                             onAction = shareVM::onAction,
-                            isProUser = globalState.isProUser,
-                            onShowPaywall = {},
                         )
                     }
 
@@ -127,7 +125,6 @@ fun App() {
                             onNavigateBack = {
                                 if (backStack.size != 1) backStack.removeLastOrNull()
                             },
-                            isProUser = globalState.isProUser,
                             onShowPaywall = {},
                             onUpdateNotificationAccess = {
                                 globalVM.onAction(GlobalAction.OnCheckNotificationAccess)

gradle/libs.versions.toml

@@ -5,7 +5,8 @@ targetSdk = "37"
 compileSdk = "37"
 accompanist = "0.37.3"
 colorpicker = "1.2.0"
-compose-multiplatform = "1.12.0-alpha02"
+compose-multiplatform = "1.12.0-beta02"
+material3 = "1.12.0-alpha03"
 filekit = "0.14.2"
 materialkolor = "4.1.1"
 splashscreen = "1.2.0"
@@ -14,32 +15,32 @@ datastore = "1.2.1"
 koin = "4.2.2"
 koin-plugin = "1.0.1"
 ksoup = "0.2.6"
-ktor = "3.5.0"
+ktor = "3.5.1"
 kotlin = "2.4.0"
 ksp = "2.3.9"
-landscapist = "2.10.0"
+landscapist = "2.11.0"
 activity-compose = "1.13.0"
 navigation = "1.1.1"
 kmpalette = "3.1.0"
-room3 = "3.0.0-rc01"
+room3 = "3.0.0"
 serialization = "1.11.0"
 androidx-lifecycle = "2.10.0"
-zoomable = "2.12.0"
+zoomable = "2.13.0"
 coroutines = "1.11.0"
-purchases = "10.10.0"
+purchases = "10.13.0"
 junit = "4.13.2"
 junit-version = "1.3.0"
-spotless = "8.7.0"
+spotless = "8.8.0"
 ktfmt = "0.61"
 build-config = "6.0.10"
-sqlite = "2.6.2"
+sqlite = "2.7.0"
 nucleus = "1.15.7"
 
 [libraries]
 # CMP
 compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose-multiplatform" }
 compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-multiplatform" }
-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose-multiplatform" }
+compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" }
 compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-multiplatform" }
 compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose-multiplatform" }
 compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "compose-multiplatform" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

shared/core/src/commonMain/kotlin/com/shub39/rush/shared/core/Util.kt

@@ -16,6 +16,12 @@
  */
 package com.shub39.rush.shared.core
 
+import kotlin.enums.enumEntries
+
+inline fun <reified T : Enum<T>> valueOfOrNull(name: String): T? {
+    return enumEntries<T>().firstOrNull { it.name == name }
+}
+
 private val titleCleanupPatterns =
     listOf(
         Regex(

shared/core/src/commonMain/kotlin/com/shub39/rush/shared/core/enums/AlbumArtShape.kt

@@ -37,5 +37,5 @@ enum class AlbumArtShape {
     SOFT_BURST,
     PUFFY_DIAMOND,
     BUN,
-    HEART,
+    RECTANGLE,
 }

shared/core/src/commonMain/kotlin/com/shub39/rush/shared/core/enums/CardTheme.kt

@@ -25,5 +25,5 @@ enum class CardTheme {
     HYPNOTIC,
     QUOTE,
     MESSY,
-    CHAT,
+    BRAT,
 }

shared/core/src/commonMain/kotlin/com/shub39/rush/shared/core/interfaces/SharePagePreferences.kt

@@ -18,17 +18,11 @@ package com.shub39.rush.shared.core.interfaces
 
 import com.shub39.rush.shared.core.enums.AlbumArtShape
 import com.shub39.rush.shared.core.enums.CardColors
-import com.shub39.rush.shared.core.enums.CardFit
 import com.shub39.rush.shared.core.enums.CardTheme
 import com.shub39.rush.shared.core.enums.CornerRadius
-import com.shub39.rush.shared.core.enums.Fonts
 import kotlinx.coroutines.flow.Flow
 
 interface SharePagePreferences {
-    fun getCardFitFlow(): Flow<CardFit>
-
-    suspend fun updateCardFit(newCardFit: CardFit)
-
     fun getCardBackgroundFlow(): Flow<Int>
 
     suspend fun updateCardBackground(newCardBackground: Int)
@@ -49,18 +43,10 @@ interface SharePagePreferences {
 
     suspend fun updateCardRoundness(newCardRoundness: CornerRadius)
 
-    fun getCardFontFlow(): Flow<Fonts>
-
-    suspend fun updateCardFont(newCardFont: Fonts)
-
     fun getAlbumArtShapeFlow(): Flow<AlbumArtShape>
 
     suspend fun updateAlbumArtShape(shape: AlbumArtShape)
 
-    fun showRushBranding(): Flow<Boolean>
-
-    suspend fun updateRushBranding(newPref: Boolean)
-
     fun getFullscreenShare(): Flow<Boolean>
 
     suspend fun updateFullscreenShare(newPref: Boolean)

shared/logic/src/commonMain/composeResources/files/changelog.json

@@ -1,4 +1,14 @@
 [
+  {
+    "version": "6.5.0",
+    "changes": [
+      "Updated Translations",
+      "Added new Card Style - Brat",
+      "Improved existing card styles",
+      "Removed underused customization options",
+      "Miscellaneous UI fixes"
+    ]
+  },
   {
     "version": "6.4.2",
     "changes": [
@@ -64,12 +74,5 @@
     "changes": [
       "Fixed UI bug in share cards"
     ]
-  },
-  {
-    "version": "6.2.0",
-    "changes": [
-      "Fixed Expressive Syllables causing crashes",
-      "Fixed UI inconsistencies"
-    ]
   }
 ]

shared/logic/src/commonMain/kotlin/com/shub39/rush/shared/logic/datastore/LyricsPagePreferencesImpl.kt

@@ -25,11 +25,11 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.floatPreferencesKey
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
-import com.shub39.rush.shared.core.RushLogger
 import com.shub39.rush.shared.core.enums.CardColors
 import com.shub39.rush.shared.core.enums.LyricsAlignment
 import com.shub39.rush.shared.core.enums.LyricsBackground
 import com.shub39.rush.shared.core.interfaces.LyricsPagePreferences
+import com.shub39.rush.shared.core.valueOfOrNull
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
@@ -67,7 +67,8 @@ class LyricsPagePreferencesImpl(private val dataStore: DataStore<Preferences>) :
 
     override fun getLyricsBackgroundFlow(): Flow<LyricsBackground> =
         dataStore.data.map {
-            LyricsBackground.valueOf(it[lyricsBackground] ?: LyricsBackground.SOLID_COLOR.name)
+            valueOfOrNull(it[lyricsBackground] ?: LyricsBackground.SOLID_COLOR.name)
+                ?: LyricsBackground.SOLID_COLOR
         }
 
     override suspend fun updateLyricsBackground(background: LyricsBackground) {
@@ -109,7 +110,7 @@ class LyricsPagePreferencesImpl(private val dataStore: DataStore<Preferences>) :
 
     override fun getLyricsColorFlow(): Flow<CardColors> =
         dataStore.data.map { preferences ->
-            CardColors.valueOf(preferences[lyricsColor] ?: CardColors.MUTED.name)
+            valueOfOrNull(preferences[lyricsColor] ?: CardColors.MUTED.name) ?: CardColors.MUTED
         }
 
     override suspend fun updateLyricsColor(new: CardColors) {
@@ -139,16 +140,8 @@ class LyricsPagePreferencesImpl(private val dataStore: DataStore<Preferences>) :
 
     override fun getLyricAlignmentFlow(): Flow<LyricsAlignment> =
         dataStore.data.map { prefs ->
-            try {
-                val alignment = prefs[lyricAlignment] ?: LyricsAlignment.START.toString()
-                LyricsAlignment.entries.find { it.toString() == alignment } ?: LyricsAlignment.START
-            } catch (e: Exception) {
-                RushLogger.e(
-                    "LyricsPagePreferencesImpl",
-                    "Error getting lyric alignment: ${e.message}",
-                )
-                LyricsAlignment.START
-            }
+            val alignment = prefs[lyricAlignment] ?: LyricsAlignment.START.name
+            valueOfOrNull<LyricsAlignment>(alignment) ?: LyricsAlignment.START
         }
 
     override suspend fun updateLyricAlignment(alignment: LyricsAlignment) {