From b44e0517cee780693693f0a81440e7317173053a Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Tue, 12 Oct 2021 17:38:34 +0200
Subject: [PATCH] Updated Settings for sharing

---
 ultrasonic/src/main/res/values/strings.xml |  3 ++-
 ultrasonic/src/main/res/xml/settings.xml   | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml
index b1b6b9b9..85b6d58c 100644
--- a/ultrasonic/src/main/res/values/strings.xml
+++ b/ultrasonic/src/main/res/values/strings.xml
@@ -353,12 +353,13 @@
     <string name="widget.sdcard_missing">No SD card</string>
     <string name="settings.share_description_default">Default Share Description</string>
     <string name="settings.sharing_title">Sharing</string>
-    <string name="settings.sharing_always_ask_for_details_summary">Always ask for description and expiration when creating a share</string>
+    <string name="settings.sharing_always_ask_for_details_summary">Always ask for description and expiration when creating a share on the server</string>
     <string name="settings.sharing_always_ask_for_details">Always Ask For Details</string>
     <string name="settings.share_expiration_default">Default Expiration Time</string>
     <string name="do_not_show_dialog_again">Do not show dialog again</string>
     <string name="share_set_share_options">Set Share Options</string>
     <string name="share_on_server">Create share on the server</string>
+    <string name="settings.share_on_server_summary">Sharing will create a share on the server and share its URL. If disabled, only the song details are shared</string>
     <string name="no_expiration">No Expiration</string>
     <string name="download.toggle_playlist">Toggle Playlist</string>
     <string name="download.bookmark_set">Set Bookmark</string>
diff --git a/ultrasonic/src/main/res/xml/settings.xml b/ultrasonic/src/main/res/xml/settings.xml
index 8aa05da1..09cd31cf 100644
--- a/ultrasonic/src/main/res/xml/settings.xml
+++ b/ultrasonic/src/main/res/xml/settings.xml
@@ -189,10 +189,6 @@
     <PreferenceCategory
         a:title="@string/settings.sharing_title"
         app:iconSpaceReserved="false">
-        <EditTextPreference
-            a:key="sharingDefaultDescription"
-            a:title="@string/settings.share_description_default"
-            app:iconSpaceReserved="false"/>
         <EditTextPreference
             a:key="sharingDefaultGreeting"
             a:title="@string/settings.share_greeting_default"
@@ -201,11 +197,7 @@
             a:defaultValue="true"
             a:key="sharingCreateOnServer"
             a:title="@string/share_on_server"
-            app:iconSpaceReserved="false"/>
-        <org.moire.ultrasonic.util.TimeSpanPreference
-            a:defaultValue="0"
-            a:key="sharingDefaultExpiration"
-            a:title="@string/settings.share_expiration_default"
+            a:summary="@string/settings.share_on_server_summary"
             app:iconSpaceReserved="false"/>
         <CheckBoxPreference
             a:defaultValue="true"
@@ -213,6 +205,15 @@
             a:summary="@string/settings.sharing_always_ask_for_details_summary"
             a:title="@string/settings.sharing_always_ask_for_details"
             app:iconSpaceReserved="false"/>
+        <EditTextPreference
+            a:key="sharingDefaultDescription"
+            a:title="@string/settings.share_description_default"
+            app:iconSpaceReserved="false"/>
+        <org.moire.ultrasonic.util.TimeSpanPreference
+            a:defaultValue="0"
+            a:key="sharingDefaultExpiration"
+            a:title="@string/settings.share_expiration_default"
+            app:iconSpaceReserved="false"/>
     </PreferenceCategory>
     <PreferenceCategory
         a:title="@string/settings.network_title"