From 895a1fa97ced48d17de49db310a9f59749fb3080 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 5 May 2018 01:48:45 +0200
Subject: [PATCH] Bugfixes
Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
.../de/kuschku/quasseldroid/settings/Settings.kt | 2 +-
.../clientsettings/client/ClientSettingsFragment.kt | 2 +-
.../main/res/layout/widget_spinner_item_inline.xml | 2 +-
app/src/main/res/values/strings_messages.xml | 2 +-
app/src/main/res/values/strings_preferences.xml | 12 ++++++------
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
index bb91e49b0..1efeced29 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
@@ -149,7 +149,7 @@ object Settings {
NotificationSettings.DEFAULT.sound
),
vibrate = getBoolean(
- context.getString(R.string.preference_notification_sound_key),
+ context.getString(R.string.preference_notification_vibration_key),
NotificationSettings.DEFAULT.vibrate
),
light = getBoolean(
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt
index a92c5be98..8f9c8bb6c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt
@@ -55,7 +55,7 @@ class ClientSettingsFragment : DaggerPreferenceFragmentCompat(),
findPreference(getString(R.string.preference_notification_vibration_key)).isVisible = false
findPreference(getString(R.string.preference_notification_light_key)).isVisible = false
} else {
- findPreference(getString(R.string.preference_notification_configure_key)).isVisible = true
+ findPreference(getString(R.string.preference_notification_configure_key)).isVisible = false
}
}
diff --git a/app/src/main/res/layout/widget_spinner_item_inline.xml b/app/src/main/res/layout/widget_spinner_item_inline.xml
index d109243dc..b66e630ab 100644
--- a/app/src/main/res/layout/widget_spinner_item_inline.xml
+++ b/app/src/main/res/layout/widget_spinner_item_inline.xml
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:minHeight="?listPreferredItemHeightSmall"
+ android:minHeight="?attr/listPreferredItemHeightSmall"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
diff --git a/app/src/main/res/values/strings_messages.xml b/app/src/main/res/values/strings_messages.xml
index f4a950d06..b4180977a 100644
--- a/app/src/main/res/values/strings_messages.xml
+++ b/app/src/main/res/values/strings_messages.xml
@@ -24,7 +24,7 @@
<string name="message_type_nick">Nick</string>
<string name="message_type_mode">Mode</string>
<string name="message_type_topic">Topic</string>
- <string-array name="message_filter_types">
+ <string-array name="message_filter_types" translatable="false">
<item>@string/message_type_join</item>
<item>@string/message_type_part</item>
<item>@string/message_type_quit</item>
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index 781f1b2be..084269541 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -32,7 +32,7 @@
<string name="preference_theme_entry_gruvbox_light">Gruvbox (Light)</string>
<string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dark)</string>
<string name="preference_theme_entry_dracula">Dracula</string>
- <string-array name="preference_theme_entries">
+ <string-array name="preference_theme_entries" translatable="false">
<item>@string/preference_theme_entry_material_light</item>
<item>@string/preference_theme_entry_material_dark</item>
<item>@string/preference_theme_entry_quassel_light</item>
@@ -61,7 +61,7 @@
<string name="preference_input_enter_title">Enter key on keyboard</string>
<string name="preference_input_enter_entry_emoji">Emoji</string>
<string name="preference_input_enter_entry_send">Send</string>
- <string-array name="preference_input_enter_entries">
+ <string-array name="preference_input_enter_entries" translatable="false">
<item>@string/preference_input_enter_entry_emoji</item>
<item>@string/preference_input_enter_entry_send</item>
</string-array>
@@ -80,7 +80,7 @@
<string name="preference_language_entry_en" translatable="false">English</string>
<string name="preference_language_entry_de" translatable="false">Deutsch</string>
<string name="preference_language_entry_lt" translatable="false">Lietuvių</string>
- <string-array name="preference_language_entries">
+ <string-array name="preference_language_entries" translatable="false">
<item>@string/preference_language_entry_auto</item>
<item>@string/preference_language_entry_en</item>
<item>@string/preference_language_entry_de</item>
@@ -120,7 +120,7 @@
<string name="preference_notifications_level_all">All Messages</string>
<string name="preference_notifications_level_highlight">Mentions</string>
<string name="preference_notifications_level_none">Never</string>
- <string-array name="preference_notifications_level_entries">
+ <string-array name="preference_notifications_level_entries" translatable="false">
<item>@string/preference_notifications_level_all</item>
<item>@string/preference_notifications_level_highlight</item>
<item>@string/preference_notifications_level_none</item>
@@ -156,7 +156,7 @@
<string name="preference_colorize_nicknames_entry_all">All nicks</string>
<string name="preference_colorize_nicknames_entry_all_but_mine">All but own nick</string>
<string name="preference_colorize_nicknames_entry_none">No nicks</string>
- <string-array name="preference_colorize_nicknames_entries">
+ <string-array name="preference_colorize_nicknames_entries" translatable="false">
<item>@string/preference_colorize_nicknames_entry_all</item>
<item>@string/preference_colorize_nicknames_entry_all_but_mine</item>
<item>@string/preference_colorize_nicknames_entry_none</item>
@@ -172,7 +172,7 @@
<string name="preference_show_prefix_entry_all">All modes</string>
<string name="preference_show_prefix_entry_highest">Highest mode</string>
<string name="preference_show_prefix_entry_none">No modes</string>
- <string-array name="preference_show_prefix_entries">
+ <string-array name="preference_show_prefix_entries" translatable="false">
<item>@string/preference_show_prefix_entry_all</item>
<item>@string/preference_show_prefix_entry_highest</item>
<item>@string/preference_show_prefix_entry_none</item>
--
GitLab