Minor UI fixes

aleksey-saenko · Sep 24, 2024 · 6e83a1c · 6e83a1c
1 parent 829f28c
commit 6e83a1c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/compose_compiler_config.conf b/compose_compiler_config.conf
@@ -5,3 +5,6 @@ java.time.LocalDateTime
 java.time.LocalTime
 java.time.ZonedDateTime
 kotlin.time.Duration
+
+android.net.Uri
+java.io.File
diff --git a/...p/musicrecognizer/feature/recognition/presentation/recognitionscreen/RecognitionScreen.kt b/...p/musicrecognizer/feature/recognition/presentation/recognitionscreen/RecognitionScreen.kt
@@ -132,16 +132,14 @@ internal fun RecognitionScreen(
                     .padding(8.dp)
             )
         }
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState()),
-            contentAlignment = Alignment.Center
-        ) {
+        Box {
             AnimatedVisibility(
                 visible = recognizeStatus.isNotDone(),
                 enter = enterTransitionButton,
                 exit = exitTransitionButton,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .verticalScroll(rememberScrollState()),
             ) {
                 RecognitionButtonWithTitle(
                     title = getButtonTitle(recognizeStatus, autostart),
@@ -296,16 +294,22 @@ internal fun RecognitionScreen(
 
         // optional vibration effect
         if (preferences.vibrateOnResult()) {
+            val vibrated = rememberSaveable { mutableStateOf(false) }
             LaunchedEffect(recognizeStatus) {
                 val status = recognizeStatus
-                if (status !is RecognitionStatus.Done) return@LaunchedEffect
+                if (status !is RecognitionStatus.Done) {
+                    vibrated.value = false
+                    return@LaunchedEffect
+                }
+                if (vibrated.value) return@LaunchedEffect
                 when (status.result) {
                     is RecognitionResult.ScheduledOffline,
                     is RecognitionResult.Success -> viewModel.vibrateResult(true)
 
                     is RecognitionResult.Error,
                     is RecognitionResult.NoMatches -> viewModel.vibrateResult(false)
                 }
+                vibrated.value = true
             }
         }
     }

diff --git a/.../musicrecognizer/feature/recognition/presentation/recognitionscreen/shields/BaseShield.kt b/.../musicrecognizer/feature/recognition/presentation/recognitionscreen/shields/BaseShield.kt
@@ -36,7 +36,7 @@ internal fun AnimatedVisibilityScope.BaseShield(
     onDismissClick: () -> Unit,
     content: @Composable ColumnScope.() -> Unit
 ) {
-    Surface {
+    Surface(modifier = modifier) {
         Box {
             FilledTonalIconButton(
                 onClick = onDismissClick,
@@ -68,7 +68,7 @@ internal fun AnimatedVisibilityScope.BaseShield(
                 )
             }
             Column(
-                modifier = modifier
+                modifier = Modifier
                     .fillMaxSize()
                     .verticalScroll(rememberScrollState())
                     .padding(24.dp)