From 7a0094429c0647bdf475a0ea83932a0bdeb6ff76 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 9 Apr 2018 00:22:35 +0200
Subject: [PATCH] Improved hostmask settings UI
---
app/src/main/res/values-de/strings_preferences.xml | 2 +-
app/src/main/res/values/strings_preferences.xml | 2 +-
app/src/main/res/xml/preferences.xml | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/values-de/strings_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml
index f3958451b..f6034f065 100644
--- a/app/src/main/res/values-de/strings_preferences.xml
+++ b/app/src/main/res/values-de/strings_preferences.xml
@@ -46,7 +46,7 @@
<string name="preference_hostmask_actions_title">Hostmaske in Aktionen</string>
<string name="preference_hostmask_actions_summary">Zeigt Ident und Host in Betreten/Verlassen-Nachrichten</string>
- <string name="preference_hostmask_plain_title">Hostmaske</string>
+ <string name="preference_hostmask_plain_title">Hostmaske in normalen Nachrichten</string>
<string name="preference_hostmask_plain_summary">Zeigt Ident und Host in normalen Nachrichten</string>
<string name="preference_nicks_on_new_line_title">Separate Spitznamen</string>
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index b3b15b6b1..e41c6ca28 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -104,7 +104,7 @@
<string name="preference_hostmask_actions_summary">Display the full nick!ident@host in join/part/quit messages</string>
<string name="preference_hostmask_plain_key" translatable="false">hostmask_plain</string>
- <string name="preference_hostmask_plain_title">Show Hostmask</string>
+ <string name="preference_hostmask_plain_title">Show Hostmask in normal messages</string>
<string name="preference_hostmask_plain_summary">Display the full nick!ident@host in normal messages</string>
<string name="preference_nicks_on_new_line_key" translatable="false">nicks_on_new_line</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5300c0734..a4dd6a264 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -80,6 +80,12 @@
android:key="@string/preference_show_avatars_key"
android:title="@string/preference_show_avatars_title" />
+ <SwitchPreference
+ android:defaultValue="false"
+ android:key="@string/preference_hostmask_actions_key"
+ android:summary="@string/preference_hostmask_actions_summary"
+ android:title="@string/preference_hostmask_actions_title" />
+
<SwitchPreference
android:defaultValue="false"
android:dependency="@string/preference_nicks_on_new_line_key"
@@ -87,12 +93,6 @@
android:summary="@string/preference_hostmask_plain_summary"
android:title="@string/preference_hostmask_plain_title" />
- <SwitchPreference
- android:defaultValue="false"
- android:key="@string/preference_hostmask_actions_key"
- android:summary="@string/preference_hostmask_actions_summary"
- android:title="@string/preference_hostmask_actions_title" />
-
<SwitchPreference
android:defaultValue="false"
android:key="@string/preference_time_at_end_key"
--
GitLab