tidy up lib package, move classes in own packages

0xpr03 · 0xpr03 · commit de59c8897ffb · 2018-10-04T02:01:05.000+02:00
Signed-off-by: Aron Heinecke &lt;aron.heinecke@t-online.de&gt;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/EditorActivity.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/EditorActivity.java
@@ -13,18 +13,13 @@
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.ScaleAnimation;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import java.util.ArrayList;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
-import vocabletrainer.heinecke.aron.vocabletrainer.activity.lib.EntryListAdapter;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter.EntryListAdapter;
 import vocabletrainer.heinecke.aron.vocabletrainer.dialog.VEntryEditorDialog;
 import vocabletrainer.heinecke.aron.vocabletrainer.dialog.VListEditorDialog;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenEntryComparator;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/ExImportActivity.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/ExImportActivity.java
@@ -2,10 +2,8 @@
 
 import android.Manifest;
 import android.arch.lifecycle.ViewModelProviders;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
@@ -28,19 +26,17 @@
 import java.util.ArrayList;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
-import vocabletrainer.heinecke.aron.vocabletrainer.activity.lib.ViewPagerAdapter;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter.ViewPagerAdapter;
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ExportFragment;
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.FormatFragment;
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ImportFragment;
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ListPickerFragment;
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.PreviewFragment;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.GenericSpinnerEntry;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.ViewModel.FormatViewModel;
 
-import static vocabletrainer.heinecke.aron.vocabletrainer.activity.MainActivity.PREFS_NAME;
-
 /**
  * Activity for import/export
  */
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/FileActivity.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/FileActivity.java
@@ -25,7 +25,7 @@
 import java.util.Comparator;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
-import vocabletrainer.heinecke.aron.vocabletrainer.activity.lib.FileListAdapter;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter.FileListAdapter;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenFileEntryComparator;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenericComparator;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Formatter;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/TrainerActivity.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/TrainerActivity.java
@@ -21,7 +21,7 @@
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.TrainerModeFragment;
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.TrainerQuickFragment;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.SessionStorageManager;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Trainer.SessionStorageManager;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.TrainerSettings;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Trainer.Trainer;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ExportFragment.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ExportFragment.java
@@ -33,7 +33,7 @@
 import vocabletrainer.heinecke.aron.vocabletrainer.activity.ExImportActivity;
 import vocabletrainer.heinecke.aron.vocabletrainer.activity.FileActivity;
 import vocabletrainer.heinecke.aron.vocabletrainer.dialog.ProgressDialog;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenTableComparator;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenericComparator;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.GenericSpinnerEntry;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/FormatFragment.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/FormatFragment.java
