CodeMirror/ntfy-android
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy-android.git synced 2024-06-01 18:29:42 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into 236-android-action-buttons

Browse source
This commit is contained in:
Philipp Heckel 2022-06-24 14:11:40 -04:00
parent b48cbcd19d 73c0564611
commit 104d4222ba
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/heckel/ntfy/ui/DetailSettingsActivity.kt
View file

@ -282,6 +282,7 @@ class DetailSettingsActivity : AppCompatActivity() {
val pref: EditTextPreference? = findPreference(prefId)
pref?.isVisible = true // Hack: Show all settings at once, because subscription is loaded asynchronously
pref?.text = subscription.displayName
pref?.dialogMessage = getString(R.string.detail_settings_appearance_display_name_message, topicShortUrl(subscription.baseUrl, subscription.topic))
pref?.preferenceDataStore = object : PreferenceDataStore() {
override fun putString(key: String?, value: String?) {
val displayName: String? = if (value == "") {

2
app/src/main/res/values/strings.xml
View file

@ -354,7 +354,7 @@
<string name="detail_settings_appearance_icon_remove_summary">Icon displayed in notifications for this topic</string>
<string name="detail_settings_appearance_icon_error_saving">Unable to save icon: %1$s</string>
<string name="detail_settings_appearance_display_name_title">Display name</string>
<string name="detail_settings_appearance_display_name_message">Set a custom display name for this subscription. Leave empty for default.</string>
<string name="detail_settings_appearance_display_name_message">Set a custom display name for this subscription. Leave blank for default (%1$s).</string>
<string name="detail_settings_appearance_display_name_default_summary">%1$s (default)</string>
<string name="detail_settings_global_setting_title">Use global setting</string>
<string name="detail_settings_global_setting_suffix">using global setting</string>