show a notification for floating buttons

Author: sds100

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

@@ -29,14 +29,12 @@ import com.anggrayudi.storage.extension.toDocumentFile
 import io.github.sds100.keymapper.Constants.PACKAGE_NAME
 import io.github.sds100.keymapper.compose.ComposeColors
 import io.github.sds100.keymapper.databinding.ActivityMainBinding
-import io.github.sds100.keymapper.home.HomeViewModel
 import io.github.sds100.keymapper.mappings.keymaps.trigger.RecordTriggerController
 import io.github.sds100.keymapper.system.accessibility.AccessibilityServiceAdapter
 import io.github.sds100.keymapper.system.files.FileUtils
 import io.github.sds100.keymapper.system.inputevents.MyMotionEvent
 import io.github.sds100.keymapper.system.permissions.AndroidPermissionAdapter
 import io.github.sds100.keymapper.system.permissions.RequestPermissionDelegate
-import io.github.sds100.keymapper.util.Inject
 import io.github.sds100.keymapper.util.launchRepeatOnLifecycle
 import io.github.sds100.keymapper.util.ui.showPopups
 import kotlinx.coroutines.Dispatchers
@@ -55,8 +53,8 @@ abstract class BaseMainActivity : AppCompatActivity() {
         const val ACTION_SHOW_ACCESSIBILITY_SETTINGS_NOT_FOUND_DIALOG =
             "$PACKAGE_NAME.ACTION_SHOW_ACCESSIBILITY_SETTINGS_NOT_FOUND_DIALOG"
 
-        const val ACTION_USE_ASSISTANT_TRIGGER =
-            "$PACKAGE_NAME.ACTION_USE_ASSISTANT_TRIGGER"
+        const val ACTION_USE_FLOATING_BUTTONS =
+            "$PACKAGE_NAME.ACTION_USE_FLOATING_BUTTONS"
 
         const val ACTION_SAVE_FILE = "$PACKAGE_NAME.ACTION_SAVE_FILE"
         const val EXTRA_FILE_URI = "$PACKAGE_NAME.EXTRA_FILE_URI"
@@ -74,10 +72,6 @@ abstract class BaseMainActivity : AppCompatActivity() {
         ActivityViewModel.Factory(ServiceLocator.resourceProvider(this))
     }
 
-    private val homeViewModel by viewModels<HomeViewModel> {
-        Inject.homeViewModel(this)
-    }
-
     private val currentNightMode: Int
         get() = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
 
@@ -162,16 +156,6 @@ abstract class BaseMainActivity : AppCompatActivity() {
                     viewModel.onCantFindAccessibilitySettings()
                     viewModel.handledActivityLaunchIntent = true
                 }
-
-                ACTION_USE_ASSISTANT_TRIGGER -> {
-                    findNavController(R.id.container).navigate(
-                        NavAppDirections.actionToConfigKeymap(
-                            keymapUid = null,
-                            showAdvancedTriggers = true,
-                        ),
-                    )
-                    viewModel.handledActivityLaunchIntent = true
-                }
             }
         }
 