@@ -27,8 +27,8 @@
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
 import vocabletrainer.heinecke.aron.vocabletrainer.activity.FragmentActivity;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CustomEditTextPreference;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget.CustomEditTextPreference;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.ViewModel.FormatViewModel;
 
 /**
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ImportFragment.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ImportFragment.java
@@ -35,15 +35,15 @@
 import vocabletrainer.heinecke.aron.vocabletrainer.dialog.ImportLogDialog;
 import vocabletrainer.heinecke.aron.vocabletrainer.dialog.ProgressDialog;
 import vocabletrainer.heinecke.aron.vocabletrainer.dialog.VListEditorDialog;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CustomItemSelectedListener;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.Import.ImportFetcher;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.Import.Importer;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget.CustomItemSelectedListener;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import.ImportFetcher;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import.Importer;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.GenericSpinnerEntry;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.ViewModel.FormatViewModel;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.ViewModel.ImportViewModel;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.ViewCreation;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget.ViewCreation;
 
 import static vocabletrainer.heinecke.aron.vocabletrainer.activity.MainActivity.PREFS_NAME;
 
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ListPickerFragment.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/ListPickerFragment.java
@@ -24,11 +24,10 @@
 import android.widget.Toast;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
-import vocabletrainer.heinecke.aron.vocabletrainer.activity.lib.ListTouchHelper;
-import vocabletrainer.heinecke.aron.vocabletrainer.activity.lib.ListRecyclerAdapter;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter.ListTouchHelper;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter.ListRecyclerAdapter;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenTableComparator;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Comparator.GenericComparator;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/PreviewFragment.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/fragment/PreviewFragment.java
@@ -14,7 +14,7 @@
 import java.util.Objects;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
-import vocabletrainer.heinecke.aron.vocabletrainer.activity.lib.EntryListAdapter;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter.EntryListAdapter;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.ViewModel.ImportViewModel;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VEntry;
 
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/EntryListAdapter.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/EntryListAdapter.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.activity.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter;
 
 import android.app.Activity;
 import android.graphics.Typeface;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/FileListAdapter.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/FileListAdapter.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.activity.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter;
 
 import android.app.Activity;
 import android.graphics.Paint;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/ListRecyclerAdapter.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/ListRecyclerAdapter.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.activity.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/ListTouchHelper.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/ListTouchHelper.java
@@ -1,12 +1,10 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.activity.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter;
 
 import android.graphics.Canvas;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.View;
 
-import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ListPickerFragment;
-
 /**
  * VList touch helper for recyclerview
  */
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/TableListAdapter.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/TableListAdapter.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.activity.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter;
 
 import android.content.Context;
 import android.graphics.Typeface;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/ViewPagerAdapter.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Adapter/ViewPagerAdapter.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.activity.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/CSVCustomFormat.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/CSVCustomFormat.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/CSVHeaders.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/CSVHeaders.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV;
 
 /**
  * Class for header commands
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Exporter.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Exporter.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV;
 
 import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
@@ -12,11 +12,13 @@
 import java.util.List;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ExportFragment;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Function;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VEntry;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
 
-import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVHeaders.CSV_METADATA_COMMENT;
-import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVHeaders.CSV_METADATA_START;
+import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVHeaders.CSV_METADATA_COMMENT;
+import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVHeaders.CSV_METADATA_START;
 import static vocabletrainer.heinecke.aron.vocabletrainer.lib.Database.ID_RESERVED_SKIP;
 
 /**
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/ImportFetcher.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/ImportFetcher.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib.Import;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import;
 
 import android.arch.lifecycle.MutableLiveData;
 import android.os.AsyncTask;
@@ -17,11 +17,11 @@
 import java.util.List;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.R;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Function;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.MultiMeaningHandler;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.MultiMeaningHandler;
 
-import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVHeaders.CSV_METADATA_START;
+import static vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVHeaders.CSV_METADATA_START;
 
 /**
  * ImportFetcher class<br>
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/ImportFetcherBuilder.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/ImportFetcherBuilder.java
@@ -1,10 +1,10 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib.Import;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import;
 
 import android.arch.lifecycle.MutableLiveData;
 
 import java.io.File;
 
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Function;
 
 /**
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/ImportHandler.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/ImportHandler.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib.Import;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import;
 
 import java.util.List;
 
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/Importer.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/Importer.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib.Import;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/PreviewParser.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/Import/PreviewParser.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib.Import;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/MultiMeaningHandler.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/CSV/MultiMeaningHandler.java
@@ -1,11 +1,13 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV;
 
 import android.support.annotation.NonNull;
 
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
+
 /**
  * Multi meaning handler
  */
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Trainer/SessionStorageManager.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Trainer/SessionStorageManager.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Trainer;
 
 import android.database.sqlite.SQLiteStatement;
 import android.util.Log;
@@ -7,6 +7,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.TrainerSettings;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VEntry;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Trainer/Trainer.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Trainer/Trainer.java
@@ -12,7 +12,6 @@
 import java.util.Random;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Database;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.SessionStorageManager;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.TrainerSettings;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VEntry;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VList;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/ExportViewModel.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/ExportViewModel.java
