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 f04de95a..9298876c 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 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 2033a704..81f9a5c4 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 @@ Abbrechen Auswählen Bereinigen - Standart + Standard Spenden Fertig Exportieren @@ -240,8 +240,10 @@ Aktuelles Schema speichern Kürzlich hinzugefügte Einstellungen Experimentelle. Färbt die Navigationsleiste in den Designfarben.\nFunktioniert nur auf Android Lollipop und besser! + Importiert Zeiten ins Archiv, deaktiviert in die Session Farbige Navigationsleiste Menü-Hintergrund deaktivieren + Importiere Zeiten in Archiv Deaktiviert den getönten Hintergrund der oberen Menüleiste Textstil Allgemeines diff --git a/app/src/main/res/values/pref_keys.xml b/app/src/main/res/values/pref_keys.xml index 6e7693af..49ada133 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! clearEnabled pkTintNavigationBar pkMenuBackground + pkImportArchive scrambleEnabled showHints diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 759aeed8..abb2ef8c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -401,6 +401,8 @@ Tint navigation bar Disable menu background Disables the tinted background behind the top menu bar + Import times into archive + Import times into archive, inactive into the session Text style General List diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index 4ab111a4..15ef7e05 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" /> + +