Make SAF picking as a vanilla menu item

DeweyReed · DeweyReed · commit 428892ee3d0d · 2025-03-20T16:47:49.000+08:00
diff --git a/app-base/src/main/res/drawable/ic_magic.xml b/app-base/src/main/res/drawable/ic_magic.xml
diff --git a/app-base/src/main/res/values-de/strings.xml b/app-base/src/main/res/values-de/strings.xml
@@ -93,8 +93,6 @@
     <string name="behaviour_music">Musik</string>
     <string name="music_pick_ringtone">Schritt-Musik auswählen</string>
     <string name="music_loop">Musik-Loop</string>
-    <string name="music_saf_pick">SAF-Auswahl</string>
-    <string name="music_saf_pick_desp">Wenn Sie Musik auswählen möchten, ohne eine Erlaubnis zu erteilen, oder wenn die Standard-Klingeltonauswahl Ihre Musik nicht anzeigt, kann die Aktivierung dieser Option helfen.</string>
     <string name="behaviour_vibration">Vibration</string>
     <string name="behaviour_vibration_help">Bei diesem Schritt vibrieren</string>
     <string name="vibration_count">Anzahl</string>
diff --git a/app-base/src/main/res/values-es/strings.xml b/app-base/src/main/res/values-es/strings.xml
@@ -25,8 +25,6 @@
     <string name="behaviour_no_behaviours">Etapa en silencio</string>
     <string name="behaviour_music_help">Reproducir música en esta etapa</string>
     <string name="music_loop">En bucle</string>
-    <string name="music_saf_pick">Selección SAF</string>
-    <string name="music_saf_pick_desp">Si quieres elegir música sin dar permiso, o el selector por defecto no muestra tu música, habilitar esta opción puede ayudar.</string>
     <string name="behaviour_vibration">Vibración</string>
     <string name="vibration_count">Conteo</string>
     <string name="behaviour_vibration_help">Vibrar equipo en esta etapa</string>
diff --git a/app-base/src/main/res/values-it/strings.xml b/app-base/src/main/res/values-it/strings.xml
@@ -104,7 +104,6 @@
     <string name="behaviour_music_help">Riproduci della musica in questo passaggio</string>
     <string name="music_pick_ringtone">Scegli la musica del passaggio</string>
     <string name="music_loop">Ripeti</string>
-    <string name="music_saf_pick_desp">Abilitare questa opzione potrebbe aiutare se vuoi scegliere la musica senza dare il permesso oppure se la scelta della suoneria di default non mostra la tua musica.</string>
     <string name="behaviour_vibration">Vibrazione</string>
     <string name="vibration_count">Numero di vibrazioni</string>
     <string name="vibration_pattern">Tipo di vibrazione</string>
@@ -196,5 +195,4 @@
     <string name="unknown">Sconosciuto</string>
     <string name="time_picker_type_scroll">Scorri</string>
     <string name="edit_add_notifier_desp">Uno step utile come memo. Ricorda la tua modifica</string>
-    <string name="music_saf_pick">Scegli SAF</string>
 </resources>
diff --git a/app-base/src/main/res/values-nl/strings.xml b/app-base/src/main/res/values-nl/strings.xml
@@ -53,7 +53,6 @@
     <string name="intro_start_step_time">Klik op <b>de tijd naast de stapnaam</b> en verander de tijd in <b>3 minuten</b>.</string>
     <string name="edit_add_notifier">Meldinggever</string>
     <string name="beep_count_title">Piep aantal</string>
-    <string name="music_saf_pick_desp">Als je muziek wilt kiezen zonder toestemming te verlenen, of als de standaard beltoon-kiezer je muziek niet toont, kan het inschakelen van deze optie helpen.</string>
     <string name="tip_missed_timer"><b> Sommige timers worden abnormaal gestopt!</b>
 \n
 \nDit komt waarschijnlijk omdat het systeem de app op de achtergrond stopt. <b>Om dit probleem op te lossen, kun je deze app in de systeeminstellingen op de Witte lijst zetten.</b></string>
