Skip to content

Commit a9db786

Browse files
0xpr030xpr03
committed
restructure from type to subject package order
1 parent a119ca4 commit a9db786

File tree

62 files changed

+145
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+145
-177
lines changed

‎app/src/androidTest/java/vocabletrainer/heinecke/aron/vocabletrainer/DBTest.kt

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import org.junit.*
99
import org.junit.runner.RunWith
1010
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database
1111
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.*
12-
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Trainer.SessionStorageManager
13-
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Trainer.Trainer
12+
import vocabletrainer.heinecke.aron.vocabletrainer.trainer.SessionStorageManager
13+
import vocabletrainer.heinecke.aron.vocabletrainer.trainer.Trainer
14+
import vocabletrainer.heinecke.aron.vocabletrainer.trainer.TrainerSettings
1415
import java.sql.Date
1516
import java.util.*
1617
import java.util.concurrent.locks.Lock
@@ -263,7 +264,15 @@ class DBTest {
263264
db.upsertVList(tbl)
264265
val entries: List<VEntry> = generateEntries(tbl)
265266
db.upsertEntries(entries)
266-
Assert.assertNotNull(db.getRandomTrainerEntry( null, TrainerSettings(2, Trainer.TEST_MODE.RANDOM, true, true, true, false), true))
267+
Assert.assertNotNull(db.getRandomTrainerEntry( null,
268+
TrainerSettings(
269+
2,
270+
Trainer.TEST_MODE.RANDOM,
271+
true,
272+
true,
273+
true,
274+
false
275+
), true))
267276
}
268277

