Add delay after notification shade collapse

Author: vamsi3

app/build.gradle.kts

@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         applicationId = "com.vamsi3.android.screentranslator"
-        versionCode = 4
-        versionName = "0.0.4"
+        versionCode = 5
+        versionName = "0.0.5"
     }
 
     buildTypes {
@@ -26,12 +26,13 @@ android {
 }
 
 dependencies {
-    implementation(project(":core:ui"))
+    implementation(project(":core:model"))
     implementation(project(":core:resource"))
+    implementation(project(":core:ui"))
     implementation(project(":feature:settings"))
     implementation(project(":feature:translate"))
-    implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.compose.material.icons)
     implementation(libs.androidx.core.splashscreen)
+    implementation(libs.androidx.hilt.navigation.compose)
 }

app/src/main/java/com/vamsi3/android/screentranslator/MainActivity.kt

@@ -5,6 +5,7 @@ import android.content.ComponentName
 import android.graphics.drawable.Icon
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
@@ -15,26 +16,31 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import com.vamsi3.android.screentranslator.core.data.model.ThemeMode
+import com.vamsi3.android.screentranslator.core.data.model.TranslateApp
 import com.vamsi3.android.screentranslator.core.ui.HomeScreen
 import com.vamsi3.android.screentranslator.feature.translate.ScreenTranslatorTileService
 import com.vamsi3.android.screentranslator.core.resource.R
+import com.vamsi3.android.screentranslator.feature.settings.SettingsData
 import com.vamsi3.android.screentranslator.feature.settings.SettingsUiState
 import com.vamsi3.android.screentranslator.feature.settings.SettingsUiState.Loading
 import com.vamsi3.android.screentranslator.feature.settings.SettingsUiState.Success
 import com.vamsi3.android.screentranslator.feature.settings.SettingsViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.onEmpty
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-    val viewModel: SettingsViewModel by viewModels()
+    private val viewModel: SettingsViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
 
+        val splashScreen = installSplashScreen()
+
         var uiState: SettingsUiState by mutableStateOf(Loading)
 
         lifecycleScope.launch {
@@ -46,12 +52,7 @@ class MainActivity : ComponentActivity() {
             }
         }
 
-        splashScreen.setKeepOnScreenCondition {
-            when (uiState) {
-                Loading -> true
-                is Success -> false
-            }
-        }
+        splashScreen.setKeepOnScreenCondition { uiState == Loading }
 
         setContent {
             HomeScreen()

build-logic/convention/src/main/kotlin/com/vamsi3/android/screentranslator/buildlogic/KotlinAndroid.kt

@@ -37,6 +37,7 @@ internal fun Project.configureKotlinAndroid(
                 "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
                 "-opt-in=kotlinx.coroutines.FlowPreview",
                 "-opt-in=kotlin.Experimental",
+                "-opt-in=kotlin.time.ExperimentalTime",
             )
             jvmTarget = JavaVersion.VERSION_11.toString()
         }

core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/OfflineFirstUserDataRepository.kt

@@ -18,4 +18,7 @@ class OfflineFirstUserDataRepository @Inject constructor(
     override suspend fun setTranslateApp(translateApp: TranslateApp) =
         userPreferencesDataSource.setTranslateApp(translateApp)
 
+    override suspend fun setNotificationShadeCollapseDelayDuration(notificationShadeCollapseDelayDuration: Duration) =
+        userPreferencesDataSource.setNotificationShadeCollapseDelayDuration(notificationShadeCollapseDelayDuration)
+
 }

core/data/src/main/java/com/vamsi3/android/screentranslator/core/data/repository/UserDataRepository.kt

@@ -3,13 +3,16 @@ package com.vamsi3.android.screentranslator.core.data.repository
 import com.vamsi3.android.screentranslator.core.data.model.ThemeMode
 import com.vamsi3.android.screentranslator.core.data.model.TranslateApp
 import com.vamsi3.android.screentranslator.core.data.model.UserData
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import kotlin.time.Duration
 
 interface UserDataRepository {
-    val userData: StateFlow<UserData>
+    val userData: StateFlow<UserData?>
 
     suspend fun setThemeMode(themeMode: ThemeMode)
 
     suspend fun setTranslateApp(translateApp: TranslateApp)
+
+    suspend fun setNotificationShadeCollapseDelayDuration(notificationShadeCollapseDelayDuration: Duration)
 }

core/datastore/src/main/java/com/vamsi3/android/screentranslator/core/datastore/UserPreferencesDataSource.kt

@@ -1,5 +1,6 @@
 package com.vamsi3.android.screentranslator.core.datastore
 
+import android.util.Log
 import androidx.datastore.core.DataStore
 import com.vamsi3.android.screentranslator.core.data.model.ThemeMode
 import com.vamsi3.android.screentranslator.core.data.model.TranslateApp
