#1846 feat: do not pulse the new key map button after it has been clicked

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/home/HomeKeyMapListScreen.kt

@@ -152,10 +152,6 @@ fun HomeKeyMapListScreen(
 
     var keyMapListBottomPadding by remember { mutableStateOf(100.dp) }
 
-    // Check if the list is empty to trigger pulsing animation
-    val isListEmpty = state.listItems is State.Data &&
-        (state.listItems as State.Data<List<KeyMapListItemModel>>).data.isEmpty()
-
     HomeKeyMapListScreen(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         snackbarState = snackbarState,
@@ -169,7 +165,7 @@ fun HomeKeyMapListScreen(
                     modifier = Modifier
                         .padding(bottom = fabBottomPadding)
                         .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.End)),
-                    pulse = isListEmpty,
+                    pulse = state.showCreateKeyMapTapTarget,
                     showFabText = viewModel.showFabText,
                     text = stringResource(R.string.home_fab_new_key_map),
                     onClick = viewModel::onNewKeyMapClick,

base/src/main/java/io/github/sds100/keymapper/base/home/KeyMapListState.kt

@@ -6,4 +6,5 @@ import io.github.sds100.keymapper.common.utils.State
 data class KeyMapListState(
     val appBarState: KeyMapAppBarState,
     val listItems: State<List<KeyMapListItemModel>>,
+    val showCreateKeyMapTapTarget: Boolean,
 )

base/src/main/java/io/github/sds100/keymapper/base/home/KeyMapListViewModel.kt

@@ -17,6 +17,7 @@ import io.github.sds100.keymapper.base.groups.GroupFamily
 import io.github.sds100.keymapper.base.groups.GroupListItemModel
 import io.github.sds100.keymapper.base.keymaps.KeyMap
 import io.github.sds100.keymapper.base.keymaps.PauseKeyMapsUseCase
+import io.github.sds100.keymapper.base.onboarding.OnboardingTapTarget
 import io.github.sds100.keymapper.base.onboarding.OnboardingUseCase
 import io.github.sds100.keymapper.base.onboarding.SetupAccessibilityServiceDelegate
 import io.github.sds100.keymapper.base.sorting.SortKeyMapsUseCase
@@ -120,6 +121,7 @@ class KeyMapListViewModel(
                 isPaused = false,
             ),
             listItems = State.Loading,
+            showCreateKeyMapTapTarget = false
         )
     private val _state: MutableStateFlow<KeyMapListState> = MutableStateFlow(initialState)
     val state = _state.asStateFlow()
@@ -311,13 +313,22 @@ class KeyMapListViewModel(
                 }
             }
 
+        val showCreateKeyMapTapTarget = combine(
+            onboarding.showTapTarget(OnboardingTapTarget.CREATE_KEY_MAP),
+            onboarding.showWhatsNew,
+        ) { showTapTarget, showWhatsNew ->
+            // Only show the tap target if whats new is not showing.
+            showTapTarget && !showWhatsNew
+        }
+
         coroutineScope.launch {
             combine(
                 listItemStateFlow,
                 appBarStateFlow,
-            ) { listState, appBarState ->
-                Pair(listState, appBarState)
-            }.collectLatest { (listState, appBarState) ->
+                showCreateKeyMapTapTarget
+            ) { listState, appBarState, showCreateKeyMapTapTarget ->
+                Triple(listState, appBarState, showCreateKeyMapTapTarget)
+            }.collectLatest { (listState, appBarState, showCreateKeyMapTapTarget) ->
                 listState.ifIsData { list ->
                     if (list.isNotEmpty()) {
                         showFabText = false
@@ -328,6 +339,7 @@ class KeyMapListViewModel(
                     KeyMapListState(
                         appBarState,
                         listState,
+                        showCreateKeyMapTapTarget
                     )
             }
         }
@@ -853,6 +865,8 @@ class KeyMapListViewModel(
     }
 
     fun onNewKeyMapClick() {
+        onboarding.completedTapTarget(OnboardingTapTarget.CREATE_KEY_MAP)
+
         coroutineScope.launch {
             val groupUid = listKeyMaps.keyMapGroup.first().group?.uid
 

base/src/main/java/io/github/sds100/keymapper/base/onboarding/OnboardingTapTarget.kt

@@ -2,5 +2,6 @@ package io.github.sds100.keymapper.base.onboarding
 
 enum class OnboardingTapTarget(
 ) {
+    CREATE_KEY_MAP,
     CHOOSE_ACTION,
 }

base/src/main/java/io/github/sds100/keymapper/base/onboarding/OnboardingUseCase.kt

@@ -102,6 +102,7 @@ class OnboardingUseCaseImpl @Inject constructor(
     private fun getTapTargetKey(tapTarget: OnboardingTapTarget): Preferences.Key<Boolean> {
         return when (tapTarget) {
             OnboardingTapTarget.CHOOSE_ACTION -> Keys.shownTapTargetChooseAction
+            OnboardingTapTarget.CREATE_KEY_MAP -> Keys.shownTapTargetCreateKeyMap
         }
     }
 }

base/src/main/java/io/github/sds100/keymapper/base/shortcuts/CreateKeyMapShortcutScreen.kt

@@ -377,6 +377,7 @@ private fun PreviewRootGroup() {
                     isPaused = true,
                 ),
                 listItems = State.Data(keyMapSampleList()),
+                showCreateKeyMapTapTarget = false
             ),
             showShortcutNameDialog = null,
         )
@@ -401,6 +402,7 @@ private fun PreviewChildGroup() {
                     keyMapsEnabled = null,
                 ),
                 listItems = State.Data(keyMapSampleList()),
+                showCreateKeyMapTapTarget = false
             ),
             showShortcutNameDialog = null,
         )
@@ -419,6 +421,7 @@ private fun PreviewEmpty() {
                     isPaused = true,
                 ),
                 listItems = State.Data(emptyList()),
+                showCreateKeyMapTapTarget = false
             ),
             showShortcutNameDialog = null,
         )

base/src/main/java/io/github/sds100/keymapper/base/shortcuts/CreateKeyMapShortcutViewModel.kt

@@ -62,6 +62,7 @@ class CreateKeyMapShortcutViewModel @Inject constructor(
             isPaused = false,
         ),
         listItems = State.Loading,
+        showCreateKeyMapTapTarget = false
     )
     private val _state: MutableStateFlow<KeyMapListState> = MutableStateFlow(initialState)
     val state = _state.asStateFlow()
@@ -156,7 +157,7 @@ class CreateKeyMapShortcutViewModel @Inject constructor(
             )
         }
 
-        return KeyMapListState(appBarState, listItemsState)
+        return KeyMapListState(appBarState, listItemsState, showCreateKeyMapTapTarget = false)
     }
 
     fun onKeyMapCardClick(uid: String) {