269278
/**
@@ -324,7 +333,15 @@ class DBTest {
324333
db.upsertEntries(entries)
325334
// clear previous
326335
db.deleteSession()
327-
val settings = TrainerSettings(points, Trainer.TEST_MODE.RANDOM, true, true, true, false)
336+
val settings =
337+
TrainerSettings(
338+
points,
339+
Trainer.TEST_MODE.RANDOM,
340+
true,
341+
true,
342+
true,
343+
false
344+
)
328345
// init session with db.createSession underneath
329346
SessionStorageManager.CreateSession(db,settings, arrayListOf(tbl))
330347

‎app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
android:fullBackupContent="true"
1515
android:allowBackup="true">
1616
<activity
17-
android:name=".activity.TrainerActivity"
17+
android:name=".trainer.TrainerActivity"
1818
android:parentActivityName=".activity.MainActivity"
1919
android:theme="@style/AppTheme.NoActionBar" />
2020
<activity
21-
android:name=".activity.EditorActivity"
21+
android:name=".editor.EditorActivity"
2222
android:theme="@style/AppTheme.NoActionBar" />
2323
<activity android:exported="true" android:name=".activity.MainActivity">
2424
<intent-filter>
@@ -28,10 +28,10 @@
2828
</intent-filter>
2929
</activity>
3030
<activity
31-
android:name=".activity.ListActivity"
31+
android:name=".editor.ListActivity"
3232
android:theme="@style/AppTheme.NoActionBar" />
3333
<activity
34-
android:name=".activity.TrainerSettingsActivity"
34+
android:name=".trainer.TrainerSettingsActivity"
3535
android:parentActivityName=".activity.MainActivity"
3636
android:theme="@style/AppTheme.NoActionBar" />
3737
<activity
@@ -40,7 +40,7 @@
4040
android:theme="@style/AppTheme.NoActionBar" />
4141
<activity android:name=".activity.PermActivity" />
4242
<activity
43-
android:name=".activity.ExImportActivity"
43+
android:name=".eximport.ExImportActivity"
4444
android:label="@string/title_activity_format"
4545
android:theme="@style/AppTheme.NoActionBar" />
4646
</application>

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/MainActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package vocabletrainer.heinecke.aron.vocabletrainer.activity;
22

3-
import android.app.Activity;
4-
import android.content.DialogInterface;
53
import android.content.Intent;
64
import android.content.SharedPreferences;
75
import android.os.Bundle;
@@ -10,12 +8,15 @@
108

119
import androidx.appcompat.app.AlertDialog;
1210
import androidx.appcompat.app.AppCompatActivity;
13-
import androidx.core.content.ContextCompat;
1411

1512
import vocabletrainer.heinecke.aron.vocabletrainer.R;
16-
import vocabletrainer.heinecke.aron.vocabletrainer.dialog.SurveyDialog;
13+
import vocabletrainer.heinecke.aron.vocabletrainer.editor.ListActivity;
14+
import vocabletrainer.heinecke.aron.vocabletrainer.survey.SurveyDialog;
15+
import vocabletrainer.heinecke.aron.vocabletrainer.eximport.ExImportActivity;
1716
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database;
1817
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget.VectorImageHelper;
18+
import vocabletrainer.heinecke.aron.vocabletrainer.trainer.TrainerActivity;
19+
import vocabletrainer.heinecke.aron.vocabletrainer.trainer.TrainerSettingsActivity;
1920

2021
/**
2122
* Main activity

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/EditorActivity.kt renamed to ‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/editor/EditorActivity.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vocabletrainer.heinecke.aron.vocabletrainer.activity
1+
package vocabletrainer.heinecke.aron.vocabletrainer.editor
22

33
import android.content.DialogInterface
44
import android.database.SQLException
@@ -19,12 +19,11 @@ import androidx.appcompat.widget.Toolbar
1919
import com.google.android.material.floatingactionbutton.FloatingActionButton
2020
import com.google.android.material.snackbar.Snackbar
2121
import vocabletrainer.heinecke.aron.vocabletrainer.R
22+
import vocabletrainer.heinecke.aron.vocabletrainer.activity.MainActivity
2223
import vocabletrainer.heinecke.aron.vocabletrainer.dialog.ItemPickerDialog
2324
import vocabletrainer.heinecke.aron.vocabletrainer.dialog.ItemPickerDialog.ItemPickerHandler
24-
import vocabletrainer.heinecke.aron.vocabletrainer.dialog.VEntryEditorDialog
25-
import vocabletrainer.heinecke.aron.vocabletrainer.dialog.VEntryEditorDialog.EditorDialogDataProvider
26-
import vocabletrainer.heinecke.aron.vocabletrainer.dialog.VListEditorDialog
27-
import vocabletrainer.heinecke.aron.vocabletrainer.dialog.VListEditorDialog.ListEditorDataProvider
25+
import vocabletrainer.heinecke.aron.vocabletrainer.editor.VEntryEditorDialog.EditorDialogDataProvider
26+
import vocabletrainer.heinecke.aron.vocabletrainer.editor.VListEditorDialog.ListEditorDataProvider
2827
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter.EntryListAdapter
2928
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenEntryComparator
3029
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/ListActivity.java renamed to ‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/editor/ListActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vocabletrainer.heinecke.aron.vocabletrainer.activity;
1+
package vocabletrainer.heinecke.aron.vocabletrainer.editor;
22

33
import android.app.Activity;
44
import androidx.lifecycle.ViewModelProviders;
@@ -11,7 +11,8 @@
1111
import java.util.List;
1212

1313
import vocabletrainer.heinecke.aron.vocabletrainer.R;
14-
import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ListPickerFragment;
14+
import vocabletrainer.heinecke.aron.vocabletrainer.activity.FragmentActivity;
15+
import vocabletrainer.heinecke.aron.vocabletrainer.listpicker.ListPickerFragment;
1516
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
1617
import vocabletrainer.heinecke.aron.vocabletrainer.lib.ViewModel.ListPickerViewModel;
1718

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/VEntryEditorDialog.java renamed to ‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/editor/VEntryEditorDialog.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vocabletrainer.heinecke.aron.vocabletrainer.dialog;
1+
package vocabletrainer.heinecke.aron.vocabletrainer.editor;
22

33
import android.app.Dialog;
44
import android.content.Context;
@@ -7,7 +7,6 @@
77
import android.util.Log;
88
import android.view.View;
99
import android.view.ViewGroup;
10-
import android.view.WindowManager;
1110
import android.view.inputmethod.EditorInfo;
1211
import android.view.inputmethod.InputMethodManager;
1312
import android.widget.EditText;
@@ -25,7 +24,6 @@
2524

2625
import java.util.ArrayList;
2726
import java.util.List;
28-
import java.util.Objects;
2927

3028
import vocabletrainer.heinecke.aron.vocabletrainer.R;
3129
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Function;

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/VListEditorDialog.java renamed to ‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/editor/VListEditorDialog.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vocabletrainer.heinecke.aron.vocabletrainer.dialog;
1+
package vocabletrainer.heinecke.aron.vocabletrainer.editor;
22

33
import androidx.appcompat.app.AlertDialog;
44
import android.app.Dialog;
@@ -7,11 +7,9 @@
77
import androidx.annotation.NonNull;
88
import androidx.fragment.app.DialogFragment;
99
import android.util.Log;
10-
import android.view.KeyEvent;
1110
import android.view.View;
1211
import android.view.inputmethod.EditorInfo;
1312
import android.widget.EditText;
14-
import android.widget.TextView;
1513

1614
import java.util.concurrent.Callable;
1715

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/CSVCustomFormat.java renamed to ‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/eximport/CSV/CSVCustomFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV;
1+
package vocabletrainer.heinecke.aron.vocabletrainer.eximport.CSV;
22

33
import android.os.Parcel;
44
import android.os.Parcelable;

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/CSVHeaders.java renamed to ‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/eximport/CSV/CSVHeaders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV;
1+
package vocabletrainer.heinecke.aron.vocabletrainer.eximport.CSV;
22

33
/**
44
* Class for header commands

‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Exporter.java renamed to ‎app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/eximport/CSV/Exporter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV;
1+
package vocabletrainer.heinecke.aron.vocabletrainer.eximport.CSV;
22

33
import androidx.lifecycle.MutableLiveData;
44
import android.content.Context;
@@ -13,14 +13,14 @@
1313
import java.io.OutputStreamWriter;
1414
import java.util.List;
1515

16-
import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ExportFragment;
16+
import vocabletrainer.heinecke.aron.vocabletrainer.eximport.ExportFragment;
1717
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database;
1818
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Function;
1919
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VEntry;
2020
import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
2121

22-
import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVHeaders.CSV_METADATA_COMMENT;
23-
import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVHeaders.CSV_METADATA_START;
22+
import static vocabletrainer.heinecke.aron.vocabletrainer.eximport.CSV.CSVHeaders.CSV_METADATA_COMMENT;
23+
import static vocabletrainer.heinecke.aron.vocabletrainer.eximport.CSV.CSVHeaders.CSV_METADATA_START;
2424
import static vocabletrainer.heinecke.aron.vocabletrainer.lib.Database.ID_RESERVED_SKIP;
2525

2626
/**

0 commit comments

Comments
 (0)