Skip to content

Commit d1eeaa5

Browse files
committedMar 20, 2025
Remove the legacy Android 12 tip
1 parent d44fead commit d1eeaa5

File tree

15 files changed

+2
-171
lines changed

15 files changed

+2
-171
lines changed
 

‎app-base/src/main/res/values-de/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<string name="move">Verschieben</string>
2323
<string name="deselect">Markierung aufheben</string>
2424
<string name="dismiss">Zurückweisen</string>
25-
<string name="grant">Zulassen</string>
2625
<string name="start">Starten</string>
2726
<string name="pause">Pause</string>
2827
<string name="stop">Stop</string>

‎app-base/src/main/res/values-es/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@
159159
<string name="exit">Salir</string>
160160
<string name="dismiss">Descartar</string>
161161
<string name="deselect">Deseleccionar</string>
162-
<string name="grant">Conceder</string>
163162
<string name="stop">Detener</string>
164163
<string name="thanks">¡Gracias por tu apoyo!</string>
165164
<string name="timer_pick_required">Toca para seleccionar un temporizador</string>
@@ -535,8 +534,6 @@
535534
<string name="intro_exit_confirmation">¿Salir del tutorial\?</string>
536535
<string name="intro_exit_difficult_app_alert">Sin terminar el tutorial, la aplicación puede resultar confusa de usar.</string>
537536
<string name="intro_location">Puedes encontrar el tutorial en \"Ayuda y comentarios\"</string>
538-
<string name="tip_android_12_phone_calls">La pausa en las llamadas telefónicas ahora requiere el permiso \"Leer estado del teléfono\"</string>
539-
<string name="tip_android_12_battery">La compatibilidad con Tasker ahora requiere el permiso \"Ignorar optimización de batería\"</string>
540537
<string name="tasker_edit_title">Plugin para TimeR Machine</string>
541538
<string name="update_title">Registro de cambios</string>
542539
<string name="whitelist_disclaimer"><b>Muchos fabricantes de Android pueden detener las aplicaciones en ejecución cuando la pantalla está apagada o al cambiar a otra aplicación</b>, que es un problema conocido de Android.

‎app-base/src/main/res/values-fr/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<string name="deselect">Désélectionner</string>
2727
<string name="share">Partager</string>
2828
<string name="dismiss">Rejeter</string>
29-
<string name="grant">Accorder</string>
3029
<string name="start">Démarrer</string>
3130
<string name="pause">Pause</string>
3231
<string name="stop">Arrêter</string>
@@ -62,6 +61,5 @@
6261
<string name="intro_location">Vous pouvez trouver le tutoriel dans « Aide et remarques »</string>
6362
<string name="pref_category_notif">Notifications</string>
6463
<string name="pref_audio_focus_type_title">Type de mise au point audio</string>
65-
<string name="tip_android_12_battery">La prise en charge de Tasker nécessite désormais l\'autorisation « Ignorer l\'optimisation de la batterie »</string>
6664
<string name="pref_open_notif_setting">Ouvrir les paramètres de notification</string>
6765
</resources>

‎app-base/src/main/res/values-it/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
<string name="beep_respect_other">Rispetta gli altri suoni</string>
194194
<string name="beep_count_intro_usage">Inserire la durata del suono del bip</string>
195195
<string name="half_option_voice_desp">(Default) Leggi \"Metà del tempo\"</string>
196-
<string name="grant">Permetti</string>
197196
<string name="unknown">Sconosciuto</string>
198197
<string name="time_picker_type_scroll">Scorri</string>
199198
<string name="edit_add_notifier_desp">Uno step utile come memo. Ricorda la tua modifica</string>

‎app-base/src/main/res/values-nb-rNO/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<string name="deselect">Fravelg</string>
1919
<string name="share">Del</string>
2020
<string name="dismiss">Forkast</string>
21-
<string name="grant">Innvilg</string>
2221
<string name="pause">Pause</string>
2322
<string name="stop">Stopp</string>
2423
<string name="plus_one_minute">Legg till ett minutt</string>

