Skip to content

Import Times into session or into archive #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Domalar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Import Times into session or into archive #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5e8efb
Fixed a Type in German Translation (Standart => Standard)
Domalar May 18, 2023
90bf43b
New Setting "Import into Archive" => does the same as in the past but…
Domalar May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/java/com/aricneto/twistytimer/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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++;
}
Expand Down Expand Up @@ -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++;
}
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values-de-rDE/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/pref_keys.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/xml/prefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down