@@ -11,14 +12,15 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.milliseconds
 
 class UserPreferencesDataSource @Inject constructor(
     private val userPreferencesProto: DataStore<UserPreferencesProto>,
 ) {
     val userData = userPreferencesProto.data
         .map {
             UserData(
+                notificationShadeCollapseDelayDuration = it.notificationShadeCollapseDelayMilliseconds.milliseconds,
                 themeMode = when(it.userThemePreference) {
                     null,
                     UserThemePreferenceProto.UNRECOGNIZED,
@@ -37,10 +39,20 @@ class UserPreferencesDataSource @Inject constructor(
                 },
             )
         }
-        .stateIn(CoroutineScope(Dispatchers.IO), SharingStarted.Eagerly, UserData(
-            ThemeMode.SYSTEM,
-            TranslateApp.GOOGLE_LENS
-        ))
+        .stateIn(
+            scope = CoroutineScope(Dispatchers.IO),
+            started = SharingStarted.Eagerly,
+            initialValue = null
+        )
+
+    suspend fun setNotificationShadeCollapseDelayDuration(notificationShadeCollapseDelayDuration: Duration) {
+        userPreferencesProto.updateData {
+            it.copy {
+                Log.i("ScreenTranslator", "updating to $notificationShadeCollapseDelayDuration")
+                this.notificationShadeCollapseDelayMilliseconds = notificationShadeCollapseDelayDuration.inWholeMilliseconds.toInt()
+            }
+        }
+    }
 
     suspend fun setThemeMode(themeMode: ThemeMode) {
         userPreferencesProto.updateData {

core/datastore/src/main/proto/com/vamsi3/android/screentranslator/core/datastore/user_preferences.proto

@@ -7,6 +7,7 @@ option java_package = "com.vamsi3.android.screentranslator.core.datastore";
 option java_multiple_files = true;
 
 message UserPreferencesProto {
+    int32 notification_shade_collapse_delay_milliseconds = 2;
     UserThemePreferenceProto user_theme_preference = 3;
     UserTranslateAppPreferenceProto user_translate_app_preference = 4;
 }

core/model/src/main/java/com/vamsi3/android/screentranslator/core/data/model/ThemeMode.kt

@@ -5,5 +5,9 @@ enum class ThemeMode(
 ) {
     SYSTEM("System"),
     LIGHT("Light"),
-    DARK("Dark")
+    DARK("Dark");
+
+    companion object {
+        val default = SYSTEM
+    }
 }

core/model/src/main/java/com/vamsi3/android/screentranslator/core/data/model/TranslateApp.kt

@@ -7,5 +7,9 @@ enum class TranslateApp(
 ) {
     GOOGLE_LENS("Google Lens", "com.google.ar.lens", "com.google.vr.apps.ornament.app.lens.LensLauncherActivity"),
     NAVER_PAPAGO("Naver Papago", "com.naver.labs.translator", "com.naver.labs.translator.ui.main.DeepLinkActivity"),
-    DEEPL_TRANSLATE("DeepL Translate", "com.deepl.mobiletranslator", "com.deepl.mobiletranslator.MainActivity"),
+    DEEPL_TRANSLATE("DeepL Translate", "com.deepl.mobiletranslator", "com.deepl.mobiletranslator.MainActivity");
+
+    companion object {
+        val default = GOOGLE_LENS
+    }
 }

core/model/src/main/java/com/vamsi3/android/screentranslator/core/data/model/UserData.kt

@@ -6,6 +6,7 @@ import kotlin.time.Duration
  * Class summarizing user interest data
  */
 data class UserData(
+    val notificationShadeCollapseDelayDuration: Duration,
     val themeMode: ThemeMode,
     val translateApp: TranslateApp,
 )

core/ui/src/main/java/com/vamsi3/android/screentranslator/core/ui/HomeScreen.kt

@@ -1,5 +1,6 @@
 package com.vamsi3.android.screentranslator.core.ui
 
+import android.util.Log
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -10,20 +11,32 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.vamsi3.android.screentranslator.core.data.model.ThemeMode
+import com.vamsi3.android.screentranslator.core.data.model.TranslateApp
 import com.vamsi3.android.screentranslator.core.design.theme.ScreenTranslatorTheme
 import com.vamsi3.android.screentranslator.core.design.util.ThemePreviews
 import com.vamsi3.android.screentranslator.core.resource.R
+import com.vamsi3.android.screentranslator.feature.settings.SettingsData
 import com.vamsi3.android.screentranslator.feature.settings.SettingsScreen
 import com.vamsi3.android.screentranslator.feature.settings.SettingsUiState
+import com.vamsi3.android.screentranslator.feature.settings.SettingsUiState.Loading
+import com.vamsi3.android.screentranslator.feature.settings.SettingsUiState.Success
 import com.vamsi3.android.screentranslator.feature.settings.SettingsViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.onEmpty
+import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
@@ -32,15 +45,16 @@ fun HomeScreen(
 ) {
     val settingsUiState by viewModel.uiState.collectAsStateWithLifecycle()
 
+
     when (settingsUiState) {
-        SettingsUiState.Loading -> {
+        Loading -> {
             Text(
                 text = "Loading...",
                 modifier = Modifier.padding(vertical = 16.dp)
             )
         }
-        is SettingsUiState.Success -> {
-            val darkTheme = when ((settingsUiState as SettingsUiState.Success).settingsData.themeMode) {
+        is Success -> {
+            val darkTheme = when ((settingsUiState as Success).settingsData.themeMode) {
                 ThemeMode.SYSTEM -> isSystemInDarkTheme()
                 ThemeMode.LIGHT -> false
                 ThemeMode.DARK -> true