More changes

WSTxda · WSTxda · commit a2664fd20b64 · 2025-06-15T02:16:45.000-03:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -351,7 +351,7 @@
             android:name="com.wstxda.switchai.services.DigitalAssistantTileService"
             android:exported="true"
             android:icon="@drawable/ic_assistant"
-            android:label="@string/assistant_open"
+            android:label="@string/assistant_label"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
diff --git a/app/src/main/java/com/wstxda/switchai/logic/AssistantLauncher.kt b/app/src/main/java/com/wstxda/switchai/logic/AssistantLauncher.kt
@@ -5,8 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.widget.Toast
 import androidx.core.net.toUri
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 fun Context.launchAssistant(
     intents: List<Intent>,
diff --git a/app/src/main/java/com/wstxda/switchai/ui/TileManager.kt b/app/src/main/java/com/wstxda/switchai/ui/TileManager.kt
@@ -38,7 +38,7 @@ class TileManager(private val context: Context) {
             }
             context.getSystemService(StatusBarManager::class.java)?.requestAddTileService(
                 tileServiceComponent,
-                context.getString(R.string.assistant_open),
+                context.getString(R.string.assistant_label),
                 Icon.createWithResource(context, R.drawable.ic_assistant),
                 executor,
                 resultCallback
diff --git a/app/src/main/java/com/wstxda/switchai/ui/viewholder/AssistantSelectorItemViewHolder.kt b/app/src/main/java/com/wstxda/switchai/ui/viewholder/AssistantSelectorItemViewHolder.kt
@@ -21,7 +21,7 @@ class AssistantSelectorItemViewHolder(
         val item = wrapper.assistantItem
         binding.assistantCheckedTextView.text = item.name
         binding.assistantIcon.setImageResource(
-            if (item.iconResId != 0) item.iconResId else R.drawable.ic_assistant
+            if (item.iconResId != 0) item.iconResId else R.drawable.ic_assistants
         )
         binding.pinButton.setIconResource(
             if (item.isPinned) R.drawable.ic_pin_filled else R.drawable.ic_pin_outline
diff --git a/app/src/main/res/drawable/ic_assistant.xml b/app/src/main/res/drawable/ic_assistant.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M19,1L17.74,3.75L15,5L17.74,6.26L19,9L20.25,6.26L23,5L20.25,3.75M9,4L6.5,9.5L1,12L6.5,14.5L9,20L11.5,14.5L17,12L11.5,9.5M19,15L17.74,17.74L15,19L17.74,20.25L19,23L20.25,20.25L23,19L20.25,17.74" />
+        android:pathData="M12,1L9,9L1,12L9,15L12,23L15,15L23,12L15,9L12,1Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_assistants.xml b/app/src/main/res/drawable/ic_assistants.xml
@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M12,1L9,9L1,12L9,15L12,23L15,15L23,12L15,9L12,1Z" />
+        android:pathData="M19,1L17.74,3.75L15,5L17.74,6.26L19,9L20.25,6.26L23,5L20.25,3.75M9,4L6.5,9.5L1,12L6.5,14.5L9,20L11.5,14.5L17,12L11.5,9.5M19,15L17.74,17.74L15,19L17.74,20.25L19,23L20.25,20.25L23,19L20.25,17.74" />
 </vector>
diff --git a/app/src/main/res/layout/preference_material_bottom.xml b/app/src/main/res/layout/preference_material_bottom.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:layout_weight="1"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/preference_material_middle.xml b/app/src/main/res/layout/preference_material_middle.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:layout_weight="1"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/preference_material_single.xml b/app/src/main/res/layout/preference_material_single.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:layout_weight="1"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/preference_material_top.xml b/app/src/main/res/layout/preference_material_top.xml
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:layout_weight="1"
         android:orientation="vertical">
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -96,10 +96,10 @@
     <string name="digital_assistant_setup_message">Nas configurações, selecione o <b>SwitchAI</b> como o aplicativo de assistente digital padrão para lançar rapidamente o assistente selecionado usando gestos, botões e mais…</string>
     <string name="digital_assistant_setup_button">Configurar agora</string>
 
-    <!--app shortcut-->
+    <!--app shortcut/tile-->
 
-    <string name="shortcut_label_assistant">Assistente</string>
-    <string name="shortcut_label_assistant_long">Abrir assistente selecionado</string>
+    <string name="assistant_label">Assistente</string>
+    <string name="assistant_label_long">Abrir assistente</string>
 
     <!--app quick settings tile-->
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -100,10 +100,10 @@
     <string name="digital_assistant_setup_message">In settings, select <b>SwitchAI</b> as default digital assistant app to quickly launch your selected assistant using device gestures, buttons and more…</string>
     <string name="digital_assistant_setup_button">Setup now</string>
 
-    <!--app shortcut-->
+    <!--app shortcut/tile-->
 
-    <string name="shortcut_label_assistant">Assistant</string>
-    <string name="shortcut_label_assistant_long">Open selected assistant</string>
+    <string name="assistant_label">Assistant</string>
+    <string name="assistant_label_long">Open assistant</string>
 
     <!--app quick settings tile-->
 
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
@@ -15,7 +15,7 @@
         android:icon="@drawable/ic_assistant_default"
         android:key="digital_assistant_select"
         android:title="@string/pref_digital_assistant"
-        app:dialogIcon="@drawable/ic_assistant_select"
+        app:dialogIcon="@drawable/ic_assistant"
         app:dialogTitle="@string/assistant_select"
         app:layout="@layout/preference_material_assistant_cardview"
         app:useSimpleSummaryProvider="true" />
@@ -41,7 +41,7 @@
         android:layout="@layout/preference_material_bottom"
         android:title="@string/pref_manage_assistant"
         app:defaultValue="@array/assistant_visibility_values"
-        app:dialogIcon="@drawable/ic_assistant"
+        app:dialogIcon="@drawable/ic_assistants"
         app:minSelection="2"
         app:summary="@string/pref_manage_assistant_summary" />
 
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
@@ -3,8 +3,8 @@
         android:enabled="true"
         android:icon="@drawable/ic_launcher_shortcut"
         android:shortcutId="open_assistant_shortcut"
-        android:shortcutLongLabel="@string/shortcut_label_assistant_long"
-        android:shortcutShortLabel="@string/shortcut_label_assistant">
+        android:shortcutLongLabel="@string/assistant_label_long"
+        android:shortcutShortLabel="@string/assistant_label">
 
         <intent
             android:action="android.intent.action.VIEW"

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class TileManager(private val context: Context) {`
`38`	`38`	`}`
`39`	`39`	`context.getSystemService(StatusBarManager::class.java)?.requestAddTileService(`
`40`	`40`	`tileServiceComponent,`
`41`		`- context.getString(R.string.assistant_open),`
	`41`	`+ context.getString(R.string.assistant_label),`
`42`	`42`	`Icon.createWithResource(context, R.drawable.ic_assistant),`
`43`	`43`	`executor,`
`44`	`44`	`resultCallback`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class AssistantSelectorItemViewHolder(`
`21`	`21`	`val item = wrapper.assistantItem`
`22`	`22`	`binding.assistantCheckedTextView.text = item.name`
`23`	`23`	`binding.assistantIcon.setImageResource(`
`24`		`- if (item.iconResId != 0) item.iconResId else R.drawable.ic_assistant`
	`24`	`+ if (item.iconResId != 0) item.iconResId else R.drawable.ic_assistants`
`25`	`25`	`)`
`26`	`26`	`binding.pinButton.setIconResource(`
`27`	`27`	`if (item.isPinned) R.drawable.ic_pin_filled else R.drawable.ic_pin_outline`