@@ -9,7 +9,7 @@
 import android.util.Log;
 
 import vocabletrainer.heinecke.aron.vocabletrainer.fragment.ExportFragment;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.Exporter;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Exporter;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Function;
 
 /**
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/FormatViewModel.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/FormatViewModel.java
@@ -7,7 +7,7 @@
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
 
 import static vocabletrainer.heinecke.aron.vocabletrainer.activity.ExImportActivity.loadCustomFormat;
 import static vocabletrainer.heinecke.aron.vocabletrainer.activity.MainActivity.PREFS_NAME;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/ImportViewModel.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/ImportViewModel.java
@@ -12,12 +12,12 @@
 import java.io.File;
 import java.util.ArrayList;
 
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSVCustomFormat;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.CSVCustomFormat;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Function;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.Import.ImportFetcher;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.Import.ImportFetcherBuilder;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.Import.Importer;
-import vocabletrainer.heinecke.aron.vocabletrainer.lib.Import.PreviewParser;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import.ImportFetcher;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import.ImportFetcherBuilder;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import.Importer;
+import vocabletrainer.heinecke.aron.vocabletrainer.lib.CSV.Import.PreviewParser;
 import vocabletrainer.heinecke.aron.vocabletrainer.lib.Storage.VEntry;
 
 import static android.os.AsyncTask.Status.RUNNING;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/CEditText.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/CEditText.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/CustomEditTextPreference.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/CustomEditTextPreference.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget;
 
 import android.content.Context;
 import android.support.v7.preference.EditTextPreference;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/CustomItemSelectedListener.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/CustomItemSelectedListener.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget;
 
 import android.view.View;
 import android.widget.AdapterView;
@@ -18,7 +18,7 @@ public final void onItemSelected(AdapterView<?> parent, View view, int position,
     }
 
     /**
-     * Set firstSelect as undone, disabling the next itemSelect call
+     * Set firstSelect as undone, disabling the next itemSelect call from triggering itemSelected
      */
     public void setFirstUnselected() {
         this.firstSelect = true;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/DPIHelper.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/DPIHelper.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget;
 
 import android.content.res.Resources;
 import android.util.TypedValue;
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/ViewCreation.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/Widget/ViewCreation.java
@@ -1,4 +1,4 @@
-package vocabletrainer.heinecke.aron.vocabletrainer.lib;
+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget;
 
 import android.view.View;
 import android.widget.RadioButton;
diff --git a/app/src/main/res/layout/fragment_trainer_classic.xml b/app/src/main/res/layout/fragment_trainer_classic.xml
@@ -25,7 +25,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0">
 
-        <vocabletrainer.heinecke.aron.vocabletrainer.lib.CEditText
+        <vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget.CEditText
             android:id="@+id/tTrainerInput"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/trainer_input_elem.xml b/app/src/main/res/layout/trainer_input_elem.xml
@@ -9,7 +9,7 @@
     android:layout_marginBottom="10dp"
     android:orientation="vertical">
 
-    <vocabletrainer.heinecke.aron.vocabletrainer.lib.CEditText
+    <vocabletrainer.heinecke.aron.vocabletrainer.lib.Widget.CEditText
         android:id="@+id/tTrainerInput"
         android:imeOptions="flagNoExtractUi"
         android:inputType="text|textNoSuggestions"
diff --git a/app/src/main/res/xml/pref_format.xml b/app/src/main/res/xml/pref_format.xml
diff --git a/app/src/test/java/vocabletrainer/heinecke/aron/vocabletrainer/MultiMeaningFormatterTest.java b/app/src/test/java/vocabletrainer/heinecke/aron/vocabletrainer/MultiMeaningFormatterTest.java
diff --git a/app/src/test/java/vocabletrainer/heinecke/aron/vocabletrainer/MultiMeaningParserTest.java b/app/src/test/java/vocabletrainer/heinecke/aron/vocabletrainer/MultiMeaningParserTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package vocabletrainer.heinecke.aron.vocabletrainer.activity.lib;`
	`1`	`+package vocabletrainer.heinecke.aron.vocabletrainer.lib.Adapter;`
`2`	`2`
`3`	`3`	`import android.app.Activity;`
`4`	`4`	`import android.graphics.Typeface;`