Fix minor Compose performance issues

common/audio/build.gradle

@@ -2,6 +2,8 @@ plugins {
   id 'quran.android.library.android'
   alias libs.plugins.kotlin.parcelize
   alias libs.plugins.anvil
+  // needed for the stability of various model classes
+  alias libs.plugins.compose.compiler
 }
 
 anvil {
@@ -20,6 +22,8 @@ dependencies {
   implementation libs.androidx.annotation
   implementation libs.kotlinx.coroutines.core
   implementation libs.okio
+  // required whenever we include the compiler plugin
+  implementation libs.compose.runtime
 
   testImplementation libs.junit
   testImplementation libs.truth

common/data/build.gradle

@@ -2,6 +2,8 @@ plugins {
   id 'quran.android.library'
   alias libs.plugins.anvil
   alias libs.plugins.ksp
+  // needed for the stability of various model classes
+  alias libs.plugins.compose.compiler
 }
 
 anvil {
@@ -15,6 +17,9 @@ dependencies {
   implementation libs.kotlinx.coroutines.core
   implementation libs.kotlinx.coroutines.android
 
+  // required whenever we include the compiler plugin
+  implementation libs.compose.runtime
+
   // dagger
   implementation libs.dagger.runtime
 

feature/downloadmanager/build.gradle.kts

@@ -34,6 +34,9 @@ dependencies {
   implementation(libs.compose.ui.tooling.preview)
   debugImplementation(libs.compose.ui.tooling)
 
+  // immutable collections
+  implementation(libs.kotlinx.collections.immutable)
+
   // coroutines
   implementation(libs.kotlinx.coroutines.core)
   implementation(libs.kotlinx.coroutines.android)

feature/downloadmanager/src/main/kotlin/com/quran/mobile/feature/downloadmanager/AudioManagerActivity.kt

@@ -19,6 +19,7 @@ import com.quran.mobile.feature.downloadmanager.presenter.AudioManagerPresenter
 import com.quran.mobile.feature.downloadmanager.ui.common.DownloadManagerToolbar
 import com.quran.mobile.feature.downloadmanager.ui.LoadingIndicator
 import com.quran.mobile.feature.downloadmanager.ui.ShuyookhList
+import kotlinx.collections.immutable.persistentListOf
 import javax.inject.Inject
 
 
@@ -38,7 +39,7 @@ class AudioManagerActivity : ComponentActivity() {
       audioManagerPresenter.downloadedShuyookh { QariItem.fromQari(this, it) }
 
     setContent {
-      val downloadedShuyookhState = downloadedShuyookhFlow.collectAsState(emptyList())
+      val downloadedShuyookhState = downloadedShuyookhFlow.collectAsState(persistentListOf())
       QuranTheme {
         Column(modifier = Modifier
           .background(MaterialTheme.colorScheme.surface)

feature/downloadmanager/src/main/kotlin/com/quran/mobile/feature/downloadmanager/presenter/AudioManagerPresenter.kt

@@ -5,9 +5,11 @@ import com.quran.data.model.audio.Qari
 import com.quran.labs.androidquran.common.audio.cache.QariDownloadInfoManager
 import com.quran.labs.androidquran.common.audio.model.QariItem
 import com.quran.mobile.feature.downloadmanager.model.DownloadedSheikhUiModel
-import javax.inject.Inject
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import javax.inject.Inject
 
 @ActivityScope
 class AudioManagerPresenter @Inject constructor(
@@ -16,7 +18,7 @@ class AudioManagerPresenter @Inject constructor(
 
   fun downloadedShuyookh(
     lambda: ((Qari) -> QariItem)
-  ): Flow<List<DownloadedSheikhUiModel>> {
+  ): Flow<ImmutableList<DownloadedSheikhUiModel>> {
     return qariDownloadInfoManager.downloadQariInfoFilteringNonDownloadedGappedQaris()
       .map { qariDownloadInfoList ->
         qariDownloadInfoList
@@ -28,5 +30,6 @@ class AudioManagerPresenter @Inject constructor(
           }
           .sortedBy { it.qariItem.name }
       }
+      .map { it.toImmutableList() }
   }
 }

feature/downloadmanager/src/main/kotlin/com/quran/mobile/feature/downloadmanager/ui/ShuyookhList.kt

@@ -7,10 +7,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.quran.labs.androidquran.common.audio.model.QariItem
 import com.quran.mobile.feature.downloadmanager.model.DownloadedSheikhUiModel
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun ShuyookhList(
-  shuyookh: List<DownloadedSheikhUiModel>,
+  shuyookh: ImmutableList<DownloadedSheikhUiModel>,
   onQariItemClicked: ((QariItem) -> Unit)
 ) {
   Column(modifier = Modifier.verticalScroll(rememberScrollState())) {

feature/qarilist/build.gradle

@@ -29,6 +29,9 @@ dependencies {
   implementation libs.compose.ui.tooling.preview
   debugImplementation libs.compose.ui.tooling
 
+  // immutable collections
+  implementation libs.kotlinx.collections.immutable
+
   // coroutines
   implementation libs.kotlinx.coroutines.core
   implementation libs.kotlinx.coroutines.android

feature/qarilist/src/main/kotlin/com/quran/mobile/feature/qarilist/QariListWrapper.kt

@@ -36,6 +36,7 @@ import com.quran.labs.androidquran.common.ui.core.QuranTheme
 import com.quran.mobile.feature.qarilist.di.QariListWrapperInjector
 import com.quran.mobile.feature.qarilist.presenter.QariListPresenter
 import com.quran.mobile.feature.qarilist.ui.QariList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -76,7 +77,7 @@ class QariListWrapper(
     )
     val qariListFlow =
       qariListPresenter.qariList(startAyah, endAyah) { QariItem.fromQari(context, it) }
-    val qariListState = qariListFlow.collectAsState(emptyList())
+    val qariListState = qariListFlow.collectAsState(persistentListOf())
     val currentQariFlow = currentQariManager.flow()
     val currentQariState = currentQariFlow.collectAsState(null)
 

feature/qarilist/src/main/kotlin/com/quran/mobile/feature/qarilist/presenter/QariListPresenter.kt

@@ -5,18 +5,21 @@ import com.quran.data.model.SuraAyah
 import com.quran.data.model.audio.Qari
 import com.quran.labs.androidquran.common.audio.cache.QariDownloadInfoManager
 import com.quran.labs.androidquran.common.audio.extension.isRangeDownloaded
-import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo
 import com.quran.labs.androidquran.common.audio.model.QariItem
+import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo
 import com.quran.mobile.feature.qarilist.R
 import com.quran.mobile.feature.qarilist.model.QariUiModel
-import javax.inject.Inject
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import javax.inject.Inject
 
 @ActivityScope
 class QariListPresenter @Inject constructor(private val qariDownloadInfoManager: QariDownloadInfoManager) {
 
-  fun qariList(start: SuraAyah, end: SuraAyah, qariTranslationLambda: ((Qari) -> QariItem)): Flow<List<QariUiModel>> {
+  fun qariList(start: SuraAyah, end: SuraAyah, qariTranslationLambda: (
+    (Qari) -> QariItem)): Flow<ImmutableList<QariUiModel>> {
     return qariDownloadInfoManager.downloadQariInfoFilteringNonDownloadedGappedQaris()
       .map { unsortedQariList ->
         val readyToPlay = unsortedQariList.filter { it.isRangeDownloaded(start, end) }
@@ -32,6 +35,7 @@ class QariListPresenter @Inject constructor(private val qariDownloadInfoManager:
             gapless.map { QariUiModel(it, R.string.qarilist_gapless) } +
             gapped.map { QariUiModel(it, R.string.qarilist_gapped) }
       }
+      .map { it.toImmutableList() }
   }
 
   private fun List<QariDownloadInfo>.toSortedQariItemList(lambda: ((Qari) -> QariItem)): List<QariItem> {

feature/qarilist/src/main/kotlin/com/quran/mobile/feature/qarilist/ui/QariList.kt

@@ -6,10 +6,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.quran.labs.androidquran.common.audio.model.QariItem
 import com.quran.mobile.feature.qarilist.model.QariUiModel
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun QariList(
-  qaris: List<QariUiModel>,
+  qaris: ImmutableList<QariUiModel>,
   selectedQariId: Int,
   onQariSelected: ((QariItem) -> Unit),
   modifier: Modifier = Modifier

gradle/libs.versions.toml

@@ -16,6 +16,7 @@ dnsjavaVersion = "2.1.9"
 errorprone = "3.1.0"
 errorproneCoreVersion = "2.28.0"
 googleServices = "4.4.2"
+immutableCollectionsVersion = "0.3.7"
 leakcanaryAndroidVersion = "2.14"
 moshiVersion = "1.15.1"
 okioVersion = "3.9.0"
@@ -74,11 +75,11 @@ turbineVersion = "1.1.0"
 [libraries]
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutinesVersion" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
+kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "immutableCollectionsVersion" }
 
 # required within the Gradle convention plugins - not unused
 okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttpBomVersion" }
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" }
-compose-runtime = { module = "androidx.compose.runtime:runtime" }
 
 # androidx
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppcompatVersion" }
@@ -103,6 +104,7 @@ compose-animation = { module = "androidx.compose.animation:animation" }
 compose-material = { module = "androidx.compose.material:material" }
 compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
 compose-material-icons = { module = "androidx.compose.material:material-icons-extended" }
+compose-runtime = { module = "androidx.compose.runtime:runtime" }
 compose-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }