Fix dialog theme and tidy up settings

Author: m4pl

app/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
     alias(libs.plugins.detekt)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin.compose)
-    alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.ksp)
 }
 
@@ -92,7 +91,6 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.palette)
     implementation(libs.androidx.swiperefreshlayout)
-    implementation(libs.accompanist.drawablepainter)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.activity.compose)

build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.compose) apply false
-    alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.ktlint)

gradle/libs.versions.toml

@@ -17,7 +17,6 @@ guava = "33.6.0-android"
 material = "1.14.0"
 palette = "1.0.0"
 swiperefreshlayout = "1.2.0"
-accompanist = "0.37.3"
 
 junit4 = "4.13.2"
 mockk = "1.14.11"
@@ -46,7 +45,6 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
 
 androidx-palette = { module = "androidx.palette:palette", version.ref = "palette" }
 androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
-accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" }
 
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 
@@ -83,6 +81,5 @@ detekt = { id = "dev.detekt", version.ref = "detekt" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" }

lint-baseline.xml

@@ -23,17 +23,6 @@
             column="17"/>
     </issue>
 
-    <issue
-        id="GestureBackNavigation"
-        message="`onBackPressed` is no longer called for back gestures; migrate to AndroidX's backward compatible `OnBackPressedDispatcher`"
-        errorLine1="    public void onBackPressed() {"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="packages/apps/Contacts/src/com/android/contacts/preference/ContactsPreferenceActivity.java"
-            line="189"
-            column="17"/>
-    </issue>
-
     <issue
         id="GestureBackNavigation"
         message="`onBackPressed` is no longer called for back gestures; migrate to AndroidX's backward compatible `OnBackPressedDispatcher`"

res/values/styles.xml

@@ -16,7 +16,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
            xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.Compose" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Compose" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="alertDialogTheme">@style/ContactsAlertDialogThemeAppCompat</item>
+    </style>
 
     <style name="EditorActivityTheme" parent="@style/PeopleActivityTheme">
         <item name="actionBarStyle">@style/EditorActionBarStyle</item>

src/com/android/contacts/ui/settings/about/AboutScreen.kt

@@ -9,8 +9,11 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalLayoutDirection
@@ -26,6 +29,7 @@ import com.android.contacts.ui.settings.common.SettingsCell
 import com.android.contacts.ui.settings.common.SettingsTopAppBar
 import com.android.contacts.ui.settings.screen.model.ABOUT_BUILD_VERSION_TEST_TAG
 import com.android.contacts.ui.settings.screen.model.ABOUT_LICENSES_TEST_TAG
+import com.android.contacts.ui.settings.screen.model.SETTINGS_SNACKBAR_TEST_TAG
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -35,6 +39,7 @@ internal fun AboutScreen(
     onLicensesClick: () -> Unit,
     onNavigateBack: () -> Unit,
     modifier: Modifier = Modifier,
+    snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
 ) {
     val layoutDirection = LocalLayoutDirection.current
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -47,6 +52,12 @@ internal fun AboutScreen(
                 scrollBehavior = scrollBehavior,
             )
         },
+        snackbarHost = {
+            SnackbarHost(
+                hostState = snackbarHostState,
+                modifier = Modifier.testTag(SETTINGS_SNACKBAR_TEST_TAG),
+            )
+        },
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
     ) { contentPadding ->
         Column(

src/com/android/contacts/ui/settings/screen/SettingsNavHost.kt

@@ -59,6 +59,7 @@ internal fun SettingsNavHost(
                         onBuildVersionLongClick = { onAction(Action.BuildVersionLongClicked) },
                         onLicensesClick = { onAction(Action.LicensesClicked) },
                         onNavigateBack = { route = SettingsNavRoute.Main },
+                        snackbarHostState = snackbarHostState,
                     )
                 }
             }

src/com/android/contacts/ui/settings/screen/SettingsViewModel.kt

@@ -25,6 +25,8 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -64,7 +66,7 @@ internal class SettingsViewModel @Inject constructor(
     private val profile: StateFlow<ProfileData?> = profileRepository.observeProfile()
         .stateIn(
             scope = viewModelScope,
-            started = SharingStarted.Eagerly,
+            started = SharingStarted.WhileSubscribed(STATE_STOP_TIMEOUT_MILLIS),
             initialValue = null,
         )
 
@@ -146,16 +148,18 @@ internal class SettingsViewModel @Inject constructor(
     }
 
     private fun openProfile() {
-        val contactId = profile.value
-            ?.takeIf { it.hasProfile }
-            ?.contactId
+        viewModelScope.launch {
+            val contactId = profile.filterNotNull().first()
+                .takeIf { it.hasProfile }
+                ?.contactId
 
-        val effect = when (contactId) {
-            null -> Effect.CreateProfile
-            else -> Effect.OpenProfile(contactId)
-        }
+            val effect = when (contactId) {
+                null -> Effect.CreateProfile
+                else -> Effect.OpenProfile(contactId)
+            }
 
-        emitEffect(effect)
+            emitEffect(effect)
+        }
     }
 
     private fun selectSortOrder(sortOrder: SortOrder) {