‎app-base/src/main/res/values-nl/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<string name="voice_time_variable">Tijd</string>
5050
<string name="scheduler_starts_action_template">%1$s starten</string>
5151
<string name="name_loop_loop_hint">Lus</string>
52-
<string name="tip_android_12_battery">Taak-ondersteuning vereist toestemming voor \"Batterijoptimalisatie negeren\"</string>
5352
<string name="notif_channel_timing_desp">Toont de informatie van een lopende timer en zijn acties</string>
5453
<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>
5554
<string name="edit_add_notifier">Meldinggever</string>
@@ -145,7 +144,6 @@
145144
<string name="voice_variable_timer_loop_desp">Timer huidige lus</string>
146145
<string name="scheduler_alert_content">Het plannen van werk op Android is lastig. Er is een kans dat het systeem een planner niet activeert. Test planners zelf vooraf, voordat je erop vertrouwt.</string>
147146
<string name="vibration_count_desp_range">Het aantal moet tussen 0 en 100 liggen</string>
148-
<string name="grant">Verlenen</string>
149147
<string name="help_tts">Tekst-naar-spraak configuratie</string>
150148
<string name="intro_start_add_reminder">Klik op ➕ onder de stapduur om herinneringen toe te voegen. Laten we <b>muziek</b> en <b>trillen</b> toevoegen.</string>
151149
<string name="edit_add_group">Groep</string>
@@ -383,7 +381,6 @@
383381
<string name="delete_confirmation_template">%s verwijderen?</string>
384382
<string name="pref_audio_focus_title_none">Geen</string>
385383
<string name="pref_category_title_audio">Audio</string>
386-
<string name="tip_android_12_phone_calls">Voor het pauzeren tijdens telefoongesprekken is toestemming vereist voor \"Lees telefoonstatus\"</string>
387384
<string name="count_times_desp">* Voer aan het einde van de stap het aantal aftelseconden in</string>
388385
<string name="pref_tweak_time_off">Uitgeschakeld</string>
389386
<string name="cloud_backup_state_error">Fout</string>

‎app-base/src/main/res/values-pt/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<string name="deselect">Desmarcar</string>
2929
<string name="share">Compartilhar</string>
3030
<string name="dismiss">Dispensar</string>
31-
<string name="grant">Conceder</string>
3231
<string name="start">Iniciar</string>
3332
<string name="pause">Pausar</string>
3433
<string name="stop">Parar</string>
@@ -551,8 +550,6 @@
551550
<string name="intro_exit_difficult_app_alert">Sem terminar o tutorial o app pode ser confuso de usar.</string>
552551
<string name="intro_exit_previous_hint">Para voltar ao passo anterior, clique na <b>seta esquerda</b> na parte inferior da tela.</string>
553552
<string name="intro_location">Você pode encontrar o tutorial em \"Ajuda e comentários\"</string>
554-
<string name="tip_android_12_phone_calls">Pausar em chamadas telefônicas agora requer a permissão \"Ler estado do telefone\"</string>
555-
<string name="tip_android_12_battery">A compatibilidade com o Tasker agora requer a permissão \"Ignorar otimização da bateria\"</string>
556553
<string name="update_title">Registro de mudanças</string>
557554
<string name="tasker_edit_title">Plugin para o TimeR Machine</string>
558555
<string name="tasker_event_timer_starts">Ativar quando <xliff:g example="Timer name" id="timer_name">%s</xliff:g> começa</string>

‎app-base/src/main/res/values-ru/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@
197197
<string name="record_this_year">В этом году</string>
198198
<string name="record_total_time">С первого дня</string>
199199
<string name="billing_a_part_of_iap">Это одно из покупок внутри приложения.</string>
200-
<string name="grant">Наделить</string>
201200
<string name="trash_done_template">Таймер %s перемещён в Корзину</string>
202201
<string name="music_saf_pick">Выбрать через SAF</string>
203202
<string name="edit_add_notifier_desp">Удобное напоминание о шаге. Помнит ваши изменения</string>

