Added vibration when opening assistant (optional)

Author: WSTxda

app/src/main/AndroidManifest.xml

@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <uses-permission android:name="android.permission.VIBRATE" />
+
     <application
         android:name=".activity.AppActivity"
         android:allowBackup="false"

app/src/main/java/com/wstxda/switchai/fragment/SettingsFragment.kt

@@ -19,7 +19,7 @@ import com.wstxda.switchai.fragment.preferences.DigitalAssistantPreference
 import com.wstxda.switchai.ui.TileManager
 import com.wstxda.switchai.ui.component.AssistantManagerDialog
 import com.wstxda.switchai.ui.component.DigitalAssistantSetupDialog
-import com.wstxda.switchai.utils.AssistantResourcesManager
+import com.wstxda.switchai.ui.utils.AssistantResourcesManager
 import com.wstxda.switchai.ui.WidgetManager
 import com.wstxda.switchai.utils.Constants
 import com.wstxda.switchai.viewmodel.SettingsViewModel
@@ -84,7 +84,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.main_preferences, rootKey)
-        assistantResourcesManager = AssistantResourcesManager(requireContext()) // Initialize here
+        assistantResourcesManager = AssistantResourcesManager(requireContext())
         setupInitialVisibility()
         setupPreferences()
         observeViewModel()

app/src/main/java/com/wstxda/switchai/logic/AssistantLauncher.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.widget.Toast
 import androidx.core.net.toUri
