From f5e8efb875afc6d7d588f76289803f7ebfb5c1e3 Mon Sep 17 00:00:00 2001
From: Domalar <48490969+Domalar@users.noreply.github.com>
Date: Thu, 18 May 2023 18:46:38 +0200
Subject: [PATCH 1/2] Fixed a Type in German Translation (Standart => Standard)

---
 app/src/main/res/values-de-rDE/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 2033a70..689eb7e 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -6,7 +6,7 @@
     <string name="action_cancel">Abbrechen</string>
     <string name="action_choose">Auswählen</string>
     <string name="action_clear">Bereinigen</string>
-    <string name="action_default">Standart</string>
+    <string name="action_default">Standard</string>
     <string name="action_donate">Spenden</string>
     <string name="action_done">Fertig</string>
     <string name="action_export">Exportieren</string>

From 90bf43b891c1dfa7473be0412da528b31572f6d0 Mon Sep 17 00:00:00 2001
From: Domalar <48490969+Domalar@users.noreply.github.com>
Date: Thu, 18 May 2023 19:07:31 +0200
Subject: [PATCH 2/2] New Setting "Import into Archive" => does the same as in
 the past but if slider is disabled the times that are imported, are not
 imported into the archive => the times are imported in the current sessions.

---
 .../com/aricneto/twistytimer/activity/MainActivity.java     | 6 ++++--
 app/src/main/res/values-de-rDE/strings.xml                  | 2 ++
 app/src/main/res/values/pref_keys.xml                       | 1 +
 app/src/main/res/values/strings.xml                         | 2 ++
 app/src/main/res/xml/prefs.xml                              | 6 ++++++
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/aricneto/twistytimer/activity/MainActivity.java b/app/src/main/java/com/aricneto/twistytimer/activity/MainActivity.java
index f04de95..9298876 100644
--- a/app/src/main/java/com/aricneto/twistytimer/activity/MainActivity.java
+++ b/app/src/main/java/com/aricneto/twistytimer/activity/MainActivity.java
@@ -1037,6 +1037,8 @@ protected void onProgressUpdate(Integer... values) {
         protected Void doInBackground(Void... voids) {
             List<Solve> solveList = new ArrayList<>();
 
+            boolean importIntoArchive = Prefs.getBoolean(R.string.pk_import_archive, true);
+
             try {
 
                 BufferedReader br = new BufferedReader(new FileReader(mFile));
@@ -1051,7 +1053,7 @@ protected Void doInBackground(Void... voids) {
                         try {
                             solveList.add(new Solve(
                                 Integer.parseInt(line[2]), line[0], line[1], Long.parseLong(line[3]),
-                                line[4], Integer.parseInt(line[5]), line[6], true));
+                                line[4], Integer.parseInt(line[5]), line[6], importIntoArchive));
                         } catch (Exception e) {
                             parseErrors++;
                         }
@@ -1088,7 +1090,7 @@ protected Void doInBackground(Void... voids) {
 
                                 solveList.add(new Solve(
                                         time, mPuzzleType, mPuzzleCategory,
-                                        date, scramble, penalty, "", true));
+                                        date, scramble, penalty, "", importIntoArchive));
                             } catch (Exception e) {
                                 parseErrors++;
                             }
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 689eb7e..81f9a5c 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -240,8 +240,10 @@
     <string name="dialog_add_time_use_scramble">Aktuelles Schema speichern</string>
     <string name="pref_summary_new">Kürzlich hinzugefügte Einstellungen</string>
     <string name="pref_summary_tint_navigation">Experimentelle. Färbt die Navigationsleiste in den Designfarben.\nFunktioniert nur auf Android Lollipop und besser!</string>
+    <string name="pref_summary_import_archive">Importiert Zeiten ins Archiv, deaktiviert in die Session</string>
     <string name="pref_title_tint_navigation">Farbige Navigationsleiste</string>
     <string name="pref_title_menu_background">Menü-Hintergrund deaktivieren</string>
+    <string name="pref_title_import_archive">Importiere Zeiten in Archiv</string>
     <string name="pref_summary_menu_background">Deaktiviert den getönten Hintergrund der oberen Menüleiste</string>
     <string name="dialog_theme_text_style">Textstil</string>
     <string name="pref_screen_title_general">Allgemeines</string>
diff --git a/app/src/main/res/values/pref_keys.xml b/app/src/main/res/values/pref_keys.xml
index 6e7693a..49ada13 100644
--- a/app/src/main/res/values/pref_keys.xml
+++ b/app/src/main/res/values/pref_keys.xml
@@ -30,6 +30,7 @@ THESE KEYS MUST NOT BE LOCALIZED!
     <string translatable="false" name="pk_show_clear_button">clearEnabled</string>
     <string translatable="false" name="pk_tint_navigation_bar">pkTintNavigationBar</string>
     <string translatable="false" name="pk_menu_background">pkMenuBackground</string>
+    <string translatable="false" name="pk_import_archive">pkImportArchive</string>
 
     <string translatable="false" name="pk_scramble_enabled">scrambleEnabled</string>
     <string translatable="false" name="pk_show_scramble_hints">showHints</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 759aeed..abb2ef8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -401,6 +401,8 @@
     <string name="pref_title_tint_navigation">Tint navigation bar</string>
     <string name="pref_title_menu_background">Disable menu background</string>
     <string name="pref_summary_menu_background">Disables the tinted background behind the top menu bar</string>
+    <string name="pref_title_import_archive">Import times into archive</string>
+    <string name="pref_summary_import_archive">Import times into archive, inactive into the session</string>
     <string name="dialog_theme_text_style">Text style</string>
     <string name="pref_screen_title_general">General</string>
     <string name="pref_screen_title_list">List</string>
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index 4ab111a..15ef7e0 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -280,6 +280,12 @@
                     android:summary="@string/pref_summary_menu_background"
                     android:title="@string/pref_title_menu_background" />
 
+                <SwitchPreferenceCompat
+                    android:defaultValue="true"
+                    android:key="@string/pk_import_archive"
+                    android:summary="@string/pref_summary_import_archive"
+                    android:title="@string/pref_title_import_archive" />
+
             </PreferenceCategory>
 
         </PreferenceScreen>