From e253c564ab758ea9eb3c2ef5397c462aa47c698b Mon Sep 17 00:00:00 2001
From: ronniedroid <ronnie.nissan@proton.me>
Date: Sun, 21 Apr 2024 11:43:10 +0300
Subject: [PATCH] Updated strings and remove action aborted toast messages

---
 .../clock/activities/SettingsActivity.kt      | 14 ++++----
 app/src/main/res/layout/activity_settings.xml | 34 +++++--------------
 app/src/main/res/values/strings.xml           | 10 ++----
 3 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt
index 8046e92b..5b7334f1 100644
--- a/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/org/fossify/clock/activities/SettingsActivity.kt
@@ -198,8 +198,6 @@ class SettingsActivity : SimpleActivity() {
             val outputStream = uri?.let { contentResolver.openOutputStream(it) }
             if (outputStream != null) {
                 exportDataTo(outputStream)
-            } else {
-                toast(CR.string.exporting_aborted)
             }
         } catch (e: Exception) {
             showErrorToast(e)
@@ -207,10 +205,12 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private val importActivityResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-        if (uri != null) {
-            tryImportDataFromFile(uri)
-        } else {
-            toast(CR.string.importing_aborted)
+        try {
+            if (uri != null) {
+                tryImportDataFromFile(uri)
+            }
+        } catch (e: Exception) {
+            showErrorToast(e)
         }
     }
 
@@ -326,7 +326,7 @@ class SettingsActivity : SimpleActivity() {
                     DataImporter.ImportResult.IMPORT_OK ->
                         R.string.importing_successful
 
-                    DataImporter.ImportResult.IMPORT_INCOMPLETE -> CR.string.import_incomplete
+                    DataImporter.ImportResult.IMPORT_INCOMPLETE -> R.string.importing_some_entries_failed
                     DataImporter.ImportResult.ALARMS_IMPORT_FAIL -> CR.string.alarms_import_failed
                     DataImporter.ImportResult.TIMERS_IMPORT_FAIL -> CR.string.timers_import_failed
                     DataImporter.ImportResult.IMPORT_FAIL -> R.string.no_items_found
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index dba596ab..0eeaaba5 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -284,16 +284,16 @@
 
             </RelativeLayout>
 
-                <include
-                    android:id="@+id/settings_timer_tab_divider"
-                    layout="@layout/divider"/>
+            <include
+                android:id="@+id/settings_timer_tab_divider"
+                layout="@layout/divider" />
 
-                <TextView
-                    android:id="@+id/settings_export_and_import"
-                    style="@style/SettingsSectionLabelStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_export_and_import" />
+            <TextView
+                android:id="@+id/settings_export_and_import"
+                style="@style/SettingsSectionLabelStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/migrating" />
 
 
             <RelativeLayout
@@ -308,14 +308,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/settings_export_data" />
-
-                <org.fossify.commons.views.MyTextView
-                    android:id="@+id/settings_export_data"
-                    style="@style/SettingsTextValueStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_export_data_label"
-                    tools:text="@+string/settings_export_data_subtitle" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -330,14 +322,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/settings_import_data" />
-
-                <org.fossify.commons.views.MyTextView
-                    android:id="@+id/settings_import_data"
-                    style="@style/SettingsTextValueStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/settings_import_data_label"
-                    tools:text="@+string/settings_import_data_subtitle" />
             </RelativeLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d9385fc..c6fc3b41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,16 +50,10 @@
     <string name="timer_tab">Timer tab</string>
     <string name="show_seconds">Show seconds</string>
     <string name="increase_volume_gradually">Increase volume gradually</string>
-    <string name="settings_export_and_import">Export and import</string>
-    <string name="settings_import_data">Import data</string>
-    <string name="settings_import_data_subtitle">Import app data (Alarms and Timers)</string>
-    <string name="settings_export_data">Export data</string>
-    <string name="settings_export_data_subtitle">Export app data (Alarms and Timers)</string>
-    <string name="exporting_aborted">Exporting aborted</string>
-    <string name="importing_aborted">Importing aborted</string>
+    <string name="settings_import_data">Import alarms and timers</string>
+    <string name="settings_export_data">Export alarms and timers</string>
     <string name="alarms_import_failed">Importing alarms failed</string>
     <string name="timers_import_failed">Importing timers failed</string>
-    <string name="import_incomplete">Partial import due to wrong data</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>