mirror of
https://github.com/SimpleMobileTools/Simple-Calendar.git
synced 2025-06-05 21:59:17 +02:00
allow setting empty notification sound
This commit is contained in:
@@ -57,7 +57,11 @@ class SettingsActivity : SimpleActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun setupReminderSound() {
|
private fun setupReminderSound() {
|
||||||
settings_reminder_sound.text = RingtoneManager.getRingtone(this, Uri.parse(config.reminderSound)).getTitle(this)
|
if (config.reminderSound.isEmpty()) {
|
||||||
|
settings_reminder_sound.text = resources.getString(R.string.no_ringtone_selected)
|
||||||
|
} else {
|
||||||
|
settings_reminder_sound.text = RingtoneManager.getRingtone(this, Uri.parse(config.reminderSound)).getTitle(this)
|
||||||
|
}
|
||||||
settings_reminder_sound_holder.setOnClickListener {
|
settings_reminder_sound_holder.setOnClickListener {
|
||||||
Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply {
|
Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply {
|
||||||
putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
|
putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
|
||||||
@@ -147,11 +151,15 @@ class SettingsActivity : SimpleActivity() {
|
|||||||
custom_reminder_value.setText(value.toString())
|
custom_reminder_value.setText(value.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
|
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
|
||||||
if (resultCode == Activity.RESULT_OK && requestCode == GET_RINGTONE_URI) {
|
if (resultCode == Activity.RESULT_OK && requestCode == GET_RINGTONE_URI) {
|
||||||
val uri = intent?.getParcelableExtra<Parcelable>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) ?: return
|
val uri = resultData?.getParcelableExtra<Parcelable>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
|
||||||
settings_reminder_sound.text = RingtoneManager.getRingtone(this, uri as Uri).getTitle(this)
|
if (uri == null) {
|
||||||
config.reminderSound = uri.toString()
|
config.reminderSound = ""
|
||||||
|
} else {
|
||||||
|
settings_reminder_sound.text = RingtoneManager.getRingtone(this, uri as Uri).getTitle(this)
|
||||||
|
config.reminderSound = uri.toString()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Erinnerung gespeichert</string>
|
<string name="reminder_saved">Erinnerung gespeichert</string>
|
||||||
<string name="notification_sound">Benachrichtigungs Ton</string>
|
<string name="notification_sound">Benachrichtigungs Ton</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 Termin gelöscht</item>
|
<item quantity="one">1 Termin gelöscht</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Recordatorio guardado</string>
|
<string name="reminder_saved">Recordatorio guardado</string>
|
||||||
<string name="notification_sound">Notification sound</string>
|
<string name="notification_sound">Notification sound</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 evento borrado</item>
|
<item quantity="one">1 evento borrado</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Rappel sauvegardé</string>
|
<string name="reminder_saved">Rappel sauvegardé</string>
|
||||||
<string name="notification_sound">Son de notification</string>
|
<string name="notification_sound">Son de notification</string>
|
||||||
<string name="no_ringtone_picker">Aucune application capable de configurer la sonnerie trouvée</string>
|
<string name="no_ringtone_picker">Aucune application capable de configurer la sonnerie trouvée</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 événement supprimé</item>
|
<item quantity="one">1 événement supprimé</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Reminder saved</string>
|
<string name="reminder_saved">Reminder saved</string>
|
||||||
<string name="notification_sound">Notification sound</string>
|
<string name="notification_sound">Notification sound</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 इवेंट डिलीट किया गया</item>
|
<item quantity="one">1 इवेंट डिलीट किया गया</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Emlékeztető elmentve</string>
|
<string name="reminder_saved">Emlékeztető elmentve</string>
|
||||||
<string name="notification_sound">Notification sound</string>
|
<string name="notification_sound">Notification sound</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 bejegyzés törölve</item>
|
<item quantity="one">1 bejegyzés törölve</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Reminder saved</string>
|
<string name="reminder_saved">Reminder saved</string>
|
||||||
<string name="notification_sound">Notification sound</string>
|
<string name="notification_sound">Notification sound</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 evento eliminato</item>
|
<item quantity="one">1 evento eliminato</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">リマインダーを保存しました</string>
|
<string name="reminder_saved">リマインダーを保存しました</string>
|
||||||
<string name="notification_sound">Notification sound</string>
|
<string name="notification_sound">Notification sound</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 イベントを削除しました</item>
|
<item quantity="one">1 イベントを削除しました</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Lembrete guardado</string>
|
<string name="reminder_saved">Lembrete guardado</string>
|
||||||
<string name="notification_sound">Som da notificação</string>
|
<string name="notification_sound">Som da notificação</string>
|
||||||
<string name="no_ringtone_picker">Não foi encontrada qualquer aplicação capaz de definir o som</string>
|
<string name="no_ringtone_picker">Não foi encontrada qualquer aplicação capaz de definir o som</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 evento apagado</item>
|
<item quantity="one">1 evento apagado</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Reminder saved</string>
|
<string name="reminder_saved">Reminder saved</string>
|
||||||
<string name="notification_sound">Notification sound</string>
|
<string name="notification_sound">Notification sound</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 händelse borttagen</item>
|
<item quantity="one">1 händelse borttagen</item>
|
||||||
|
@@ -58,6 +58,7 @@
|
|||||||
<string name="reminder_saved">Reminder saved</string>
|
<string name="reminder_saved">Reminder saved</string>
|
||||||
<string name="notification_sound">Notification sound</string>
|
<string name="notification_sound">Notification sound</string>
|
||||||
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
<string name="no_ringtone_picker">No app capable of setting ringtone found</string>
|
||||||
|
<string name="no_ringtone_selected">None</string>
|
||||||
|
|
||||||
<plurals name="events_deleted">
|
<plurals name="events_deleted">
|
||||||
<item quantity="one">1 event deleted</item>
|
<item quantity="one">1 event deleted</item>
|
||||||
|
Reference in New Issue
Block a user