🔧 fixed review errors

Author: shub39

.github/workflows/beta.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    if: startsWith(github.event.head_commit.message, '[beta]')
+    if: github.event_name == 'workflow_dispatch' || startsWith(github.event.head_commit.message, '[beta]')
     runs-on: ubuntu-latest
     env:
       VERSION: $( echo ${{ github.event.head_commit.id }} | cut -c1-7 )

app/src/main/java/com/shub39/rush/presentation/lyrics/component/customisation/LyricsCustomisationSettings.kt

@@ -101,12 +101,7 @@ fun LazyListScope.lyricsCustomisationSettings(
                 ListItem(
                     colors = listItemColors(),
                     modifier = Modifier.clip(middleItemShape()),
-                    headlineContent = {
-                        Text(
-                            text = stringResource(R.string.blur_synced),
-                            modifier = Modifier.weight(1f),
-                        )
-                    },
+                    headlineContent = { Text(text = stringResource(R.string.blur_synced)) },
                     trailingContent = {
                         Switch(
                             checked = state.blurSyncedLyrics,

app/src/main/java/com/shub39/rush/presentation/setting/component/AboutApp.kt

@@ -89,7 +89,7 @@ fun AboutApp() {
                     )
                 }
 
-                IconButton(onClick = { uriHandler.openUri("https://github.com/shub39/Grit") }) {
+                IconButton(onClick = { uriHandler.openUri("https://github.com/shub39/Rush") }) {
                     Icon(
                         painter = painterResource(R.drawable.github),
                         contentDescription = "Github",
@@ -139,7 +139,7 @@ fun AboutApp() {
                             shape = middleItemShape(),
                         )
                         .clip(middleItemShape())
-                        .clickable { uriHandler.openUri("https://hosted.weblate.org/engage/grit/") }
+                        .clickable { uriHandler.openUri("https://hosted.weblate.org/engage/rush/") }
             ) {
                 Row(
                     modifier = Modifier.fillMaxWidth().padding(16.dp),
@@ -170,7 +170,7 @@ fun AboutApp() {
                         .clip(endItemShape())
                         .clickable {
                             uriHandler.openUri(
-                                "https://play.google.com/store/apps/details?id=com.shub39.grit"
+                                "https://play.google.com/store/apps/details?id=com.shub39.rush.play"
                             )
                         }
             ) {

app/src/main/java/com/shub39/rush/presentation/share/component/SharePageSheet.kt

@@ -238,9 +238,9 @@ fun SharePageSheet(
                     modifier = Modifier.clip(endItemShape()),
                     headlineContent = {
                         Text(
-                            text = "Show Rush Branding",
+                            text = stringResource(R.string.show_app_branding),
                             maxLines = 1,
-                            modifier = Modifier.basicMarquee().weight(1f),
+                            modifier = Modifier.basicMarquee(),
                         )
                     },
                     trailingContent = {

app/src/main/java/com/shub39/rush/viewmodels/SearchSheetVM.kt

@@ -33,6 +33,7 @@ import com.shub39.rush.presentation.searchsheet.SearchSheetAction
 import com.shub39.rush.presentation.searchsheet.SearchSheetState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -52,6 +53,7 @@ import org.koin.android.annotation.KoinViewModel
 @KoinViewModel
 class SearchSheetVM(private val stateLayer: SharedStates, private val repo: SongRepository) :
     ViewModel() {
+    private var searchStateResetJob: Job? = null
 
     private val _state = stateLayer.searchSheetState
     private val _lastSearched = MutableStateFlow("")
@@ -163,13 +165,17 @@ class SearchSheetVM(private val stateLayer: SharedStates, private val repo: Song
                 it.copy(searchState = SearchState.UserPrompt, sync = false)
             }
 
-            delay(5000)
+            searchStateResetJob?.cancel()
+            searchStateResetJob =
+                viewModelScope.launch {
+                    delay(5000)
 
-            stateLayer.lyricsState.update {
-                if (it.searchState == SearchState.UserPrompt)
-                    it.copy(searchState = SearchState.Idle)
-                else it
-            }
+                    stateLayer.lyricsState.update {
+                        if (it.searchState == SearchState.UserPrompt)
+                            it.copy(searchState = SearchState.Idle)
+                        else it
+                    }
+                }
         }
     }
 

app/src/main/res/values/strings.xml

@@ -150,4 +150,5 @@
     <string name="looks">Looks</string>
     <string name="text">Text</string>
     <string name="others">Others</string>
+    <string name="show_app_branding">Show App Branding</string>
 </resources>