+import com.wstxda.switchai.ui.utils.VibrationService.openAssistantVibration
 
 fun Context.launchAssistant(
     intents: List<Intent>,
@@ -24,6 +25,7 @@ fun Context.launchAssistant(
 
 fun Context.launchAssistant(intent: Intent): Boolean = runCatching {
     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    openAssistantVibration()
     startActivity(intent)
     true
 }.getOrElse { false }
@@ -32,7 +34,7 @@ fun Context.launchAssistantRoot(
     intents: List<Intent>,
     rootAccessMessageResId: Int,
     errorMessageResId: Int,
-    packageName: String? = null
+    packageName: String? = null,
 ): Boolean {
     val hasRoot = runCatching {
         RootChecker.isRootAvailable()
@@ -46,12 +48,12 @@ fun Context.launchAssistantRoot(
     intents.forEach { intent ->
         val success = runCatching {
             RootChecker.launchRootActivity(
-                intent.component!!.packageName,
-                intent.component!!.className
+                intent.component!!.packageName, intent.component!!.className
             )
         }.getOrElse { false }
 
         if (success) return true
+        openAssistantVibration()
     }
 
     val handled = !packageName.isNullOrEmpty() && launchOnStore(packageName)

app/src/main/java/com/wstxda/switchai/services/DigitalAssistantService.kt

@@ -12,7 +12,6 @@ class DigitalAssistantService : AssistantActivity() {
         val preferenceHelper = PreferenceHelper(this)
         val showSelector =
             preferenceHelper.getBoolean(Constants.ASSISTANT_SELECTOR_DIALOG_PREF_KEY, true)
-
         if (showSelector) {
             val intent = Intent(this, AssistantSelectorActivity::class.java)
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)

…tchai/utils/AssistantResourcesManager.kt …ai/ui/utils/AssistantResourcesManager.ktapp/src/main/java/com/wstxda/switchai/utils/AssistantResourcesManager.kt renamed to app/src/main/java/com/wstxda/switchai/ui/utils/AssistantResourcesManager.kt app/src/main/java/com/wstxda/switchai/utils/AssistantResourcesManager.kt renamed to app/src/main/java/com/wstxda/switchai/ui/utils/AssistantResourcesManager.kt

@@ -1,9 +1,9 @@
-package com.wstxda.switchai.utils
+package com.wstxda.switchai.ui.utils
 
 import android.annotation.SuppressLint
 import android.content.Context
-import androidx.preference.ListPreference
 import androidx.core.content.ContextCompat
+import androidx.preference.ListPreference
 import com.wstxda.switchai.R
 import java.util.Locale
 

app/src/main/java/com/wstxda/switchai/ui/utils/VibrationService.kt

@@ -0,0 +1,45 @@
+package com.wstxda.switchai.ui.utils
+
+import android.content.Context
+import android.os.Build
+import android.os.VibrationAttributes
+import android.os.VibrationEffect
+import android.os.Vibrator
+import androidx.preference.PreferenceManager
+import com.wstxda.switchai.utils.Constants
+
+object VibrationService {
+
+    fun performVibration(context: Context) {
+        if (!isVibrationEnabled(context)) return
+
+        val vibrator = context.getSystemService(Vibrator::class.java) ?: return
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val effect = VibrationEffect.createPredefined(VibrationEffect.EFFECT_CLICK)
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                val attrs =
+                    VibrationAttributes.Builder().setUsage(VibrationAttributes.USAGE_TOUCH).build()
+                vibrator.vibrate(effect, attrs)
+            } else {
+                vibrator.vibrate(effect)
+            }
+
+        } else {
+            val effect = VibrationEffect.createOneShot(
+                40, VibrationEffect.DEFAULT_AMPLITUDE
+            )
+            vibrator.vibrate(effect)
+        }
+    }
+
+    private fun isVibrationEnabled(context: Context): Boolean {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
+        return prefs.getBoolean(Constants.ASSISTANT_VIBRATION_PREF_KEY, true)
+    }
+
+    fun Context.openAssistantVibration() {
+        performVibration(this)
+    }
+}

app/src/main/java/com/wstxda/switchai/ui/viewholder/AssistantSelectorItemViewHolder.kt

@@ -6,7 +6,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.wstxda.switchai.R
 import com.wstxda.switchai.utils.DigitalAssistantMap
 import com.wstxda.switchai.databinding.ListItemAssistantViewBinding
-import com.wstxda.switchai.logic.launchAssistant
 import com.wstxda.switchai.ui.adapter.AssistantSelectorRecyclerView
 
 class AssistantSelectorItemViewHolder(
@@ -31,14 +30,11 @@ class AssistantSelectorItemViewHolder(
         itemView.setOnClickListener {
             val context = it.context
             DigitalAssistantMap.assistantsMap[item.key]?.let { cls ->
-                Intent(context, cls).also { intent ->
-                    if (context.launchAssistant(intent)) {
-                        onAssistantLaunched(item.key)
-                    } else {
-                        Toast.makeText(context, R.string.assistant_open_error, Toast.LENGTH_SHORT)
-                            .show()
-                    }
+                val intent = Intent(context, cls).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 }
+                context.startActivity(intent)
+                onAssistantLaunched(item.key)
             } ?: Toast.makeText(context, R.string.assistant_open_error, Toast.LENGTH_SHORT).show()
         }
     }

app/src/main/java/com/wstxda/switchai/utils/Constants.kt

@@ -10,6 +10,7 @@ object Constants {
     const val ASSISTANT_MANAGER_DIALOG_PREF_KEY = "assistant_selector_manager"
     const val OPEN_ASSISTANT_TILE_PREF_KEY = "open_assistant_tile"
     const val OPEN_ASSISTANT_WIDGET_PREF_KEY = "open_assistant_widget"
+    const val ASSISTANT_VIBRATION_PREF_KEY = "assistant_vibration"
     const val ASSISTANT_ROOT_PREF_KEY = "assistant_root"
     const val LIBRARY_PREF_KEY = "library"
     const val THEME_PREF_KEY = "select_theme"

app/src/main/java/com/wstxda/switchai/utils/DigitalAssistantMap.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import com.wstxda.switchai.assistant.*
 import com.wstxda.switchai.logic.PreferenceHelper
-import com.wstxda.switchai.logic.launchAssistant
 
 object DigitalAssistantMap {
     internal val assistantsMap = mapOf(
@@ -34,7 +33,9 @@ object DigitalAssistantMap {
         val selectedShortcut =
             preferenceHelper.getString(Constants.DIGITAL_ASSISTANT_SELECT_PREF_KEY, null) ?: return
         val activityClass = assistantsMap[selectedShortcut] ?: return
-        val intent = Intent(context, activityClass)
-        context.launchAssistant(intent)
+        val intent = Intent(context, activityClass).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        }
+        context.startActivity(intent)
     }
 }

app/src/main/java/com/wstxda/switchai/viewmodel/AssistantSelectorViewModel.kt

@@ -18,7 +18,7 @@ import com.wstxda.switchai.utils.Constants.CAT_PINNED_ASSISTANTS_KEY
 import com.wstxda.switchai.utils.Constants.CAT_RECENTLY_USED_ASSISTANTS_KEY
 import com.wstxda.switchai.utils.Constants.CAT_MAX_RECENTLY_USED
 import com.wstxda.switchai.utils.Constants.PREFS_NAME
-import com.wstxda.switchai.utils.AssistantResourcesManager
+import com.wstxda.switchai.ui.utils.AssistantResourcesManager
 
 class AssistantSelectorViewModel(application: Application) : AndroidViewModel(application),
     SharedPreferences.OnSharedPreferenceChangeListener {