From 7b4a2370089aa682655f79928178a7610c14b007 Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Wed, 2 Oct 2024 21:39:16 +0530
Subject: [PATCH 01/10] Updated: patch version

---
 buildSrc/src/main/kotlin/Dependencies.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 41276ab..372963c 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -147,7 +147,7 @@ object AnnotationProcessors {
 object AppVersion {
     private const val Major = 1
     private const val Minor = 2
-    private const val Patch = 4
+    private const val Patch = 5
     const val Code = Major*10000 + Minor*100 + Patch
     const val Name = "$Major.$Minor.$Patch"
 }

From 883318a7c6434acc07a12e4f6ee1c178dad43a01 Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 03:58:42 +0530
Subject: [PATCH 02/10] Added: Kotlin immutable collection

---
 .idea/gradle.xml                         | 3 ++-
 .idea/misc.xml                           | 3 ++-
 app/build.gradle.kts                     | 1 +
 buildSrc/src/main/kotlin/Dependencies.kt | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c733d0b..837ea71 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,8 +15,9 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..f104487 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index be5b753..0b3ef3f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -113,6 +113,7 @@ android {
 
 dependencies {
     implementation(project(":m3utils"))
+    implementation(Libraries.kotlinxCollectionsImmutable)
     implementation(Libraries.androidxCore)
 
     implementation(Libraries.androidxLifecycle)
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 372963c..80e4e8c 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,6 +1,7 @@
 object Versions {
     const val kotlin = "1.8.0"
     const val coroutines = "1.7.1"
+    const val kotlinxCollectionsImmutable = "0.3.8"
 
     const val androidxComposeUi = "1.3.3"
     const val androidxComposeCompiler = "1.4.1"
@@ -61,6 +62,7 @@ object Plugins {
 }
 
 object Libraries {
+    const val kotlinxCollectionsImmutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:${Versions.kotlinxCollectionsImmutable}"
     const val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}"
 
     const val androidxCore = "androidx.core:core-ktx:${Versions.androidxCore}"

From 51601781d1f2f7eaddcfc29f2321e801bcee9ecb Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 15:58:57 +0530
Subject: [PATCH 03/10] Updated: CollectionFragment title colour and background
 colour

---
 .idea/inspectionProfiles/Project_Default.xml  | 30 +++++++++++++++++++
 .../collection/CollectionContent.kt           | 29 ++++++------------
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index bd2a505..910c7a2 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,9 +1,39 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
diff --git a/app/src/main/java/com/github/pakka_papad/collection/CollectionContent.kt b/app/src/main/java/com/github/pakka_papad/collection/CollectionContent.kt
index efe4252..a0d619f 100644
--- a/app/src/main/java/com/github/pakka_papad/collection/CollectionContent.kt
+++ b/app/src/main/java/com/github/pakka_papad/collection/CollectionContent.kt
@@ -6,10 +6,15 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.*
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
@@ -18,8 +23,6 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.core.graphics.drawable.toBitmap
-import androidx.palette.graphics.Palette
 import coil.compose.AsyncImage
 import com.github.pakka_papad.components.SongCardV1
 import com.github.pakka_papad.components.more_options.SongOptions
@@ -85,25 +88,11 @@ fun CollectionImage(
             .height(240.dp),
         contentAlignment = Alignment.BottomCenter
     ) {
-        val surface = MaterialTheme.colorScheme.surface
-        val onSurface = MaterialTheme.colorScheme.onSurface
-        var textColor by remember { mutableStateOf(onSurface) }
-        var backgroundColor by remember { mutableStateOf(surface) }
         AsyncImage(
             model = imageUri,
             contentDescription = null,
             contentScale = ContentScale.Crop,
             modifier = Modifier.fillMaxSize(),
-            onSuccess = { result ->
-                Palette.Builder(result.result.drawable.toBitmap()).generate { palette ->
-                    palette?.let {
-                        it.mutedSwatch?.let { vbs ->
-                            backgroundColor = Color(vbs.rgb)
-                            textColor = Color(vbs.titleTextColor).copy(alpha = 1f)
-                        }
-                    }
-                }
-            }
         )
         Text(
             text = title ?: "",
@@ -112,12 +101,12 @@ fun CollectionImage(
                 .fillMaxWidth()
                 .background(
                     Brush.verticalGradient(
-                        listOf(Color.Transparent, backgroundColor)
+                        listOf(Color.Transparent, MaterialTheme.colorScheme.surface)
                     )
                 )
                 .padding(10.dp),
             maxLines = 2,
-            color = textColor,
+            color = MaterialTheme.colorScheme.onSurface,
             fontWeight = FontWeight.ExtraBold,
             overflow = TextOverflow.Ellipsis
         )

From a2fcb620ca6b3a2992ae3174573f3ffd616c9f1b Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 21:32:50 +0530
Subject: [PATCH 04/10] Added: Indication for selected accent colour

---
 .../pakka_papad/settings/SettingsList.kt      | 167 ++++++++++++------
 1 file changed, 113 insertions(+), 54 deletions(-)

diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
index bbe6773..0890f15 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
@@ -9,8 +9,26 @@ import android.os.Build
 import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -19,8 +37,23 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Search
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
@@ -28,6 +61,7 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
@@ -203,7 +237,7 @@ private fun LookAndFeelSettings(
         AccentSelectorDialog(
             themePreference = themePreference,
             onPreferenceChanged = onPreferenceChanged,
-            onDismissRequest = { showAccentSelector = false }
+            onDismissRequest = { showAccentSelector = false },
         )
     }
     if (showSelectorDialog) {
@@ -233,7 +267,6 @@ private fun AccentSelectorDialog(
     onPreferenceChanged: (ThemePreference) -> Unit,
     onDismissRequest: () -> Unit,
 ){
-    val sizeModifier = Modifier.size(50.dp)
     AlertDialog(
         title = {
             Text(
@@ -263,65 +296,91 @@ private fun AccentSelectorDialog(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.SpaceEvenly
                 ) {
-                    Canvas(
-                        modifier = sizeModifier
-                            .clickable {
-                                onPreferenceChanged(themePreference.copy(accent = Accent.Default))
-                            }
-                    ) {
-                        drawCircle(Accent.Default.getSeedColor())
-                    }
-                    Canvas(
-                        modifier = sizeModifier
-                            .clickable {
-                                onPreferenceChanged(themePreference.copy(accent = Accent.Malibu))
-                            }
-                    ) {
-                        drawCircle(Accent.Malibu.getSeedColor())
-                    }
-                    Canvas(
-                        modifier = sizeModifier
-                            .clickable {
-                                onPreferenceChanged(themePreference.copy(accent = Accent.Melrose))
-                            }
-                    ) {
-                        drawCircle(Accent.Melrose.getSeedColor())
-                    }
+                    DrawAccentCircle(
+                        accentColour = Accent.Default.getSeedColor(),
+                        isSelected = themePreference.accent == Accent.Default,
+                        onClick = {
+                            onPreferenceChanged(themePreference.copy(accent = Accent.Default))
+                        }
+                    )
+                    DrawAccentCircle(
+                        accentColour = Accent.Malibu.getSeedColor(),
+                        isSelected = themePreference.accent == Accent.Malibu,
+                        onClick = {
+                            onPreferenceChanged(themePreference.copy(accent = Accent.Malibu))
+                        }
+                    )
+                    DrawAccentCircle(
+                        accentColour = Accent.Melrose.getSeedColor(),
+                        isSelected = themePreference.accent == Accent.Melrose,
+                        onClick = {
+                            onPreferenceChanged(themePreference.copy(accent = Accent.Melrose))
+                        }
+                    )
                 }
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.SpaceEvenly
                 ) {
-                    Canvas(
-                        modifier = sizeModifier
-                            .clickable {
-                                onPreferenceChanged(themePreference.copy(accent = Accent.Elm))
-                            }
-                    ) {
-                        drawCircle(Accent.Elm.getSeedColor())
-                    }
-                    Canvas(
-                        modifier = sizeModifier
-                            .clickable {
-                                onPreferenceChanged(themePreference.copy(accent = Accent.Magenta))
-                            }
-                    ) {
-                        drawCircle(Accent.Magenta.getSeedColor())
-                    }
-                    Canvas(
-                        modifier = sizeModifier
-                            .clickable {
-                                onPreferenceChanged(themePreference.copy(accent = Accent.JacksonsPurple))
-                            }
-                    ) {
-                        drawCircle(Accent.JacksonsPurple.getSeedColor())
-                    }
+                    DrawAccentCircle(
+                        accentColour = Accent.Elm.getSeedColor(),
+                        isSelected = themePreference.accent == Accent.Elm,
+                        onClick = {
+                            onPreferenceChanged(themePreference.copy(accent = Accent.Elm))
+                        }
+                    )
+                    DrawAccentCircle(
+                        accentColour = Accent.Magenta.getSeedColor(),
+                        isSelected = themePreference.accent == Accent.Magenta,
+                        onClick = {
+                            onPreferenceChanged(themePreference.copy(accent = Accent.Magenta))
+                        }
+                    )
+                    DrawAccentCircle(
+                        accentColour = Accent.JacksonsPurple.getSeedColor(),
+                        isSelected = themePreference.accent == Accent.JacksonsPurple,
+                        onClick = {
+                            onPreferenceChanged(themePreference.copy(accent = Accent.JacksonsPurple))
+                        }
+                    )
                 }
             }
         }
     )
 }
 
+@Composable
+private fun DrawAccentCircle(
+    accentColour: Color,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+) {
+    val borderColour = MaterialTheme.colorScheme.primary
+    Canvas(
+        modifier = Modifier
+            .size(56.dp)
+            .clickable(
+                onClick = onClick,
+                indication = null,
+                interactionSource = remember { MutableInteractionSource() }
+            ),
+    ) {
+        if (isSelected) {
+            drawArc(
+                color = borderColour,
+                startAngle = 0f,
+                sweepAngle = 360f,
+                useCenter = true,
+                style = Stroke(width = 3.dp.toPx()),
+            )
+        }
+        drawCircle(
+            color = accentColour,
+            radius = size.minDimension * 0.45f,
+        )
+    }
+}
+
 @Composable
 private fun ThemeSelectorDialog(
     themePreference: ThemePreference,

From c99ce961995a3e827d3d25ac80ba171723030033 Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 21:51:02 +0530
Subject: [PATCH 05/10] Updated: Theme mode selector

---
 .../pakka_papad/settings/SettingsList.kt      | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
index 0890f15..2efedd2 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
@@ -413,59 +413,59 @@ private fun ThemeSelectorDialog(
                     .fillMaxWidth()
                     .selectableGroup()
             ) {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    RadioButton(
-                        selected = (themePreference.theme == UserPreferences.Theme.LIGHT_MODE || themePreference.theme == UserPreferences.Theme.UNRECOGNIZED),
-                        onClick = {
-                            onPreferenceChanged(themePreference.copy(theme = UserPreferences.Theme.LIGHT_MODE))
-                        }
-                    )
-                    Text(
-                        text = stringResource(R.string.light_mode),
-                        style = MaterialTheme.typography.titleMedium
-                    )
-                }
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    RadioButton(
-                        selected = (themePreference.theme == UserPreferences.Theme.DARK_MODE),
-                        onClick = {
-                            onPreferenceChanged(themePreference.copy(theme = UserPreferences.Theme.DARK_MODE))
-                        }
-                    )
-                    Text(
-                        text = stringResource(R.string.dark_mode),
-                        style = MaterialTheme.typography.titleMedium
-                    )
-                }
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    RadioButton(
-                        selected = (themePreference.theme == UserPreferences.Theme.USE_SYSTEM_MODE),
-                        onClick = {
-                            onPreferenceChanged(themePreference.copy(theme = UserPreferences.Theme.USE_SYSTEM_MODE))
-                        }
-                    )
-                    Text(
-                        text = stringResource(R.string.system_mode),
-                        style = MaterialTheme.typography.titleMedium
-                    )
-                }
+                ThemeMode(
+                    isSelected = (themePreference.theme == UserPreferences.Theme.LIGHT_MODE),
+                    text = stringResource(R.string.light_mode),
+                    onClick = {
+                        onPreferenceChanged(themePreference.copy(theme = UserPreferences.Theme.LIGHT_MODE))
+                    }
+                )
+                ThemeMode(
+                    isSelected = (themePreference.theme == UserPreferences.Theme.DARK_MODE),
+                    text = stringResource(R.string.dark_mode),
+                    onClick = {
+                        onPreferenceChanged(themePreference.copy(theme = UserPreferences.Theme.DARK_MODE))
+                    }
+                )
+                ThemeMode(
+                    isSelected = (themePreference.theme == UserPreferences.Theme.USE_SYSTEM_MODE),
+                    text = stringResource(R.string.system_mode),
+                    onClick = {
+                        onPreferenceChanged(themePreference.copy(theme = UserPreferences.Theme.USE_SYSTEM_MODE))
+                    }
+                )
             }
         }
     )
 }
 
+@Composable
+private fun ThemeMode(
+    isSelected: Boolean,
+    text: String,
+    onClick: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(45.dp)
+            .clip(MaterialTheme.shapes.medium)
+            .clickable(onClick = onClick)
+            .padding(horizontal = 6.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        RadioButton(
+            selected = isSelected,
+            onClick = null,
+        )
+        Text(
+            text = text,
+            style = MaterialTheme.typography.titleMedium
+        )
+    }
+}
+
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun RearrangeTabsDialog(

From 3a407ecca4158cc89a201c25a95de3109454de43 Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 21:54:49 +0530
Subject: [PATCH 06/10] Removed: Links

---
 .../pakka_papad/settings/SettingsList.kt      | 175 ++++++++----------
 1 file changed, 82 insertions(+), 93 deletions(-)

diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
index 2efedd2..b9e543b 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
@@ -1,20 +1,14 @@
 package com.github.pakka_papad.settings
 
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
@@ -60,17 +54,14 @@ import androidx.compose.ui.composed
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import com.github.pakka_papad.BuildConfig
@@ -677,14 +668,14 @@ private fun ReportBug(
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
+//@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun MadeBy(
     onWhatsNewClicked: () -> Unit,
 ) {
-    val githubUrl = "https://github.com/pakka-papad"
-    val linkedinUrl = "https://www.linkedin.com/in/sumitzbera/"
-    val context = LocalContext.current
+//    val githubUrl = "https://github.com/pakka-papad"
+//    val linkedinUrl = "https://www.linkedin.com/in/sumitzbera/"
+//    val context = LocalContext.current
     val appVersion = stringResource(id = R.string.app_version_name)
     Column(
         modifier = Modifier.fillMaxWidth(),
@@ -701,86 +692,84 @@ private fun MadeBy(
             },
             style = MaterialTheme.typography.titleSmall,
         )
-        Text(
-            text = stringResource(R.string.check_what_s_new),
-            modifier = Modifier
-                .alpha(0.5f)
-                .clickable(onClick = onWhatsNewClicked),
-            style = MaterialTheme.typography.titleSmall.copy(textDecoration = TextDecoration.Underline)
-        )
-        Spacer(Modifier.height(6.dp))
-        Text(
-            text = buildAnnotatedString {
-                withStyle(semiTransparentSpanStyle) {
-                    append("${stringResource(R.string.made_by)} ")
-                }
-                append("Sumit Bera")
-            },
-            style = MaterialTheme.typography.titleMedium,
-        )
-        val iconModifier = Modifier
-            .size(30.dp)
-            .alpha(0.5f)
-//            .clip(CircleShape)
-//            .border(1.dp, MaterialTheme.colorScheme.onSurface, CircleShape)
-        Row(
-            horizontalArrangement = Arrangement.spacedBy(24.dp)
-        ) {
-            Image(
-                painter = painterResource(R.drawable.github_mark),
-                contentDescription = "github",
-                modifier = iconModifier
-                    .combinedClickable(
-                        onClick = {
-                            val intent = Intent(Intent.ACTION_VIEW)
-                            intent.data = Uri.parse(githubUrl)
-                            try {
-                                context.startActivity(intent)
-                            } catch (_: Exception){
-                                Toast.makeText(context,"Error opening url. Long press to copy.",Toast.LENGTH_SHORT).show()
-                            }
-                        },
-                        onLongClick = {
-                            val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
-                            if (clipboardManager == null){
-                                Toast.makeText(context,"Error",Toast.LENGTH_SHORT).show()
-                            } else {
-                                clipboardManager.setPrimaryClip(ClipData.newPlainText("Github url",githubUrl))
-                                Toast.makeText(context,"Copied",Toast.LENGTH_SHORT).show()
-                            }
-                        }
-                    ),
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
-                contentScale = ContentScale.Inside,
-            )
-            Image(
-                painter = painterResource(R.drawable.linkedin),
-                contentDescription = "linkedin",
-                modifier = iconModifier
-                    .combinedClickable(
-                        onClick = {
-                            val intent = Intent(Intent.ACTION_VIEW)
-                            intent.data = Uri.parse(linkedinUrl)
-                            try {
-                                context.startActivity(intent)
-                            } catch (_: Exception){
-                                Toast.makeText(context,"Error opening url. Long press to copy.",Toast.LENGTH_SHORT).show()
-                            }
-                        },
-                        onLongClick = {
-                            val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
-                            if (clipboardManager == null){
-                                Toast.makeText(context,"Error",Toast.LENGTH_SHORT).show()
-                            } else {
-                                clipboardManager.setPrimaryClip(ClipData.newPlainText("Linkedin url",linkedinUrl))
-                                Toast.makeText(context,"Copied",Toast.LENGTH_SHORT).show()
-                            }
-                        }
-                    ),
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
-                contentScale = ContentScale.Inside,
-            )
-        }
+//        Text(
+//            text = stringResource(R.string.check_what_s_new),
+//            modifier = Modifier
+//                .alpha(0.5f)
+//                .clickable(onClick = onWhatsNewClicked),
+//            style = MaterialTheme.typography.titleSmall.copy(textDecoration = TextDecoration.Underline)
+//        )
+//        Spacer(Modifier.height(6.dp))
+//        Text(
+//            text = buildAnnotatedString {
+//                withStyle(semiTransparentSpanStyle) {
+//                    append("${stringResource(R.string.made_by)} ")
+//                }
+//                append("Sumit Bera")
+//            },
+//            style = MaterialTheme.typography.titleMedium,
+//        )
+//        val iconModifier = Modifier
+//            .size(30.dp)
+//            .alpha(0.5f)
+//        Row(
+//            horizontalArrangement = Arrangement.spacedBy(24.dp)
+//        ) {
+//            Image(
+//                painter = painterResource(R.drawable.github_mark),
+//                contentDescription = "github",
+//                modifier = iconModifier
+//                    .combinedClickable(
+//                        onClick = {
+//                            val intent = Intent(Intent.ACTION_VIEW)
+//                            intent.data = Uri.parse(githubUrl)
+//                            try {
+//                                context.startActivity(intent)
+//                            } catch (_: Exception){
+//                                Toast.makeText(context,"Error opening url. Long press to copy.",Toast.LENGTH_SHORT).show()
+//                            }
+//                        },
+//                        onLongClick = {
+//                            val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
+//                            if (clipboardManager == null){
+//                                Toast.makeText(context,"Error",Toast.LENGTH_SHORT).show()
+//                            } else {
+//                                clipboardManager.setPrimaryClip(ClipData.newPlainText("Github url",githubUrl))
+//                                Toast.makeText(context,"Copied",Toast.LENGTH_SHORT).show()
+//                            }
+//                        }
+//                    ),
+//                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+//                contentScale = ContentScale.Inside,
+//            )
+//            Image(
+//                painter = painterResource(R.drawable.linkedin),
+//                contentDescription = "linkedin",
+//                modifier = iconModifier
+//                    .combinedClickable(
+//                        onClick = {
+//                            val intent = Intent(Intent.ACTION_VIEW)
+//                            intent.data = Uri.parse(linkedinUrl)
+//                            try {
+//                                context.startActivity(intent)
+//                            } catch (_: Exception){
+//                                Toast.makeText(context,"Error opening url. Long press to copy.",Toast.LENGTH_SHORT).show()
+//                            }
+//                        },
+//                        onLongClick = {
+//                            val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
+//                            if (clipboardManager == null){
+//                                Toast.makeText(context,"Error",Toast.LENGTH_SHORT).show()
+//                            } else {
+//                                clipboardManager.setPrimaryClip(ClipData.newPlainText("Linkedin url",linkedinUrl))
+//                                Toast.makeText(context,"Copied",Toast.LENGTH_SHORT).show()
+//                            }
+//                        }
+//                    ),
+//                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+//                contentScale = ContentScale.Inside,
+//            )
+//        }
         Spacer(Modifier.height(36.dp))
     }
 }

From f107dd4ff0b4f586326c042969c8d754b3ea4ae3 Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 22:01:33 +0530
Subject: [PATCH 07/10] Updated: Glance version

---
 app/build.gradle.kts                     | 1 +
 buildSrc/src/main/kotlin/Dependencies.kt | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0b3ef3f..84cc4d1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -170,6 +170,7 @@ dependencies {
 
     implementation(platform(Libraries.firebaseBom))
     implementation(Libraries.firebaseCrashlytics)
+    implementation(Libraries.appUpdate)
 
 //    implementation(Libraries.exoPlayer)
     implementation(Libraries.media3ExoPlayer)
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 80e4e8c..abb8adb 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -14,7 +14,7 @@ object Versions {
     const val androidxEspresso = "3.4.0"
     const val androidxComposeConstraintLayout = "1.0.1"
     const val androidxSplashScreen = "1.0.0-beta02"
-    const val androidxGlance = "1.0.0-beta01"
+    const val androidxGlance = "1.1.1"
     const val androidxWorkManager = "2.8.1"
 
     const val appCompat = "1.4.2"
@@ -26,6 +26,7 @@ object Versions {
 
     const val firebaseBom = "31.2.3"
     const val googleServices = "4.3.15"
+    const val appUpdate = "2.1.0"
     const val crashlyticsGradlePlugin = "2.9.4"
 
     const val material3 = "1.1.2"
@@ -92,6 +93,7 @@ object Libraries {
 
     const val firebaseBom = "com.google.firebase:firebase-bom:${Versions.firebaseBom}"
     const val firebaseCrashlytics = "com.google.firebase:firebase-crashlytics-ktx"
+    const val appUpdate = "com.google.android.play:app-update-ktx:${Versions.appUpdate}"
 
     const val androidxComposeMaterial = "androidx.compose.material:material:${Versions.androidxComposeMaterial}"
 

From 8aba2bcf168760c8f39a2df9e8dc8e30479d878e Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 22:59:27 +0530
Subject: [PATCH 08/10] Added: Play update button

---
 .../com/github/pakka_papad/MainActivity.kt    | 20 ++++++++++
 .../com/github/pakka_papad/di/AppModule.kt    | 37 ++++++++++++++++++-
 .../pakka_papad/settings/SettingsFragment.kt  | 25 +++++++++++++
 .../pakka_papad/settings/SettingsList.kt      | 37 ++++++++++++++++++-
 .../pakka_papad/settings/SettingsViewModel.kt | 19 ++++++++++
 app/src/main/res/values/strings.xml           |  4 +-
 6 files changed, 138 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/github/pakka_papad/MainActivity.kt b/app/src/main/java/com/github/pakka_papad/MainActivity.kt
index 251e96a..595753c 100644
--- a/app/src/main/java/com/github/pakka_papad/MainActivity.kt
+++ b/app/src/main/java/com/github/pakka_papad/MainActivity.kt
@@ -7,6 +7,10 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import com.github.pakka_papad.data.ZenPreferenceProvider
 import com.github.pakka_papad.databinding.ActivityMainBinding
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateOptions
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.UpdateAvailability
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -17,6 +21,8 @@ class MainActivity : AppCompatActivity() {
 
     @Inject lateinit var preferencesProvider: ZenPreferenceProvider
 
+    @Inject lateinit var appUpdateManager: AppUpdateManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         installSplashScreen().apply {
@@ -30,4 +36,18 @@ class MainActivity : AppCompatActivity() {
         WindowCompat.setDecorFitsSystemWindows(window,false)
         window.statusBarColor = Color.TRANSPARENT
     }
+
+    override fun onResume() {
+        super.onResume()
+
+        appUpdateManager.appUpdateInfo.addOnSuccessListener {
+            if (it.updateAvailability() == UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS){
+                appUpdateManager.startUpdateFlow(
+                    it,
+                    this,
+                    AppUpdateOptions.defaultOptions(AppUpdateType.IMMEDIATE)
+                )
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/pakka_papad/di/AppModule.kt b/app/src/main/java/com/github/pakka_papad/di/AppModule.kt
index 4e90029..0e40fe3 100644
--- a/app/src/main/java/com/github/pakka_papad/di/AppModule.kt
+++ b/app/src/main/java/com/github/pakka_papad/di/AppModule.kt
@@ -16,12 +16,37 @@ import androidx.media3.extractor.DefaultExtractorsFactory
 import androidx.media3.extractor.mp3.Mp3Extractor
 import androidx.room.Room
 import com.github.pakka_papad.Constants
-import com.github.pakka_papad.data.*
+import com.github.pakka_papad.data.AppDatabase
+import com.github.pakka_papad.data.QueueState
+import com.github.pakka_papad.data.QueueStateSerializer
+import com.github.pakka_papad.data.UserPreferences
+import com.github.pakka_papad.data.UserPreferencesSerializer
+import com.github.pakka_papad.data.ZenCrashReporter
+import com.github.pakka_papad.data.ZenPreferenceProvider
 import com.github.pakka_papad.data.music.SongExtractor
-import com.github.pakka_papad.data.services.*
+import com.github.pakka_papad.data.services.AnalyticsService
+import com.github.pakka_papad.data.services.AnalyticsServiceImpl
+import com.github.pakka_papad.data.services.BlacklistService
+import com.github.pakka_papad.data.services.BlacklistServiceImpl
+import com.github.pakka_papad.data.services.PlayerService
+import com.github.pakka_papad.data.services.PlayerServiceImpl
+import com.github.pakka_papad.data.services.PlaylistService
+import com.github.pakka_papad.data.services.PlaylistServiceImpl
+import com.github.pakka_papad.data.services.QueueService
+import com.github.pakka_papad.data.services.QueueServiceImpl
+import com.github.pakka_papad.data.services.SearchService
+import com.github.pakka_papad.data.services.SearchServiceImpl
+import com.github.pakka_papad.data.services.SleepTimerService
+import com.github.pakka_papad.data.services.SleepTimerServiceImpl
+import com.github.pakka_papad.data.services.SongService
+import com.github.pakka_papad.data.services.SongServiceImpl
+import com.github.pakka_papad.data.services.ThumbnailService
+import com.github.pakka_papad.data.services.ThumbnailServiceImpl
 import com.github.pakka_papad.player.ZenBroadcastReceiver
 import com.github.pakka_papad.util.MessageStore
 import com.github.pakka_papad.util.MessageStoreImpl
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.Module
 import dagger.Provides
@@ -283,4 +308,12 @@ object AppModule {
             thumbnailDao = db.thumbnailDao(),
         )
     }
+
+    @Singleton
+    @Provides
+    fun providesAppUpdateManager(
+        @ApplicationContext context: Context,
+    ): AppUpdateManager {
+        return AppUpdateManagerFactory.create(context)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt
index 4713dd8..3e58dd9 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt
@@ -8,6 +8,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.ComposeView
@@ -23,6 +24,9 @@ import com.github.pakka_papad.components.Snackbar
 import com.github.pakka_papad.components.TopBarWithBackArrow
 import com.github.pakka_papad.data.ZenPreferenceProvider
 import com.github.pakka_papad.ui.theme.ZenTheme
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateOptions
+import com.google.android.play.core.install.model.AppUpdateType
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -36,6 +40,9 @@ class SettingsFragment : Fragment() {
     @Inject
     lateinit var preferenceProvider: ZenPreferenceProvider
 
+    @Inject
+    lateinit var appUpdateManager: AppUpdateManager
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -51,6 +58,10 @@ class SettingsFragment : Fragment() {
 
                 val tabsSelection by viewModel.tabsSelection.collectAsStateWithLifecycle()
 
+                val isAppUpdateAvailable by remember { derivedStateOf {
+                    viewModel.appUpdateInfo.value != null
+                } }
+
                 val restoreClicked = remember{ {
                     if (navController.currentDestination?.id == R.id.settingsFragment){
                         navController.navigate(R.id.action_settingsFragment_to_restoreFragment)
@@ -87,6 +98,8 @@ class SettingsFragment : Fragment() {
                         content = { paddingValues ->
                             SettingsList(
                                 paddingValues = paddingValues,
+                                isAppUpdateAvailable = isAppUpdateAvailable,
+                                onAppUpdateClicked = ::onAppUpdateClicked,
                                 themePreference = themePreference,
                                 onThemePreferenceChanged = preferenceProvider::updateTheme,
                                 scanStatus = scanStatus,
@@ -115,4 +128,16 @@ class SettingsFragment : Fragment() {
             }
         }
     }
+
+    private fun onAppUpdateClicked() {
+        val appUpdateInfo = viewModel.appUpdateInfo.value
+        viewModel.consumeAppUpdateInfo()
+        appUpdateInfo?.let {
+            appUpdateManager.startUpdateFlow(
+                it,
+                requireActivity(),
+                AppUpdateOptions.defaultOptions(AppUpdateType.IMMEDIATE)
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
index b9e543b..44c250f 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
@@ -80,6 +80,8 @@ import timber.log.Timber
 @Composable
 fun SettingsList(
     paddingValues: PaddingValues,
+    isAppUpdateAvailable: Boolean,
+    onAppUpdateClicked: () -> Unit,
     themePreference: ThemePreference,
     onThemePreferenceChanged: (ThemePreference) -> Unit,
     scanStatus: ScanStatus,
@@ -101,6 +103,11 @@ fun SettingsList(
         contentPadding = paddingValues,
         verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
+        if (isAppUpdateAvailable) {
+            item {
+                UpdateAvailable(onClick = onAppUpdateClicked)
+            }
+        }
         item {
             GroupTitle(title = stringResource(R.string.look_and_feel))
         }
@@ -143,7 +150,35 @@ fun SettingsList(
 }
 
 @Composable
-fun GroupTitle(
+private fun UpdateAvailable(
+    onClick: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .group()
+            .padding(10.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(
+            text = stringResource(R.string.new_version_available),
+            style = MaterialTheme.typography.titleMedium,
+            modifier = Modifier
+                .weight(1f),
+        )
+        Button(
+            onClick = onClick,
+            modifier = Modifier.padding(end = 6.dp),
+        ) {
+            Text(
+                text = stringResource(R.string.update),
+                style = MaterialTheme.typography.titleMedium
+            )
+        }
+    }
+}
+
+@Composable
+private fun GroupTitle(
     title: String,
 ){
     Text(
diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsViewModel.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsViewModel.kt
index ef59d87..dd03d2f 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsViewModel.kt
@@ -9,6 +9,9 @@ import com.github.pakka_papad.data.ZenPreferenceProvider
 import com.github.pakka_papad.data.music.ScanStatus
 import com.github.pakka_papad.data.music.SongExtractor
 import com.github.pakka_papad.util.MessageStore
+import com.google.android.play.core.appupdate.AppUpdateInfo
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.install.model.UpdateAvailability
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -24,6 +27,7 @@ class SettingsViewModel @Inject constructor(
     private val songExtractor: SongExtractor,
     private val prefs: ZenPreferenceProvider,
     private val messageStore: MessageStore,
+    private val appUpdateManager: AppUpdateManager,
 ) : ViewModel() {
 
     val scanStatus = songExtractor.scanStatus
@@ -111,4 +115,19 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+    private val _appUpdateInfo = MutableStateFlow<AppUpdateInfo?>(null)
+    val appUpdateInfo = _appUpdateInfo.asStateFlow()
+
+    init {
+        val appUpdateInfoTask = appUpdateManager.appUpdateInfo
+        appUpdateInfoTask.addOnSuccessListener { appUpdateInfo ->
+            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE) {
+                _appUpdateInfo.update { appUpdateInfo }
+            }
+        }
+    }
+
+    fun consumeAppUpdateInfo() {
+        _appUpdateInfo.update { null }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 03074ae..9844c22 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">Zen Music</string>
     <string name="music_control_widget_description">Music Control Widget</string>
 
@@ -125,6 +125,8 @@
     <string name="songs_tab_cannot_be_removed">Songs tab cannot be removed</string>
     <string name="maximum_of_five_tab_selections_are_allowed">Maximum of five tab selections are allowed</string>
     <string name="minimum_one_tab_selection_is_required">Minimum one tab selection is required</string>
+    <string name="new_version_available" tools:ignore="MissingTranslation">A new version is available</string>
+    <string name="update" tools:ignore="MissingTranslation">Update</string>
 
     <!-- plural strings -->
     <plurals name="song_count">

From e2e9f1344c72eed12b7609cc0e603ad495c1088b Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 23:03:19 +0530
Subject: [PATCH 09/10] Added: Description for restore options

---
 .../main/java/com/github/pakka_papad/settings/SettingsList.kt   | 2 ++
 app/src/main/res/values/strings.xml                             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
index 44c250f..e57cdf3 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsList.kt
@@ -643,11 +643,13 @@ private fun MusicLibrarySettings(
         Setting(
             title = stringResource(R.string.restore_blacklisted_songs),
             icon = R.drawable.baseline_settings_backup_restore_40,
+            description = stringResource(R.string.add_songs_back_to_the_library),
             onClick = onRestoreClicked
         )
         Setting(
             title = stringResource(R.string.restore_blacklisted_folders),
             icon = R.drawable.baseline_settings_backup_restore_40,
+            description = stringResource(R.string.add_folders_back_to_the_library),
             onClick = onRestoreFoldersClicked
         )
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9844c22..7b43788 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,6 +127,8 @@
     <string name="minimum_one_tab_selection_is_required">Minimum one tab selection is required</string>
     <string name="new_version_available" tools:ignore="MissingTranslation">A new version is available</string>
     <string name="update" tools:ignore="MissingTranslation">Update</string>
+    <string name="add_songs_back_to_the_library" tools:ignore="MissingTranslation">Add songs back to the library</string>
+    <string name="add_folders_back_to_the_library" tools:ignore="MissingTranslation">Add folders back to the library</string>
 
     <!-- plural strings -->
     <plurals name="song_count">

From 13bdfd80690c14df4738507f910cbbb7d1ef65f6 Mon Sep 17 00:00:00 2001
From: pakka-papad <76241334+pakka-papad@users.noreply.github.com>
Date: Sun, 26 Jan 2025 23:33:39 +0530
Subject: [PATCH 10/10] Added: try catch for update

---
 .../com/github/pakka_papad/MainActivity.kt    | 21 ++++++++++------
 .../pakka_papad/settings/SettingsFragment.kt  | 25 +++++++++++--------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/github/pakka_papad/MainActivity.kt b/app/src/main/java/com/github/pakka_papad/MainActivity.kt
index 595753c..8ef79f7 100644
--- a/app/src/main/java/com/github/pakka_papad/MainActivity.kt
+++ b/app/src/main/java/com/github/pakka_papad/MainActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
+import com.github.pakka_papad.data.ZenCrashReporter
 import com.github.pakka_papad.data.ZenPreferenceProvider
 import com.github.pakka_papad.databinding.ActivityMainBinding
 import com.google.android.play.core.appupdate.AppUpdateManager
@@ -23,6 +24,8 @@ class MainActivity : AppCompatActivity() {
 
     @Inject lateinit var appUpdateManager: AppUpdateManager
 
+    @Inject lateinit var crashReporter: ZenCrashReporter
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         installSplashScreen().apply {
@@ -40,14 +43,18 @@ class MainActivity : AppCompatActivity() {
     override fun onResume() {
         super.onResume()
 
-        appUpdateManager.appUpdateInfo.addOnSuccessListener {
-            if (it.updateAvailability() == UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS){
-                appUpdateManager.startUpdateFlow(
-                    it,
-                    this,
-                    AppUpdateOptions.defaultOptions(AppUpdateType.IMMEDIATE)
-                )
+        try {
+            appUpdateManager.appUpdateInfo.addOnSuccessListener {
+                if (it.updateAvailability() == UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS){
+                    appUpdateManager.startUpdateFlow(
+                        it,
+                        this,
+                        AppUpdateOptions.defaultOptions(AppUpdateType.IMMEDIATE)
+                    )
+                }
             }
+        } catch (e: Exception) {
+            crashReporter.logException(e)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt b/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt
index 3e58dd9..189f398 100644
--- a/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/github/pakka_papad/settings/SettingsFragment.kt
@@ -22,6 +22,7 @@ import androidx.navigation.fragment.findNavController
 import com.github.pakka_papad.R
 import com.github.pakka_papad.components.Snackbar
 import com.github.pakka_papad.components.TopBarWithBackArrow
+import com.github.pakka_papad.data.ZenCrashReporter
 import com.github.pakka_papad.data.ZenPreferenceProvider
 import com.github.pakka_papad.ui.theme.ZenTheme
 import com.google.android.play.core.appupdate.AppUpdateManager
@@ -37,11 +38,11 @@ class SettingsFragment : Fragment() {
 
     private lateinit var navController: NavController
 
-    @Inject
-    lateinit var preferenceProvider: ZenPreferenceProvider
+    @Inject lateinit var preferenceProvider: ZenPreferenceProvider
 
-    @Inject
-    lateinit var appUpdateManager: AppUpdateManager
+    @Inject lateinit var appUpdateManager: AppUpdateManager
+
+    @Inject lateinit var crashReporter: ZenCrashReporter
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -132,12 +133,16 @@ class SettingsFragment : Fragment() {
     private fun onAppUpdateClicked() {
         val appUpdateInfo = viewModel.appUpdateInfo.value
         viewModel.consumeAppUpdateInfo()
-        appUpdateInfo?.let {
-            appUpdateManager.startUpdateFlow(
-                it,
-                requireActivity(),
-                AppUpdateOptions.defaultOptions(AppUpdateType.IMMEDIATE)
-            )
+        try {
+            appUpdateInfo?.let {
+                appUpdateManager.startUpdateFlow(
+                    it,
+                    requireActivity(),
+                    AppUpdateOptions.defaultOptions(AppUpdateType.IMMEDIATE)
+                )
+            }
+        } catch (e: Exception) {
+            crashReporter.logException(e)
         }
     }
 }
\ No newline at end of file