@@ -542,7 +541,6 @@
     <string name="record_deleted_timer">Verwijderd</string>
     <string name="time_panel_elapsed_time">Verstreken tijd</string>
     <string name="scheduler_repeat_tomorrow">Morgen</string>
-    <string name="music_saf_pick">SAF kiezen</string>
     <string name="sample_timer_template_title">Timer-sjabloon</string>
     <string name="notif_a11y_start_ally">Alle timers starten</string>
     <string name="help_tts_test_system_settings">Nee. Ik wil graag naar de systeeminstellingen gaan</string>
diff --git a/app-base/src/main/res/values-pt/strings.xml b/app-base/src/main/res/values-pt/strings.xml
@@ -206,8 +206,6 @@
     <string name="behaviour_music_help">Tocar música nesta etapa</string>
     <string name="music_pick_ringtone">Selecionar música de etapa</string>
     <string name="music_loop">Em repetição</string>
-    <string name="music_saf_pick">Seleção SAF</string>
-    <string name="music_saf_pick_desp">Se quer escolher música sem autorizar a permissão, ou o menu padrão de toques não mostra a sua música, habilitar esta opção pode ajudar.</string>
     <string name="behaviour_vibration">Vibração</string>
     <string name="behaviour_vibration_help">Vibrar o dispositivo nesta etapa</string>
     <string name="vibration_count_desp_0">0 para vibrar durante toda esta etapa</string>
diff --git a/app-base/src/main/res/values-ru/strings.xml b/app-base/src/main/res/values-ru/strings.xml
@@ -15,7 +15,6 @@
     <string name="name_loop_loop_hint">Цикл</string>
     <string name="edit_add_notifier">Оповещение</string>
     <string name="beep_count_title">Количество звуковых сигналов</string>
-    <string name="music_saf_pick_desp">Если вы хотите выбирать музыку без разрешения или в программе выбора рингтонов по умолчанию не отображается ваша музыка, включение этой опции может помочь.</string>
     <string name="edit_add_end_desp">Одно действие в конце всего задания, для завершения</string>
     <string name="voice_variable_timer_elapsed_desp">Прошедшее время со старта</string>
     <string name="edit_more_a11y">Другие настройки таймера</string>
@@ -198,7 +197,6 @@
     <string name="record_total_time">С первого дня</string>
     <string name="billing_a_part_of_iap">Это одно из покупок внутри приложения.</string>
     <string name="trash_done_template">Таймер %s перемещён в Корзину</string>
-    <string name="music_saf_pick">Выбрать через SAF</string>
     <string name="edit_add_notifier_desp">Удобное напоминание о шаге. Помнит ваши изменения</string>
     <string name="vibration_pattern">Частота</string>
     <string name="half_option">Напоминание о половине</string>
diff --git a/app-base/src/main/res/values-zh-rCN/strings.xml b/app-base/src/main/res/values-zh-rCN/strings.xml
@@ -130,8 +130,6 @@
     <string name="behaviour_music_help">在此步骤播放音乐</string>
     <string name="music_pick_ringtone">选择步骤铃声</string>
     <string name="music_loop">循环</string>
-    <string name="music_saf_pick">SAF音乐选择</string>
-    <string name="music_saf_pick_desp">如果你想在不授予权限的情况下挑选音乐，或者默认的铃声挑选器不显示你的音乐，启用此选项可能有帮助。</string>
     <string name="music_trim_step_duration">裁剪步骤时长</string>
     <string name="behaviour_vibration">振动</string>
     <string name="behaviour_vibration_help">在此步骤振动手机</string>
diff --git a/app-base/src/main/res/values-zh-rHK/strings.xml b/app-base/src/main/res/values-zh-rHK/strings.xml
@@ -130,8 +130,6 @@
     <string name="behaviour_music_help">在此步驟播放音樂</string>
     <string name="music_pick_ringtone">選擇步驟鈴聲</string>
     <string name="music_loop">循環</string>