@@ -201,6 +185,8 @@ abstract class BaseMainActivity : AppCompatActivity() {
     }
 
     override fun onDestroy() {
+        UseCases.onboarding(this).shownAppIntro = true
+
         viewModel.previousNightMode = currentNightMode
         unregisterReceiver(broadcastReceiver)
         super.onDestroy()

app/src/main/java/io/github/sds100/keymapper/data/Keys.kt

@@ -43,8 +43,11 @@ object Keys {
     val acknowledgedGuiKeyboard = booleanPreferencesKey("pref_acknowledged_gui_keyboard")
     val showDeviceDescriptors = booleanPreferencesKey("pref_show_device_descriptors")
 
-    val approvedAssistantTriggerFeaturePrompt =
-        booleanPreferencesKey("pref_approved_assistant_trigger_feature_prompt")
+    //    val approvedAssistantTriggerFeaturePrompt =
+//        booleanPreferencesKey("pref_approved_assistant_trigger_feature_prompt")
+    val approvedFloatingButtonFeaturePrompt =
+        booleanPreferencesKey("pref_approved_floating_button_feature_prompt")
+
     val shownParallelTriggerOrderExplanation =
         booleanPreferencesKey("key_shown_parallel_trigger_order_warning")
     val shownSequenceTriggerExplanation =

app/src/main/java/io/github/sds100/keymapper/home/HomeFragment.kt

@@ -8,7 +8,10 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.findNavController
+import io.github.sds100.keymapper.ActivityViewModel
+import io.github.sds100.keymapper.BaseMainActivity
 import io.github.sds100.keymapper.NavAppDirections
+import io.github.sds100.keymapper.ServiceLocator
 import io.github.sds100.keymapper.compose.KeyMapperTheme
 import io.github.sds100.keymapper.databinding.FragmentComposeBinding
 import io.github.sds100.keymapper.util.Inject
@@ -21,6 +24,10 @@ class HomeFragment : Fragment() {
         Inject.homeViewModel(requireContext())
     }
 
+    val activityViewModel: ActivityViewModel by activityViewModels<ActivityViewModel> {
+        ActivityViewModel.Factory(ServiceLocator.resourceProvider(requireContext()))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -33,6 +40,16 @@ class HomeFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
+        val startDestination =
+            if (!activityViewModel.handledActivityLaunchIntent &&
+                requireActivity().intent?.action == BaseMainActivity.ACTION_USE_FLOATING_BUTTONS
+            ) {
+                activityViewModel.handledActivityLaunchIntent = true
+                HomeDestination.FloatingButtons
+            } else {
+                HomeDestination.KeyMaps
+            }
+
         FragmentComposeBinding.inflate(inflater, container, false).apply {
             composeView.apply {
                 // Dispose of the Composition when the view's LifecycleOwner
@@ -49,6 +66,7 @@ class HomeFragment : Fragment() {
                                 findNavController().navigate(NavAppDirections.actionGlobalAboutFragment())
                             },
                             finishActivity = requireActivity()::finish,
+                            startDestination = startDestination,
                         )
                     }
                 }

app/src/main/java/io/github/sds100/keymapper/home/HomeScreen.kt

@@ -146,6 +146,7 @@ fun HomeScreen(
     onSettingsClick: () -> Unit,
     onAboutClick: () -> Unit,
     finishActivity: () -> Unit,
+    startDestination: HomeDestination = HomeDestination.KeyMaps,
 ) {
     val homeState by viewModel.state.collectAsStateWithLifecycle()
 
@@ -270,6 +271,7 @@ fun HomeScreen(
     HomeScreen(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         navController = navController,
+        startDestination = startDestination,
         homeState = homeState,
         snackBarState = snackbarState,
         navBarItems = navBarItems,
@@ -382,6 +384,7 @@ fun HomeScreen(
 private fun HomeScreen(
     modifier: Modifier = Modifier,
     homeState: HomeState,
+    startDestination: HomeDestination = HomeDestination.KeyMaps,
     navController: NavHostController,
     snackBarState: SnackbarHostState = SnackbarHostState(),
     navBarItems: List<HomeNavBarItem>,
@@ -493,7 +496,7 @@ private fun HomeScreen(
                     ),
                 contentAlignment = Alignment.TopCenter,
                 navController = navController,
-                startDestination = HomeDestination.KeyMaps.route,
+                startDestination = startDestination.route,
                 // use no animations because otherwise the transition freezes
                 // when quickly navigating to another page while the transition is still happening.
                 enterTransition = { EnterTransition.None },

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

@@ -77,27 +77,23 @@ class OnboardingUseCaseImpl(
         readText()
     }
 
-    override var approvedAssistantTriggerFeaturePrompt by PrefDelegate(
-        Keys.approvedAssistantTriggerFeaturePrompt,
+    override var approvedFloatingButtonFeaturePrompt by PrefDelegate(
+        Keys.approvedFloatingButtonFeaturePrompt,
         false,
     )
 
     /**
-     * Show the assistant trigger only when they *upgrade* to the new version and after they've
+     * Show only when they *upgrade* to the new version and after they've
      * completed the app intro, which asks them whether they want to receive notifications.
      */
-    override val showAssistantTriggerFeatureNotification: Flow<Boolean> =
-        combine(
-            get(Keys.lastInstalledVersionCodeBackground).map { it ?: -1 },
-            get(Keys.shownAppIntro).map { it ?: false },
-            get(Keys.approvedAssistantTriggerFeaturePrompt).map { it ?: false },
-        ) { oldVersionCode, shownAppIntro, approvedPrompt ->
-            oldVersionCode < VersionHelper.ASSISTANT_TRIGGER_MIN_VERSION &&
-                shownAppIntro &&
-                !approvedPrompt
-        }
+    override val showFloatingButtonFeatureNotification: Flow<Boolean> = combine(
+        get(Keys.lastInstalledVersionCodeBackground).map { it ?: -1 },
+        get(Keys.approvedFloatingButtonFeaturePrompt).map { it ?: false },
+    ) { oldVersionCode, approvedPrompt ->
+        oldVersionCode < VersionHelper.FLOATING_BUTTON_MIN_VERSION && !approvedPrompt
+    }
 
-    override fun showedAssistantTriggerFeatureNotification() {
+    override fun showedFloatingButtonFeatureNotification() {
         set(Keys.lastInstalledVersionCodeBackground, Constants.VERSION_CODE)
     }
 
@@ -172,9 +168,9 @@ interface OnboardingUseCase {
     var shownParallelTriggerOrderExplanation: Boolean
     var shownSequenceTriggerExplanation: Boolean
 
-    val showAssistantTriggerFeatureNotification: Flow<Boolean>
-    fun showedAssistantTriggerFeatureNotification()
-    var approvedAssistantTriggerFeaturePrompt: Boolean
+    val showFloatingButtonFeatureNotification: Flow<Boolean>
+    fun showedFloatingButtonFeatureNotification()
+    var approvedFloatingButtonFeaturePrompt: Boolean
 
     val showWhatsNew: Flow<Boolean>
     fun showedWhatsNew()

app/src/main/java/io/github/sds100/keymapper/system/notifications/NotificationController.kt

@@ -52,7 +52,9 @@ class NotificationController(
         private const val ID_KEYBOARD_HIDDEN = 747
         private const val ID_TOGGLE_MAPPINGS = 231
         private const val ID_TOGGLE_KEYBOARD = 143
-        private const val ID_FEATURE_ASSISTANT_TRIGGER = 900
+
+        //        private const val ID_FEATURE_ASSISTANT_TRIGGER = 900
+        private const val ID_FEATURE_FLOATING_BUTTONS = 901
 
         const val CHANNEL_TOGGLE_KEYMAPS = "channel_toggle_remaps"
         const val CHANNEL_IME_PICKER = "channel_ime_picker"
@@ -156,15 +158,15 @@ class NotificationController(
 
         coroutineScope.launch(dispatchers.default()) {
             // suspend until the notification should be shown.
-            onboardingUseCase.showAssistantTriggerFeatureNotification.first { it }
+            onboardingUseCase.showFloatingButtonFeatureNotification.first { it }
 
-            manageNotifications.show(assistantTriggerFeatureNotification())
+            manageNotifications.show(floatingButtonFeatureNotification())
 
             // Only save that the notification is shown if the app has
             // permissions to show notifications so that it is shown
             // the next time permission is granted.
             if (manageNotifications.isPermissionGranted()) {
-                onboardingUseCase.showedAssistantTriggerFeatureNotification()
+                onboardingUseCase.showedFloatingButtonFeatureNotification()
             }
         }
 
@@ -438,13 +440,13 @@ class NotificationController(
         priority = NotificationCompat.PRIORITY_LOW,
     )
 
-    private fun assistantTriggerFeatureNotification(): NotificationModel = NotificationModel(
-        id = ID_FEATURE_ASSISTANT_TRIGGER,
+    private fun floatingButtonFeatureNotification(): NotificationModel = NotificationModel(
+        id = ID_FEATURE_FLOATING_BUTTONS,
         channel = CHANNEL_NEW_FEATURES,
-        title = getString(R.string.notification_assistant_trigger_feature_title),
-        text = getString(R.string.notification_assistant_trigger_feature_text),
-        icon = R.drawable.ic_outline_assistant_24,
-        onClickAction = NotificationIntentType.MainActivity(BaseMainActivity.ACTION_USE_ASSISTANT_TRIGGER),
+        title = getString(R.string.notification_floating_buttons_feature_title),
+        text = getString(R.string.notification_floating_buttons_feature_text),
+        icon = R.drawable.outline_bubble_chart_24,
+        onClickAction = NotificationIntentType.MainActivity(BaseMainActivity.ACTION_USE_FLOATING_BUTTONS),
         priority = NotificationCompat.PRIORITY_LOW,
         autoCancel = true,
         onGoing = false,

app/src/main/java/io/github/sds100/keymapper/util/VersionHelper.kt

@@ -13,7 +13,7 @@ object VersionHelper {
     const val FINGERPRINT_GESTURES_MIN_VERSION = 40
 
     /**
-     * This is version 2.7.0 when the assistant trigger was first introduced.
+     * This is version 3.0.0-beta.1 when the assistant trigger was first introduced.
      */
-    const val ASSISTANT_TRIGGER_MIN_VERSION = 66
+    const val FLOATING_BUTTON_MIN_VERSION = 81
 }

app/src/main/res/drawable/outline_bubble_chart_24.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,10c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM7,16c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.01,15c-1.65,0 -3,1.35 -3,3s1.35,3 3,3 3,-1.35 3,-3 -1.35,-3 -3,-3zM15.01,19c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM16.5,3C13.47,3 11,5.47 11,8.5s2.47,5.5 5.5,5.5S22,11.53 22,8.5 19.53,3 16.5,3zM16.5,12c-1.93,0 -3.5,-1.57 -3.5,-3.5S14.57,5 16.5,5 20,6.57 20,8.5 18.43,12 16.5,12z" />
+
+</vector>

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

@@ -1178,8 +1178,6 @@
     <string name="assistant_trigger_product_description">Did you know you can remap your side key, power button, or device assistant? Instead of launching the assistant or the power menu, your device can perform an action of your choice. It works even when the screen is off!</string>
     <string name="trigger_error_assistant_not_purchased">You must purchase the side key trigger feature.</string>
     <string name="advanced_triggers_learn_more_button">Learn more</string>
-    <string name="notification_assistant_trigger_feature_title">New trigger! Did you know you can remap your side key, power button, or device assistant?</string>
-    <string name="notification_assistant_trigger_feature_text">Instead of launching the assistant or the power menu, your device can perform an action of your choice. Tap to learn more.</string>
     <string name="trigger_error_floating_buttons_not_purchased">You must purchase floating buttons.</string>
     <string name="trigger_error_floating_button_deleted">Button was deleted.</string>
     <string name="trigger_error_floating_button_deleted_title">Floating button</string>
@@ -1267,6 +1265,8 @@
     <string name="floating_button_trigger_option_configure_button">Configure button</string>
     <string name="floating_button_trigger_option_edit_layout">Edit layout</string>
     <string name="floating_buttons_product_min_api_error">Requires Android 11 or newer.</string>
+    <string name="notification_floating_buttons_feature_title">Don’t have enough buttons? Now you can make your own!</string>
+    <string name="notification_floating_buttons_feature_text">Floating buttons display over the apps you want. They work just like real buttons, and you can place, style, and map them however you like.</string>
 
     <!-- Home screen -->
     <string name="sort_bottom_sheet_trigger">Trigger</string>

app/src/test/java/io/github/sds100/keymapper/onboarding/FakeOnboardingUseCase.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
  * Created by sds100 on 26/04/2021.
  */
 class FakeOnboardingUseCase : OnboardingUseCase {
-    override var shownAppIntro: Boolean = false
+    override var firstTime: Boolean = false
 
     override suspend fun showInstallGuiKeyboardPrompt(action: ActionData): Boolean {
         throw NotImplementedError()