From c9698e5f937709d950fd2df4fafebd904b25f960 Mon Sep 17 00:00:00 2001
From: denizk0461 <denizk0461@gmail.com>
Date: Wed, 8 Nov 2023 09:46:47 +0100
Subject: [PATCH] UI changes: changed "randomise entry order" to "shuffle
 order" to clear ambiguity; added buttons for import and export of entries
 (function to be implemented)

---
 .../com/denizd/textbasic/db/QuoteStorage.kt   |  2 +-
 .../main/res/layout/fragment_settings_new.xml | 56 +++++++++++++++++++
 app/src/main/res/values-de/strings.xml        |  4 ++
 app/src/main/res/values/strings.xml           |  8 ++-
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/denizd/textbasic/db/QuoteStorage.kt b/app/src/main/java/com/denizd/textbasic/db/QuoteStorage.kt
index 2f429d8..5dbf542 100644
--- a/app/src/main/java/com/denizd/textbasic/db/QuoteStorage.kt
+++ b/app/src/main/java/com/denizd/textbasic/db/QuoteStorage.kt
@@ -141,7 +141,7 @@ class QuoteStorage private constructor(context: Context) {
         prefs.edit().putBoolean(SettingsPreference.NEEDS_MIGRATION.key, false).apply()
     }
 
-    fun exportEntriesAsJson(): String = Gson().toJson(dao.getAllEntriesSync().map { e -> e.text })
+    fun exportEntriesAsJson(): String = ""//Gson().toJson(dao.getAllEntriesSync().map { e -> e.text })
 
     fun importEntriesFromJson(json: String) {
         // TODO
diff --git a/app/src/main/res/layout/fragment_settings_new.xml b/app/src/main/res/layout/fragment_settings_new.xml
index 62d260f..8048fca 100644
--- a/app/src/main/res/layout/fragment_settings_new.xml
+++ b/app/src/main/res/layout/fragment_settings_new.xml
@@ -779,6 +779,62 @@
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="16dp" />
 
+                    <!-- Import -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/button_import"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/selectable_item_background"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_import_title"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/import_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_import_subtitle"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <!-- Export -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/button_export"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/selectable_item_background"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/mono_semibold_italic"
+                            android:text="@string/settings_export_title"
+                            android:textSize="16sp" />
+
+                        <TextView
+                            android:id="@+id/export_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/settings_export_subtitle"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
                     <!-- Licences -->
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:id="@+id/button_licences"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 112c230..7a09cb9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -63,6 +63,10 @@
 
     <string name="settings_misc_header">Sonstiges</string>
 
+    <string name="settings_import_title">Einträge von Datei importieren</string>
+    <string name="settings_import_subtitle">Öffnet den Dateiexplorer</string>
+    <string name="settings_export_title">Einträge als Datei exportieren</string>
+    <string name="settings_export_subtitle">Export wird als JSON-Datei abgespeichert</string>
     <string name="settings_licences_title">Siehe Lizenzen</string>
     <string name="settings_licences_subtitle">Ressourcen, die diese App möglich gemacht haben</string>
     <string name="sheet_licences_header">Lizenzen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 60e1229..93b0e4a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="thickness">thickness</string>
     <string name="intensity">intensity</string>
     <string name="invert">Invert colours</string>
-    <string name="random">Randomise order</string>
+    <string name="random">Shuffle</string>
     <string name="contrast">Increase the contrast</string>
     <string name="info_add_text">add some text!</string>
     <string name="snack_backup_download">Restoring your data…</string>
@@ -54,7 +54,7 @@
     <string name="settings_highlight_transparency_header">Opacity</string>
 
     <string name="settings_widget_header">Widget</string>
-    <string name="settings_widget_order_title">Randomise entry order</string>
+    <string name="settings_widget_order_title">Shuffle entries</string>
     <string name="settings_widget_order_subtitle">Order from the list is preserved otherwise; change by drag-and-drop</string>
     <string name="settings_widget_order_default">Default</string>
     <string name="settings_widget_order_random">Random</string>
@@ -62,6 +62,10 @@
 
     <string name="settings_misc_header">Miscellaneous</string>
 
+    <string name="settings_import_title">Import entries from file</string>
+    <string name="settings_import_subtitle">Opens your file explorer</string>
+    <string name="settings_export_title">Export entries to file</string>
+    <string name="settings_export_subtitle">Export will be saved to a JSON file</string>
     <string name="settings_licences_title">View licences</string>
     <string name="settings_licences_subtitle">Resources that made this app possible</string>
     <string name="sheet_licences_header">Licences</string>