-    <string name="music_saf_pick">SAF音樂選擇</string>
-    <string name="music_saf_pick_desp">如果你想在不授予權限的情況下挑選音樂，或者默認的鈴聲挑選器不顯示你的音樂，啓用此選項可能有幫助。</string>
     <string name="music_trim_step_duration">裁剪步驟時長</string>
     <string name="behaviour_vibration">震動</string>
     <string name="behaviour_vibration_help">在此步驟震動手機</string>
diff --git a/app-base/src/main/res/values-zh-rTW/strings.xml b/app-base/src/main/res/values-zh-rTW/strings.xml
@@ -130,8 +130,6 @@
     <string name="behaviour_music_help">在此步驟播放音樂</string>
     <string name="music_pick_ringtone">選擇步驟鈴聲</string>
     <string name="music_loop">循環</string>
-    <string name="music_saf_pick">SAF音樂選擇</string>
-    <string name="music_saf_pick_desp">如果你想在不授予許可權的情況下挑選音樂，或者預設的鈴聲挑選器不顯示你的音樂，啟用此選項可能有幫助。</string>
     <string name="music_trim_step_duration">裁剪步驟時長</string>
     <string name="behaviour_vibration">振動</string>
     <string name="behaviour_vibration_help">在此步驟振動手機</string>
diff --git a/app-base/src/main/res/values/strings.xml b/app-base/src/main/res/values/strings.xml
@@ -144,8 +144,6 @@
     <string name="behaviour_music_help">Play music at this step</string>
     <string name="music_pick_ringtone">Pick Step Music</string>
     <string name="music_loop">Loop</string>
-    <string name="music_saf_pick">SAF Pick</string>
-    <string name="music_saf_pick_desp">If you would like to pick music without granting permission, or the default ringtone picker doesn\'t show your music, enabling this option might help.</string>
     <string name="music_trim_step_duration">Trim step duration</string>
 
     <string name="behaviour_vibration">Vibration</string>
diff --git a/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/RingtonePickerActivity.kt b/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/RingtonePickerActivity.kt
@@ -6,14 +6,14 @@ import android.content.Intent
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Bundle
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.core.content.IntentCompat
 import androidx.core.content.edit
-import androidx.core.view.MenuItemCompat
-import com.github.deweyreed.tools.helper.toColorStateList
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import androidx.core.text.buildSpannedString
 import dagger.hilt.android.AndroidEntryPoint
 import xyz.aprildown.timer.app.base.data.PreferenceData.storedAudioTypeValue
 import xyz.aprildown.timer.app.base.ui.BaseActivity
@@ -75,40 +75,32 @@ class RingtonePickerActivity :
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.ringtone_picker, menu)
-        return true
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        menu?.findItem(R.id.action_ringtone_picker_saf)?.let {
-            MenuItemCompat.setIconTintList(
-                it,
-                if (usingSafPick) newDynamicTheme.colorSecondary.toColorStateList() else null
-            )
+        menu?.add("")?.run {
+            setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+            setOnMenuItemClickListener {
+                usingSafPick = !usingSafPick
+                applyNewSafPickSetting()
+                true
+            }
         }
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_ringtone_picker_saf -> {
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+        val menuItem = menu?.getItem(0)
+        menuItem?.setTitle(
+            buildSpannedString {
+                append("SAF")
                 if (usingSafPick) {
-                    usingSafPick = false
-                    applyNewSafPickSetting()
-                } else {
-                    MaterialAlertDialogBuilder(this)
-                        .setTitle(RBase.string.music_saf_pick)
-                        .setMessage(RBase.string.music_saf_pick_desp)
-                        .setPositiveButton(RBase.string.enable) { _, _ ->
-                            usingSafPick = true
-                            applyNewSafPickSetting()
-                        }
-                        .setNegativeButton(RBase.string.cancel, null)
-                        .show()
+                    setSpan(
+                        ForegroundColorSpan(newDynamicTheme.colorSecondary),
+                        0,
+                        length,
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                    )
                 }
             }
-            else -> return false
-        }
+        )
         return true
     }
 
diff --git a/app-timer-edit/src/main/res/menu/ringtone_picker.xml b/app-timer-edit/src/main/res/menu/ringtone_picker.xml
