feat: complete the new advanced triggers screen

Author: sds100

app/src/main/java/io/github/sds100/keymapper/MainFragment.kt

@@ -154,6 +154,7 @@ class MainFragment : Fragment() {
 
             backStackEntry.handleRouteArgs<NavDestination.NewKeyMap> { args ->
                 keyMapViewModel.loadNewKeyMap(groupUid = args.groupUid)
+                args.triggerSetupShortcut?.let { triggerViewModel.showTriggerSetup(it) }
             }
 
             ConfigKeyMapScreen(

app/src/main/java/io/github/sds100/keymapper/trigger/ConfigTriggerViewModel.kt

@@ -12,9 +12,7 @@ import io.github.sds100.keymapper.base.trigger.ConfigTriggerUseCase
 import io.github.sds100.keymapper.base.trigger.RecordTriggerController
 import io.github.sds100.keymapper.base.trigger.TriggerSetupDelegate
 import io.github.sds100.keymapper.base.trigger.TriggerSetupShortcut
-import io.github.sds100.keymapper.base.utils.navigation.NavDestination
 import io.github.sds100.keymapper.base.utils.navigation.NavigationProvider
-import io.github.sds100.keymapper.base.utils.navigation.navigate
 import io.github.sds100.keymapper.base.utils.ui.DialogProvider
 import io.github.sds100.keymapper.base.utils.ui.ResourceProvider
 import kotlinx.coroutines.launch
@@ -53,7 +51,7 @@ class ConfigTriggerViewModel @Inject constructor(
     override fun showTriggerSetup(shortcut: TriggerSetupShortcut) {
         when (shortcut) {
             TriggerSetupShortcut.ASSISTANT -> viewModelScope.launch {
-                navigate("purchase_assistant_trigger", NavDestination.AdvancedTriggers)
+                navigateToAdvancedTriggers("purchase_assistant_trigger")
             }
 
             else -> super.showTriggerSetup(shortcut)

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

@@ -511,9 +511,16 @@ class KeyMapListViewModel(
                 }
 
                 TriggerError.ASSISTANT_TRIGGER_NOT_PURCHASED, TriggerError.FLOATING_BUTTONS_NOT_PURCHASED -> {
-                    navigate(
+                    val result = navigate(
                         "purchase_advanced_trigger",
                         NavDestination.AdvancedTriggers,
+                    ) ?: return@launch
+
+                    val groupUid = listKeyMaps.keyMapGroup.first().group?.uid
+
+                    navigate(
+                        "use_advanced_trigger",
+                        NavDestination.NewKeyMap(groupUid = groupUid, triggerSetupShortcut = result)
                     )
                 }
 

base/src/main/java/io/github/sds100/keymapper/base/trigger/BaseConfigTriggerViewModel.kt

@@ -158,11 +158,19 @@ abstract class BaseConfigTriggerViewModel(
 
     fun onAdvancedTriggersClick() {
         onboarding.viewedAdvancedTriggers()
+
         viewModelScope.launch {
-            navigate("advanced_triggers_click", NavDestination.AdvancedTriggers)
+            navigateToAdvancedTriggers("advanced_triggers_click")
         }
     }
 
+    suspend fun navigateToAdvancedTriggers(navKey: String) {
+        val result: TriggerSetupShortcut =
+            navigate(navKey, NavDestination.AdvancedTriggers) ?: return
+
+        showTriggerSetup(result)
+    }
+
     private fun buildUiState(
         keyMapState: State<KeyMap>,
         showDeviceDescriptors: Boolean,
@@ -461,7 +469,7 @@ abstract class BaseConfigTriggerViewModel(
 
                 is RecordTriggerState.Completed,
                 RecordTriggerState.Idle,
-                -> recordTrigger.startRecording(enableEvdevRecording = false)
+                    -> recordTrigger.startRecording(enableEvdevRecording = false)
             }
 
             // Show dialog if the accessibility service is disabled or crashed

base/src/main/java/io/github/sds100/keymapper/base/utils/navigation/NavDestination.kt

@@ -7,6 +7,7 @@ import io.github.sds100.keymapper.base.actions.tapscreen.PickCoordinateResult
 import io.github.sds100.keymapper.base.constraints.ConstraintData
 import io.github.sds100.keymapper.base.system.apps.ChooseAppShortcutResult
 import io.github.sds100.keymapper.base.system.intents.ConfigIntentResult
+import io.github.sds100.keymapper.base.trigger.TriggerSetupShortcut
 import io.github.sds100.keymapper.system.apps.ActivityInfo
 import io.github.sds100.keymapper.system.bluetooth.BluetoothDeviceInfo
 import kotlinx.serialization.Serializable
@@ -151,6 +152,11 @@ abstract class NavDestination<R>(val isCompose: Boolean = false) {
     data class NewKeyMap(
         val groupUid: String?,
         val floatingButtonToUse: String? = null,
+        /**
+         * The trigger shortcut to immediately launch
+         * when navigating to the screen to create a key map.
+         */
+        val triggerSetupShortcut: TriggerSetupShortcut? = null
     ) : NavDestination<Unit>(isCompose = true) {
         override val id: String = ID_CONFIG_KEY_MAP
     }
@@ -177,8 +183,11 @@ abstract class NavDestination<R>(val isCompose: Boolean = false) {
         override val id: String = ID_LOG
     }
 
+    /**
+     * This returns a trigger setup shortcut if an advanced trigger is used.
+     */
     @Serializable
-    data object AdvancedTriggers : NavDestination<Unit>(isCompose = true) {
+    data object AdvancedTriggers : NavDestination<TriggerSetupShortcut?>(isCompose = true) {
         override val id: String = ID_ADVANCED_TRIGGERS
     }
 }

base/src/main/java/io/github/sds100/keymapper/base/utils/navigation/NavigationProvider.kt

@@ -130,13 +130,13 @@ class NavigationProviderImpl @Inject constructor() : NavigationProvider {
     }
 
     /**
-     * @param data The data in String or JSON format to return.
+     * @param jsonData The data in String or JSON format to return.
      */
-    override suspend fun popBackStackWithResult(data: String) {
+    override suspend fun popBackStackWithResult(jsonData: String) {
         _onReturnResult.subscriptionCount.first { it > 0 }
 
         Timber.d("Navigation: Popping back stack with result")
-        _onReturnResult.emit(data)
+        _onReturnResult.emit(jsonData)
     }
 }
 
@@ -152,7 +152,7 @@ interface NavigationProvider {
     val onReturnResult: StateFlow<String?>
     fun handledReturnResult()
 
-    suspend fun popBackStackWithResult(data: String)
+    suspend fun popBackStackWithResult(jsonData: String)
     suspend fun popBackStack()
 }
 

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

@@ -1218,7 +1218,7 @@
     <string name="learn_more_button">Learn more</string>
 
     <string name="on_screen_floating_buttons_title">On-screen floating buttons</string>
-    <string name="on_screen_floating_buttons_description">Make instant shortcuts and macros in any app, game or on your lock screen.</string>
+    <string name="on_screen_floating_buttons_description">Not enough buttons? Make instant shortcuts and macros in any app, game or on your lock screen!</string>
     <string name="feature_use_in_games">Use in games</string>
     <string name="feature_use_on_lock_screen">Use on lock screen</string>
 
@@ -1261,7 +1261,7 @@
     <string name="purchasing_contact_email" translatable="false">contact@keymapper.club</string>
     <string name="customer_email_subject" translatable="false">Key Mapper Pro query</string>
     <string name="customer_email_body" translatable="false">Please fill the following information so I can help you.\n\n1. Device model:\n2. Android version:\n3. Key maps (make a back up in the home screen menu):\n4. Screenshot of Key Mapper home screen:\n5. Describe the problem you are having:</string>
-    <string name="purchase_thank_you_title">Thank you for supporting the app\u00A0❤️!</string>
+    <string name="purchase_thank_you_title">Thank you for supporting the app!</string>
     <string name="purchase_thank_you_message">Your purchase was successful. As a paying user of Key\u00A0Mapper you will receive priority support to help you use the app. There is now a button in the shop to contact the developer.</string>
     <string name="purchasing_not_implemented_bottom_sheet_text">The advanced triggers are paid feature but you downloaded the FOSS build of Key Mapper that does not include this closed source module or Google Play billing. Please download Key Mapper from Google Play to get access to this feature.</string>
     <string name="purchasing_download_key_mapper_from_google_play">Download Play build</string>
@@ -1539,7 +1539,7 @@
     <string name="summary_pref_pro_mode_auto_start_at_boot">PRO Mode will start itself whenever you turn on or restart your device</string>
 
     <string name="title_pref_key_event_actions_use_system_bridge">Key event actions</string>
-    <string name="summary_pref_key_event_actions_use_system_bridge">Select how key event actions are run</string>
+    <string name="summary_pref_key_event_actions_use_system_bridge">Select how key event actions are performed</string>
 
     <string name="pro_mode_emergency_tip_title">Emergency tip</string>
     <string name="pro_mode_emergency_tip_text">If your power button stops working, hold down the power button for 10 seconds and release to disable PRO Mode.</string>