From 8f1167b54d0c60a4d1cc49ff3bea211e4f564d2a Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Wed, 16 Feb 2022 12:38:01 -0500
Subject: [PATCH] Move settings around

---
 app/src/main/res/values/strings.xml              |  2 +-
 app/src/main/res/xml/main_preferences.xml        | 10 +++++-----
 fastlane/metadata/android/en-US/changelog/22.txt |  5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a60c7c5..0a3ff2d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -273,7 +273,7 @@
     <string name="settings_users_header">Users</string>
     <string name="settings_users_key">ManageUsers</string>
     <string name="settings_users_title">Manage users</string>
-    <string name="settings_users_summary">Add or remove users used for protected topics</string>
+    <string name="settings_users_summary">Add/remove users for protected topics</string>
     <string name="settings_users_prefs_title">Users</string>
     <string name="settings_users_prefs_user_not_used">Not used by any topics</string>
     <string name="settings_users_prefs_user_used_by_one">Used by topic %1$s</string>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index aa91e04..9065c4b 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -32,17 +32,17 @@
                 app:title="@string/settings_advanced_default_base_url_title"
                 app:dialogLayout="@layout/preference_dialog_edittext_edited"
                 app:dialogMessage="@string/settings_advanced_default_base_url_message"/>
+        <Preference
+                app:key="@string/settings_users_key"
+                app:title="@string/settings_users_title"
+                app:summary="@string/settings_users_summary"
+                app:fragment="io.heckel.ntfy.ui.SettingsActivity$UserSettingsFragment"/>
         <ListPreference
                 app:key="@string/settings_appearance_dark_mode_key"
                 app:title="@string/settings_appearance_dark_mode_title"
                 app:entries="@array/settings_appearance_dark_mode_entries"
                 app:entryValues="@array/settings_appearance_dark_mode_values"
                 app:defaultValue="-1"/>
-        <Preference
-                app:key="@string/settings_users_key"
-                app:title="@string/settings_users_title"
-                app:summary="@string/settings_users_summary"
-                app:fragment="io.heckel.ntfy.ui.SettingsActivity$UserSettingsFragment"/>
     </PreferenceCategory>
     <PreferenceCategory app:title="@string/settings_advanced_header">
         <SwitchPreference
diff --git a/fastlane/metadata/android/en-US/changelog/22.txt b/fastlane/metadata/android/en-US/changelog/22.txt
index 2d82fdf..2ea0669 100644
--- a/fastlane/metadata/android/en-US/changelog/22.txt
+++ b/fastlane/metadata/android/en-US/changelog/22.txt
@@ -1,6 +1,7 @@
 Features:
-* Automatically delete notifications (#71, thanks @arjan-s for reporting)
 * Share to topic feature (#131, thanks u/emptymatrix for reporting)
+* Ability to pick a default server (#127, thanks to @poblabs for reporting and testing)
+* Automatically delete notifications (#71, thanks @arjan-s for reporting)
 * Dark theme: Improvements around style and contrast (#119, thanks @kzshantonu for reporting)
 
 Bug fixes:
@@ -8,4 +9,4 @@ Bug fixes:
 * Fixed crash in AddFragment as seen per stack trace in Play Console (no ticket)
 
 Other thanks:
-* Thanks to @rogeliodh for testing
+* Thanks to @rogeliodh, @cmeis and @poblabs for testing