[release] ⬆️ 5.7.2

shub39 · web-flow · commit 4529d6e8c4cb · 2026-03-26T09:15:55.000+05:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 5.7.2
+- Fixed Material Theme not Working #230
+
 ## 5.7.1
 - Fixed auto lyrics fetching issues
 - Fixed miscellaneous song sync bugs
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,11 +22,12 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.room)
+    alias(libs.plugins.koin.compiler)
 }
 
 val appName = "Rush"
-val appVersionName = "5.7.1"
-val appVersionCode = 5710
+val appVersionName = "5.7.2"
+val appVersionCode = 5720
 
 val publicGeniusApiToken = "\"qLSDtgIqHgzGNjOFUmdOxJKGJOg5RIAPzOKTfrs7rNxqYXwfdSh9HTHMJUs2X27Y\""
 
@@ -162,8 +163,7 @@ dependencies {
     implementation(libs.koin.compose)
     implementation(libs.koin.compose.viewmodel)
     implementation(libs.koin.compose.viewmodel.navigation)
-    ksp(libs.koin.ksp.compiler)
-    api(libs.koin.annotations)
+    implementation(libs.koin.annotations)
 }
 
 room { schemaDirectory("$projectDir/schemas") }
diff --git a/app/src/main/assets/changelog.json b/app/src/main/assets/changelog.json
@@ -1,4 +1,10 @@
 [
+  {
+    "version": "5.7.2",
+    "changes": [
+      "Fixed Material Theme not Working #230"
+    ]
+  },
   {
     "version": "5.7.1",
     "changes": [
diff --git a/app/src/main/java/com/shub39/rush/app/RushApplication.kt b/app/src/main/java/com/shub39/rush/app/RushApplication.kt
@@ -23,18 +23,16 @@ import com.shub39.rush.data.listener.MediaListenerImpl
 import com.shub39.rush.di.RushModules
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.startKoin
-import org.koin.ksp.generated.module
+import org.koin.plugin.module.dsl.startKoin
 
 class RushApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
 
-        startKoin {
+        startKoin<RushModules> {
             if (BuildConfig.DEBUG) androidLogger()
             androidContext(this@RushApplication)
-            modules(RushModules().module)
         }
 
         BillingInitializerImpl().initialize(this)
diff --git a/app/src/main/java/com/shub39/rush/presentation/Glow.kt b/app/src/main/java/com/shub39/rush/presentation/Glow.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.asAndroidPath
 import androidx.compose.ui.graphics.nativeCanvas
+import androidx.compose.ui.graphics.nativePaint
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
@@ -78,7 +79,7 @@ fun Modifier.glowBackground(
             path.asAndroidPath(),
             Paint()
                 .apply { this.color = Color.Transparent }
-                .asFrameworkPaint()
+                .nativePaint
                 .applyShadowLayer(radius, xShifting, yShifting, color, density),
         )
     }
diff --git a/app/src/main/java/com/shub39/rush/presentation/setting/section/LookAndFeelPage.kt b/app/src/main/java/com/shub39/rush/presentation/setting/section/LookAndFeelPage.kt
@@ -192,6 +192,7 @@ fun LookAndFeelPage(
                         }
                     }
 
+                    // material theme
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                         ListItem(
                             headlineContent = {
diff --git a/app/src/main/java/com/shub39/rush/presentation/share/component/SharePageSheet.kt b/app/src/main/java/com/shub39/rush/presentation/share/component/SharePageSheet.kt
@@ -30,16 +30,17 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.ListItem
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.SheetState
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
+import androidx.compose.material3.ToggleButtonDefaults
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.rememberStandardBottomSheetState
 import androidx.compose.runtime.Composable
@@ -76,7 +77,7 @@ import com.shub39.rush.presentation.toFullName
 import com.shub39.rush.presentation.toShape
 import com.shub39.rush.presentation.toStringRes
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun SharePageSheet(
     state: SharePageState,
@@ -204,7 +205,14 @@ fun SharePageSheet(
                                 modifier =
                                     Modifier.size(20.dp)
                                         .background(
-                                            color = MaterialTheme.colorScheme.onSurface,
+                                            color =
+                                                if (state.albumArtShape == it) {
+                                                    ToggleButtonDefaults.tonalToggleButtonColors()
+                                                        .checkedContentColor
+                                                } else {
+                                                    ToggleButtonDefaults.tonalToggleButtonColors()
+                                                        .contentColor
+                                                },
                                             shape = it.toShape(),
                                         )
                             )
diff --git a/app/src/main/java/com/shub39/rush/viewmodels/GlobalVM.kt b/app/src/main/java/com/shub39/rush/viewmodels/GlobalVM.kt
@@ -39,7 +39,7 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.koin.android.annotation.KoinViewModel
+import org.koin.core.annotation.KoinViewModel
 
 @KoinViewModel
 class GlobalVM(
@@ -139,6 +139,13 @@ class GlobalVM(
                     }
                     .launchIn(this)
 
+                otherPreferences
+                    .getMaterialYouFlow()
+                    .onEach { pref ->
+                        _state.update { it.copy(theme = it.theme.copy(materialTheme = pref)) }
+                    }
+                    .launchIn(this)
+
                 otherPreferences
                     .getSeedColorFlow()
                     .onEach { pref ->
diff --git a/app/src/main/java/com/shub39/rush/viewmodels/LyricsVM.kt b/app/src/main/java/com/shub39/rush/viewmodels/LyricsVM.kt
@@ -48,7 +48,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import org.koin.android.annotation.KoinViewModel
+import org.koin.core.annotation.KoinViewModel
 
 @KoinViewModel
 class LyricsVM(
diff --git a/app/src/main/java/com/shub39/rush/viewmodels/SavedVM.kt b/app/src/main/java/com/shub39/rush/viewmodels/SavedVM.kt
@@ -39,7 +39,7 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.koin.android.annotation.KoinViewModel
+import org.koin.core.annotation.KoinViewModel
 
 @KoinViewModel
 class SavedVM(
diff --git a/app/src/main/java/com/shub39/rush/viewmodels/SearchSheetVM.kt b/app/src/main/java/com/shub39/rush/viewmodels/SearchSheetVM.kt
@@ -48,7 +48,7 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.koin.android.annotation.KoinViewModel
+import org.koin.core.annotation.KoinViewModel
 
 @KoinViewModel
 class SearchSheetVM(private val stateLayer: SharedStates, private val repo: SongRepository) :
diff --git a/app/src/main/java/com/shub39/rush/viewmodels/SettingsVM.kt b/app/src/main/java/com/shub39/rush/viewmodels/SettingsVM.kt
@@ -40,7 +40,7 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.koin.android.annotation.KoinViewModel
+import org.koin.core.annotation.KoinViewModel
 
 @KoinViewModel
 class SettingsVM(
diff --git a/app/src/main/java/com/shub39/rush/viewmodels/ShareVM.kt b/app/src/main/java/com/shub39/rush/viewmodels/ShareVM.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.koin.android.annotation.KoinViewModel
+import org.koin.core.annotation.KoinViewModel
 
 @KoinViewModel
 class ShareVM(stateLayer: SharedStates, private val datastore: SharePagePreferences) : ViewModel() {
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -16,7 +16,7 @@
     <string name="grant_permission">Concedi autorizzazione</string>
     <string name="notification_permission">L\'accesso alle notifiche è necessario per trovare automaticamente i testi delle canzoni che stai ascoltando. Riavvia l\'app dopo aver concesso il permesso.</string>
     <string name="rounded_corners">Angoli arrotondati</string>
-    <string name="max_lines">Max righe condivisibili</string>
+    <string name="max_lines">Righe massime condivisibili</string>
     <string name="theme">Tema app</string>
     <string name="sort_title_asc">Titolo (A-Z)</string>
     <string name="sort_title_desc">Titolo (Z-A)</string>
@@ -147,4 +147,9 @@
     <string name="line_synced_lyrics">Sincronizzati per linea</string>
     <string name="syllable_synced_lyrics">Sincronizzati per sillaba</string>
     <string name="changelog">Registro modifiche</string>
+    <string name="whats_changed">Cosa è cambiato</string>
+    <string name="looks">Aspetto</string>
+    <string name="text">Testo</string>
+    <string name="others">Altri</string>
+    <string name="show_app_branding">Mostra Marchio dell\'App</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -16,7 +16,7 @@
     <string name="artist">아티스트</string>
     <string name="width">너비</string>
     <string name="colors">사용자 지정 색상</string>
-    <string name="grant_permission">권힌 부여</string>
+    <string name="grant_permission">권한 부여</string>
     <string name="notification_permission">가사를 자동으로 받으려면 알림 액세스가 필요합니다.</string>
     <string name="rounded_corners">둥근 모서리</string>
     <string name="max_lines">최대 공유 줄 수</string>
@@ -44,4 +44,37 @@
     <string name="card_corners">카드 모서리</string>
     <string name="vibrant_colors_info">가사 페이지 색상을 더 선명하게 사용</string>
     <string name="backup">백업</string>
+    <string name="backup_info">저장된 가사 데이터베이스를 가져오거나 내보내기</string>
+    <string name="sort_date_added">최근 추가</string>
+    <string name="rush_branding">Rush</string>
+    <string name="bmc">커피 한 잔 후원하기</string>
+    <string name="translate">번역 참여하기</string>
+    <string name="rate_on_play">Play 스토어에서 평가하기</string>
+    <string name="exporting">내보내는 중</string>
+    <string name="exported">내보내기 완료</string>
+    <string name="restoring">노래 복원 중</string>
+    <string name="restored">노래 복원 완료</string>
+    <string name="restore_failed">복원 실패</string>
+    <string name="about">정보</string>
+    <string name="no_audio_files">오디오 파일 없음</string>
+    <string name="no_folder_selected">선택된 폴더 없음</string>
+    <string name="export">내보내기</string>
+    <string name="export_info">선택한 폴더로 노래 내보내기</string>
+    <string name="restore">복원</string>
+    <string name="restore_info">내보낸 파일에서 복원하기</string>
+    <string name="choose_file">파일 선택</string>
+    <string name="rush_mode">Rush 모드</string>
+    <string name="rush_mode_desc">알림에서 현재 재생 중인 노래를 찾아 가사를 불러오고, 음악에 맞춰 자동으로 변경됩니다.</string>
+    <string name="look_and_feel">디자인</string>
+    <string name="look_and_feel_info">앱을 원하는 대로 설정할 수 있습니다</string>
+    <string name="vibrant_colors">선명한 색상 사용</string>
+    <string name="suggestion">아래 검색 아이콘이 보이나요?</string>
+    <string name="fetching">가사 불러오는 중</string>
+    <string name="searching">검색 중</string>
+    <string name="batch_download_info">저장된 노래의 가사를 한 번에 다운로드합니다.</string>
+    <string name="use_system_theme">시스템 테마 사용</string>
+    <string name="dark_theme">다크 테마 사용</string>
+    <string name="amoled">AMOLED 색상표</string>
+    <string name="use_system_theme_desc">시스템과 동일한 테마 사용</string>
+    <string name="amoled_desc">AMOLED 디스플레이에서 최적의 경험 제공</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
diff --git a/build.gradle.kts b/build.gradle.kts
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,10 @@`
`1`	`1`	`[`
	`2`	`+ {`
	`3`	`+ "version": "5.7.2",`
	`4`	`+ "changes": [`
	`5`	`+ "Fixed Material Theme not Working #230"`
	`6`	`+ ]`
	`7`	`+ },`
`2`	`8`	`{`
`3`	`9`	`"version": "5.7.1",`
`4`	`10`	`"changes": [`
Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,7 @@ fun LookAndFeelPage(`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
	`195`	`+ // material theme`
`195`	`196`	`if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {`
`196`	`197`	`ListItem(`
`197`	`198`	`headlineContent = {`