diff options
| author | RaindropsSys <contact@minteck.org> | 2023-04-03 22:23:05 +0200 |
|---|---|---|
| committer | RaindropsSys <contact@minteck.org> | 2023-04-03 22:23:05 +0200 |
| commit | 1110c95b7d35df130aa6f14a2e4d53fa0bf892fb (patch) | |
| tree | 74a6b1482a0cdf4864ad876f1b0333524391bc53 | |
| parent | c3102d3399b33f4a13bbbc3273c1e19e87fe1cf8 (diff) | |
| download | ponypush-1110c95b7d35df130aa6f14a2e4d53fa0bf892fb.tar.gz ponypush-1110c95b7d35df130aa6f14a2e4d53fa0bf892fb.tar.bz2 ponypush-1110c95b7d35df130aa6f14a2e4d53fa0bf892fb.zip | |
Updated 3 files (automated)
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/java/io/heckel/ntfy/ui/DetailSettingsActivity.kt | 2 | ||||
| -rw-r--r-- | app/src/main/java/io/heckel/ntfy/util/Util.kt | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle index 9f9fe19..9ab711b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { minSdkVersion 27 targetSdkVersion 33 - versionCode 137 - versionName "3.1.0" + versionCode 138 + versionName "3.1.1" buildConfigField 'String', "NTFY_VERSION", '"1.16.0"' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailSettingsActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailSettingsActivity.kt index 63d9474..81c3a57 100644 --- a/app/src/main/java/io/heckel/ntfy/ui/DetailSettingsActivity.kt +++ b/app/src/main/java/io/heckel/ntfy/ui/DetailSettingsActivity.kt @@ -380,7 +380,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?.dialogMessage = getString(R.string.detail_settings_appearance_display_name_message, getName(subscription.topic, topicShortUrl(subscription.baseUrl, subscription.topic))) pref?.preferenceDataStore = object : PreferenceDataStore() { override fun putString(key: String?, value: String?) { val displayName = if (value != "") value else null diff --git a/app/src/main/java/io/heckel/ntfy/util/Util.kt b/app/src/main/java/io/heckel/ntfy/util/Util.kt index c577ba3..a1b27dd 100644 --- a/app/src/main/java/io/heckel/ntfy/util/Util.kt +++ b/app/src/main/java/io/heckel/ntfy/util/Util.kt @@ -64,9 +64,8 @@ fun subscriptionTopicShortUrl(subscription: Subscription) : String { return topicShortUrl(subscription.baseUrl, subscription.topic) } -fun displayName(subscription: Subscription) : String { - // @ponypush - var name = when (subscription.topic) { +fun getName(topic: String, fallback: String = "Unknown channel ($topic)") : String { + return when (topic) { "main" -> "Main delivery channel" "public-switches" -> "Switch notifications" "public-switches-raindrops" -> "Switch notifications (Raindrops)" @@ -76,8 +75,13 @@ fun displayName(subscription: Subscription) : String { "stargrove" -> "Stargrove notifications" "motivation" -> "Motivational messages" "test" -> "Test channel" - else -> "Unknown channel (" + subscription.topic + ")" + else -> fallback } +} + +fun displayName(subscription: Subscription) : String { + // @ponypush + var name = getName(subscription.topic) if (subscription.topic.startsWith("st") && subscription.topic.endsWith("e")) { name = subscription.topic.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } + " notifications" |