‎app-base/src/main/res/values-zh-rCN/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<string name="deselect">取消选择</string>
2727
<string name="share">分享</string>
2828
<string name="dismiss">关闭</string>
29-
<string name="grant">授权</string>
3029
<!--App actions-->
3130
<string name="start">开始</string>
3231
<string name="pause">暂停</string>
@@ -575,8 +574,6 @@
575574
<string name="intro_exit_previous_hint">如果要返回上一步,请点击屏幕底端的<b>左箭头</b>。</string>
576575
<string name="intro_location">你可以在“帮助与反馈”中找到该使用教程</string>
577576
<string name="tip_missed_timer"><b>计时器被非正常地停止了!</b>\n\n这很有可能是系统杀掉了在后台的应用。<b>为了解决该问题,请考虑将本应用在系统设置中白名单。</b></string>
578-
<string name="tip_android_12_phone_calls">当手机在通话时暂停计时器现需要\"获取手机信息\"的权限</string>
579-
<string name="tip_android_12_battery">Tasker支持现需要\"忽略电池优化\"的权限</string>
580577
<!--Updates-->
581578
<string name="update_title">更新内容</string>
582579
<!--Tasker-->

‎app-base/src/main/res/values-zh-rHK/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<string name="deselect">取消選擇</string>
2727
<string name="share">分享</string>
2828
<string name="dismiss">關閉</string>
29-
<string name="grant">授權</string>
3029
<!--App actions-->
3130
<string name="start">開始</string>
3231
<string name="pause">暫停</string>
@@ -575,8 +574,6 @@
575574
<string name="intro_exit_previous_hint">如果要返回上一步,請點擊屏幕底端的<b>左箭頭</b>。</string>
576575
<string name="intro_location">你可以在“幫助與反饋”中找到該使用教程</string>
577576
<string name="tip_missed_timer"><b>計時器被非正常地停止了!</b>\n\n這很有可能是系統殺掉了在後臺的應用。<b>爲了解決該問題,請考慮將本應用在系統設置中白名單。</b></string>
578-
<string name="tip_android_12_phone_calls">當手機在通話時暫停計時器現需要\"獲取手機信息\"的權限</string>
579-
<string name="tip_android_12_battery">Tasker支持現需要\"忽略電池優化\"的權限</string>
580577
<!--Updates-->
581578
<string name="update_title">更新內容</string>
582579
<!--Tasker-->

‎app-base/src/main/res/values-zh-rTW/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<string name="deselect">取消選擇</string>
2727
<string name="share">分享</string>
2828
<string name="dismiss">關閉</string>
29-
<string name="grant">授權</string>
3029
<!--App actions-->
3130
<string name="start">開始</string>
3231
<string name="pause">暫停</string>
@@ -575,8 +574,6 @@
575574
<string name="intro_exit_previous_hint">如果要返回上一步,請點選螢幕底端的<b>左箭頭</b>。</string>
576575
<string name="intro_location">你可以在“幫助與反饋”中找到該使用教程</string>
577576
<string name="tip_missed_timer"><b>計時器被非正常地停止了!</b>\n\n這很有可能是系統殺掉了在後臺的應用。<b>為了解決該問題,請考慮將本應用在系統設定中白名單。</b></string>
578-
<string name="tip_android_12_phone_calls">當手機在通話時暫停計時器現需要\"獲取手機資訊\"的許可權</string>
579-
<string name="tip_android_12_battery">Tasker支援現需要\"忽略電池最佳化\"的許可權</string>
580577
<!--Updates-->
581578
<string name="update_title">更新內容</string>
582579
<!--Tasker-->

‎app-base/src/main/res/values/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<string name="deselect">Deselect</string>
2929
<string name="share">Share</string>
3030
<string name="dismiss">Dismiss</string>
31-
<string name="grant">Grant</string>
3231

3332
<!--App actions-->
3433
<string name="start">Start</string>
@@ -807,9 +806,6 @@
807806

808807
<string name="tip_missed_timer"><b>Some timers are stopped abnormally!</b>\n\nIt is probably because the system kills the app in the background. <b>To resolve this problem, please consider whitelisting this app in system settings.</b></string>
809808

810-
<string name="tip_android_12_phone_calls">Pausing on phone calls now requires \"Read phone status\" permission</string>
811-
<string name="tip_android_12_battery">Tasker support now requires \"Ignore Battery Optimization\" permission</string>
812-
813809
<!--Updates-->
814810
<string name="update_title">Changelog</string>
815811

‎app-timer-list/src/main/java/xyz/aprildown/timer/app/timer/list/TimerFragment.kt

-46
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ package xyz.aprildown.timer.app.timer.list
33
import android.Manifest
44
import android.content.ComponentName
55
import android.content.Context
6-
import android.content.Intent
76
import android.content.ServiceConnection
87
import android.graphics.Typeface
98
import android.os.Build
109
import android.os.Bundle
1110
import android.os.IBinder
12-
import android.os.PowerManager
13-
import android.provider.Settings
1411
import android.text.Spanned
1512
import android.text.style.StyleSpan
1613
import android.view.Menu
@@ -19,8 +16,6 @@ import android.view.MenuItem
1916
import android.view.View
2017
import androidx.activity.result.contract.ActivityResultContracts
2118
import androidx.core.content.edit
22-
import androidx.core.content.getSystemService
23-
import androidx.core.net.toUri
2419
import androidx.core.text.buildSpannedString
2520
import androidx.core.view.MenuProvider
2621
import androidx.core.view.isVisible
@@ -48,8 +43,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
4843
import dagger.hilt.android.AndroidEntryPoint
4944
import kotlinx.coroutines.Dispatchers
5045
import kotlinx.coroutines.asExecutor
51-
import pub.devrel.easypermissions.EasyPermissions
52-
import pub.devrel.easypermissions.PermissionRequest
5346
import xyz.aprildown.timer.app.base.data.PreferenceData
5447
import xyz.aprildown.timer.app.base.data.PreferenceData.showGridTimerList
5548
import xyz.aprildown.timer.app.base.ui.AppNavigator
@@ -62,7 +55,6 @@ import xyz.aprildown.timer.app.base.utils.ScreenWakeLock
6255
import xyz.aprildown.timer.app.base.utils.ShortcutHelper
6356
import xyz.aprildown.timer.app.base.utils.getDisplayName
6457
import xyz.aprildown.timer.app.timer.list.databinding.FragmentTimerBinding
65-
import xyz.aprildown.timer.app.timer.list.databinding.ViewTipAndroid12Binding
6658
import xyz.aprildown.timer.app.timer.list.databinding.ViewTipMissedTimerBinding
6759
import xyz.aprildown.timer.app.timer.list.databinding.ViewTipWhitelistBinding
6860
import xyz.aprildown.timer.domain.entities.FolderEntity
@@ -586,44 +578,6 @@ class TimerFragment :
586578
}
587579
}
588580
}
589-
TipManager.TIP_ANDROID_12 -> {
590-
ViewTipAndroid12Binding.inflate(
591-
layoutInflater,
592-
binding.layoutTip,
593-
true
594-
).also {
595-
it.groupPhoneCalls.isVisible =
596-
!context.hasPermissions(Manifest.permission.READ_PHONE_STATE)
597-
it.btnPhoneCalls.setOnClickListener {
598-
EasyPermissions.requestPermissions(
599-
PermissionRequest.Builder(
600-
this,
601-
0,
602-
Manifest.permission.READ_PHONE_STATE
603-
).build()
604-
)
605-
}
606-
it.groupBattery.isVisible = context.getSystemService<PowerManager>()
607-
?.isIgnoringBatteryOptimizations(context.packageName) != true
608-
it.btnBattery.setOnClickListener {
609-
context.startActivityOrNothing(
610-
Intent.createChooser(
611-
@Suppress("BatteryLife")
612-
Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
613-
.setData("package:${context.packageName}".toUri()),
614-
null
615-
),
616-
wrongMessageRes = RBase.string.no_action_found
617-
)
618-
}
619-
it.btnDismiss.setOnClickListener {
620-
viewModel.consumeTip(tip)
621-
}
622-
if (!it.groupPhoneCalls.isVisible && !it.groupBattery.isVisible) {
623-
viewModel.consumeTip(tip)
624-
}
625-
}
626-
}
627581
TipManager.TIP_NO_MORE -> {
628582
binding.layoutTip.gone()
629583
binding.viewEmpty.isVisible = viewModel.timerInfo.value?.isEmpty() == true

‎app-timer-list/src/main/res/layout/view_tip_android_12.xml

-88
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.