diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/models/CheckmarkListTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/models/CheckmarkListTest.java index 6413a566b..0485607fb 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/models/CheckmarkListTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/models/CheckmarkListTest.java @@ -22,7 +22,7 @@ package org.isoron.uhabits.unit.models; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import org.junit.After; import org.junit.Before; diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitFixtures.java b/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitFixtures.java index a8c706a2c..bb2559cb8 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitFixtures.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitFixtures.java @@ -19,7 +19,7 @@ package org.isoron.uhabits.unit.models; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; public class HabitFixtures diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitTest.java index e6be6b150..c7420aa40 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitTest.java @@ -23,7 +23,7 @@ import android.graphics.Color; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import org.junit.Before; import org.junit.Test; diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/models/RepetitionListTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/models/RepetitionListTest.java index 173af0b51..9ca8ad4b2 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/models/RepetitionListTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/models/RepetitionListTest.java @@ -22,7 +22,7 @@ package org.isoron.uhabits.unit.models; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import org.junit.After; import org.junit.Before; diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java index 350ce4676..bc094139c 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java @@ -22,8 +22,8 @@ package org.isoron.uhabits.unit.models; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; -import org.isoron.helpers.ActiveAndroidHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DatabaseHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Score; import org.junit.After; @@ -132,7 +132,7 @@ public class ScoreListTest private void toggleRepetitions(final int from, final int to) { - ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() + DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command() { @Override public void execute() diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreTest.java index d666ff1df..cfad09f37 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreTest.java @@ -19,19 +19,12 @@ package org.isoron.uhabits.unit.models; -import android.graphics.Color; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; -import org.isoron.helpers.DateHelper; -import org.isoron.uhabits.models.Habit; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.LinkedList; -import java.util.List; - import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; @@ -40,7 +33,6 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import org.isoron.uhabits.models.Score; -import org.isoron.uhabits.models.Repetition; import org.isoron.uhabits.models.Checkmark; @RunWith(AndroidJUnit4.class) diff --git a/app/src/main/java/org/isoron/uhabits/AboutActivity.java b/app/src/main/java/org/isoron/uhabits/AboutActivity.java index 8952bc460..3f84528e1 100644 --- a/app/src/main/java/org/isoron/uhabits/AboutActivity.java +++ b/app/src/main/java/org/isoron/uhabits/AboutActivity.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.view.View; import android.widget.TextView; -import org.isoron.helpers.ColorHelper; +import org.isoron.uhabits.helpers.ColorHelper; public class AboutActivity extends Activity implements View.OnClickListener { diff --git a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java index 685fd8bcc..501b00454 100644 --- a/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java +++ b/app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java @@ -36,7 +36,7 @@ import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.helpers.ReminderHelper; import org.isoron.uhabits.models.Checkmark; import org.isoron.uhabits.models.Habit; diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java index 1888d3773..95b7477b6 100644 --- a/app/src/main/java/org/isoron/uhabits/MainActivity.java +++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java @@ -39,9 +39,8 @@ import android.support.v4.content.LocalBroadcastManager; import android.view.Menu; import android.view.MenuItem; -import org.isoron.helpers.DateHelper; -import org.isoron.helpers.DialogHelper; -import org.isoron.helpers.ReplayableActivity; +import org.isoron.uhabits.helpers.DateHelper; +import org.isoron.uhabits.helpers.DialogHelper; import org.isoron.uhabits.fragments.ListHabitsFragment; import org.isoron.uhabits.helpers.ReminderHelper; import org.isoron.uhabits.models.Habit; diff --git a/app/src/main/java/org/isoron/helpers/ReplayableActivity.java b/app/src/main/java/org/isoron/uhabits/ReplayableActivity.java similarity index 98% rename from app/src/main/java/org/isoron/helpers/ReplayableActivity.java rename to app/src/main/java/org/isoron/uhabits/ReplayableActivity.java index 8f35b4bc7..e95e8441b 100644 --- a/app/src/main/java/org/isoron/helpers/ReplayableActivity.java +++ b/app/src/main/java/org/isoron/uhabits/ReplayableActivity.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.helpers; +package org.isoron.uhabits; import android.app.Activity; import android.app.backup.BackupManager; @@ -25,7 +25,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.widget.Toast; -import org.isoron.uhabits.R; import org.isoron.uhabits.commands.Command; import java.util.LinkedList; diff --git a/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java b/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java index 041685e6e..7a269a733 100644 --- a/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java +++ b/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java @@ -30,7 +30,6 @@ import android.net.Uri; import android.os.Bundle; import android.support.v4.content.LocalBroadcastManager; -import org.isoron.helpers.ReplayableActivity; import org.isoron.uhabits.fragments.ShowHabitFragment; import org.isoron.uhabits.models.Habit; diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java b/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java index 300dcd3ea..f2d54f5a2 100644 --- a/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java +++ b/app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java @@ -25,7 +25,7 @@ import android.app.DialogFragment; import android.content.DialogInterface; import android.os.Bundle; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.R; public class WeekdayPickerDialog extends DialogFragment diff --git a/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java index 342e32ec3..628f85148 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java @@ -32,7 +32,6 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.Button; import android.widget.ImageButton; -import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; @@ -41,9 +40,9 @@ import com.android.colorpicker.ColorPickerSwatch; import com.android.datetimepicker.time.RadialPickerLayout; import com.android.datetimepicker.time.TimePickerDialog; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DateHelper; -import org.isoron.helpers.DialogHelper.OnSavedListener; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DateHelper; +import org.isoron.uhabits.helpers.DialogHelper.OnSavedListener; import org.isoron.uhabits.R; import org.isoron.uhabits.commands.Command; import org.isoron.uhabits.commands.CreateHabitCommand; diff --git a/app/src/main/java/org/isoron/uhabits/fragments/HabitListAdapter.java b/app/src/main/java/org/isoron/uhabits/fragments/HabitListAdapter.java index 3ef39713e..dfbd959f2 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/HabitListAdapter.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/HabitListAdapter.java @@ -27,7 +27,7 @@ import android.widget.BaseAdapter; import android.widget.LinearLayout; import android.widget.TextView; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.R; import org.isoron.uhabits.helpers.ListHabitsHelper; import org.isoron.uhabits.loaders.HabitListLoader; diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/HabitSelectionCallback.java b/app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java similarity index 95% rename from app/src/main/java/org/isoron/uhabits/dialogs/HabitSelectionCallback.java rename to app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java index 8a577981b..899f2f231 100644 --- a/app/src/main/java/org/isoron/uhabits/dialogs/HabitSelectionCallback.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.dialogs; +package org.isoron.uhabits.fragments; import android.app.AlertDialog; import android.content.DialogInterface; @@ -29,16 +29,15 @@ import android.widget.ProgressBar; import com.android.colorpicker.ColorPickerDialog; import com.android.colorpicker.ColorPickerSwatch; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DialogHelper; -import org.isoron.helpers.ReplayableActivity; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DialogHelper; +import org.isoron.uhabits.ReplayableActivity; import org.isoron.uhabits.R; import org.isoron.uhabits.commands.ArchiveHabitsCommand; import org.isoron.uhabits.commands.ChangeHabitColorCommand; import org.isoron.uhabits.commands.DeleteHabitsCommand; import org.isoron.uhabits.commands.UnarchiveHabitsCommand; -import org.isoron.uhabits.fragments.EditHabitFragment; -import org.isoron.uhabits.fragments.ExportHabitsTask; +import org.isoron.uhabits.tasks.ExportCSVTask; import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.models.Habit; @@ -219,6 +218,6 @@ public class HabitSelectionCallback implements ActionMode.Callback private void onExportHabitsClick(final LinkedList selectedHabits) { - new ExportHabitsTask(activity, selectedHabits, progressBar).execute(); + new ExportCSVTask(activity, selectedHabits, progressBar).execute(); } } diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java index 05c95cbc4..c5696b024 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java @@ -50,19 +50,20 @@ import com.mobeta.android.dslv.DragSortListView; import com.mobeta.android.dslv.DragSortListView.DropListener; import org.isoron.uhabits.commands.Command; -import org.isoron.helpers.DateHelper; -import org.isoron.helpers.DialogHelper; -import org.isoron.helpers.DialogHelper.OnSavedListener; -import org.isoron.helpers.ReplayableActivity; +import org.isoron.uhabits.helpers.DateHelper; +import org.isoron.uhabits.helpers.DialogHelper; +import org.isoron.uhabits.helpers.DialogHelper.OnSavedListener; +import org.isoron.uhabits.ReplayableActivity; import org.isoron.uhabits.R; import org.isoron.uhabits.commands.ToggleRepetitionCommand; import org.isoron.uhabits.dialogs.FilePickerDialog; -import org.isoron.uhabits.dialogs.HabitSelectionCallback; -import org.isoron.uhabits.dialogs.HintManager; +import org.isoron.uhabits.helpers.HintManager; import org.isoron.uhabits.helpers.ListHabitsHelper; import org.isoron.uhabits.helpers.ReminderHelper; import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.models.Habit; +import org.isoron.uhabits.tasks.ExportCSVTask; +import org.isoron.uhabits.tasks.ImportDataTask; import java.io.File; import java.util.Date; @@ -72,7 +73,7 @@ import java.util.List; public class ListHabitsFragment extends Fragment implements OnSavedListener, OnItemClickListener, OnLongClickListener, DropListener, OnClickListener, HabitListLoader.Listener, AdapterView.OnItemLongClickListener, - HabitSelectionCallback.Listener, ImportHabitsAsyncTask.Listener + HabitSelectionCallback.Listener, ImportDataTask.Listener { long lastLongClick = 0; private boolean isShortToggleEnabled; @@ -439,7 +440,7 @@ public class ListHabitsFragment extends Fragment @Override public void onFileSelected(File file) { - ImportHabitsAsyncTask task = new ImportHabitsAsyncTask(file, progressBar); + ImportDataTask task = new ImportDataTask(file, progressBar); task.setListener(ListHabitsFragment.this); task.execute(); } @@ -452,12 +453,12 @@ public class ListHabitsFragment extends Fragment { switch (result) { - case ImportHabitsAsyncTask.SUCCESS: + case ImportDataTask.SUCCESS: loader.updateAllHabits(true); activity.showToast(R.string.habits_imported); break; - case ImportHabitsAsyncTask.NOT_RECOGNIZED: + case ImportDataTask.NOT_RECOGNIZED: activity.showToast(R.string.file_not_recognized); break; @@ -469,6 +470,6 @@ public class ListHabitsFragment extends Fragment public void exportAllHabits() { - new ExportHabitsTask(activity, Habit.getAll(true), progressBar).execute(); + new ExportCSVTask(activity, Habit.getAll(true), progressBar).execute(); } } diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java index 1a4e38f6c..61b99cca1 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java +++ b/app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java @@ -37,8 +37,8 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DialogHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DialogHelper; import org.isoron.uhabits.HabitBroadcastReceiver; import org.isoron.uhabits.R; import org.isoron.uhabits.ShowHabitActivity; diff --git a/app/src/main/java/org/isoron/helpers/ColorHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/ColorHelper.java similarity index 98% rename from app/src/main/java/org/isoron/helpers/ColorHelper.java rename to app/src/main/java/org/isoron/uhabits/helpers/ColorHelper.java index 091471699..e58a73745 100644 --- a/app/src/main/java/org/isoron/helpers/ColorHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/ColorHelper.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.helpers; +package org.isoron.uhabits.helpers; import android.graphics.Color; diff --git a/app/src/main/java/org/isoron/helpers/ActiveAndroidHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java similarity index 75% rename from app/src/main/java/org/isoron/helpers/ActiveAndroidHelper.java rename to app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java index 8e89bb7e8..2891eeb5d 100644 --- a/app/src/main/java/org/isoron/helpers/ActiveAndroidHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java @@ -1,8 +1,8 @@ -package org.isoron.helpers; +package org.isoron.uhabits.helpers; import com.activeandroid.ActiveAndroid; -public class ActiveAndroidHelper +public class DatabaseHelper { public interface Command { @@ -17,10 +17,6 @@ public class ActiveAndroidHelper command.execute(); ActiveAndroid.setTransactionSuccessful(); } - catch (RuntimeException e) - { - throw e; - } finally { ActiveAndroid.endTransaction(); diff --git a/app/src/main/java/org/isoron/helpers/DateHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java similarity index 99% rename from app/src/main/java/org/isoron/helpers/DateHelper.java rename to app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java index 97bc17082..8a05c048b 100644 --- a/app/src/main/java/org/isoron/helpers/DateHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.helpers; +package org.isoron.uhabits.helpers; import android.content.Context; import android.text.format.DateFormat; diff --git a/app/src/main/java/org/isoron/helpers/DialogHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java similarity index 99% rename from app/src/main/java/org/isoron/helpers/DialogHelper.java rename to app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java index c24083a7b..9fce7035c 100644 --- a/app/src/main/java/org/isoron/helpers/DialogHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.helpers; +package org.isoron.uhabits.helpers; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/HintManager.java b/app/src/main/java/org/isoron/uhabits/helpers/HintManager.java similarity index 97% rename from app/src/main/java/org/isoron/uhabits/dialogs/HintManager.java rename to app/src/main/java/org/isoron/uhabits/helpers/HintManager.java index 0a3d4dead..998939ed9 100644 --- a/app/src/main/java/org/isoron/uhabits/dialogs/HintManager.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/HintManager.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.dialogs; +package org.isoron.uhabits.helpers; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -27,7 +27,6 @@ import android.preference.PreferenceManager; import android.view.View; import android.widget.TextView; -import org.isoron.helpers.DateHelper; import org.isoron.uhabits.R; public class HintManager diff --git a/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java index 846283a63..75d4b45a3 100644 --- a/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java @@ -30,7 +30,6 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; -import org.isoron.helpers.DateHelper; import org.isoron.uhabits.R; import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.models.Habit; diff --git a/app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java index 24c2fe9e8..876c229fb 100644 --- a/app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java +++ b/app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java @@ -28,7 +28,6 @@ import android.os.Build; import android.support.annotation.Nullable; import android.util.Log; -import org.isoron.helpers.DateHelper; import org.isoron.uhabits.HabitBroadcastReceiver; import org.isoron.uhabits.models.Habit; diff --git a/app/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java b/app/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java index ee583e4bc..46be626c9 100644 --- a/app/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java +++ b/app/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java @@ -24,7 +24,7 @@ import android.support.annotation.NonNull; import com.activeandroid.ActiveAndroid; import com.opencsv.CSVReader; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import java.io.BufferedReader; diff --git a/app/src/main/java/org/isoron/uhabits/io/HabitsExporter.java b/app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java similarity index 96% rename from app/src/main/java/org/isoron/uhabits/io/HabitsExporter.java rename to app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java index 32aad256d..0ac07ec4a 100644 --- a/app/src/main/java/org/isoron/uhabits/io/HabitsExporter.java +++ b/app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java @@ -19,7 +19,7 @@ package org.isoron.uhabits.io; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.CheckmarkList; import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.ScoreList; @@ -35,7 +35,7 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -public class HabitsExporter +public class HabitsCSVExporter { private List habits; @@ -44,7 +44,7 @@ public class HabitsExporter private String exportDirName; - public HabitsExporter(List habits, String exportDirName) + public HabitsCSVExporter(List habits, String exportDirName) { this.habits = habits; this.exportDirName = exportDirName; diff --git a/app/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java b/app/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java index 41a7d442b..66b89690c 100644 --- a/app/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java +++ b/app/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java @@ -23,8 +23,8 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.support.annotation.NonNull; -import org.isoron.helpers.ActiveAndroidHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DatabaseHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import java.io.File; @@ -56,7 +56,7 @@ public class RewireDBImporter extends AbstractImporter final SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null, SQLiteDatabase.OPEN_READONLY); - ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() + DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command() { @Override public void execute() diff --git a/app/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java b/app/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java index 7d471c7f6..be14ca2b4 100644 --- a/app/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java +++ b/app/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java @@ -23,8 +23,8 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.support.annotation.NonNull; -import org.isoron.helpers.ActiveAndroidHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DatabaseHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import java.io.File; @@ -56,7 +56,7 @@ public class TickmateDBImporter extends AbstractImporter final SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null, SQLiteDatabase.OPEN_READONLY); - ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() + DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command() { @Override public void execute() diff --git a/app/src/main/java/org/isoron/uhabits/loaders/HabitListLoader.java b/app/src/main/java/org/isoron/uhabits/loaders/HabitListLoader.java index 2890c872d..48a736455 100644 --- a/app/src/main/java/org/isoron/uhabits/loaders/HabitListLoader.java +++ b/app/src/main/java/org/isoron/uhabits/loaders/HabitListLoader.java @@ -24,7 +24,7 @@ import android.os.Handler; import android.view.View; import android.widget.ProgressBar; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import java.util.HashMap; diff --git a/app/src/main/java/org/isoron/uhabits/models/CheckmarkList.java b/app/src/main/java/org/isoron/uhabits/models/CheckmarkList.java index 99448f335..c744a226e 100644 --- a/app/src/main/java/org/isoron/uhabits/models/CheckmarkList.java +++ b/app/src/main/java/org/isoron/uhabits/models/CheckmarkList.java @@ -29,7 +29,7 @@ import com.activeandroid.Cache; import com.activeandroid.query.Delete; import com.activeandroid.query.Select; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import java.io.IOException; import java.io.Writer; diff --git a/app/src/main/java/org/isoron/uhabits/models/Habit.java b/app/src/main/java/org/isoron/uhabits/models/Habit.java index b40b7a012..cd8b6a7ef 100644 --- a/app/src/main/java/org/isoron/uhabits/models/Habit.java +++ b/app/src/main/java/org/isoron/uhabits/models/Habit.java @@ -37,13 +37,12 @@ import com.activeandroid.util.SQLiteUtils; import com.opencsv.CSVReader; import com.opencsv.CSVWriter; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DateHelper; import java.io.IOException; import java.io.Reader; import java.io.Writer; -import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Locale; diff --git a/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java b/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java index 475f6e1fa..6e6d720ed 100644 --- a/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java +++ b/app/src/main/java/org/isoron/uhabits/models/RepetitionList.java @@ -29,7 +29,7 @@ import com.activeandroid.query.Delete; import com.activeandroid.query.From; import com.activeandroid.query.Select; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import java.util.Arrays; import java.util.GregorianCalendar; diff --git a/app/src/main/java/org/isoron/uhabits/models/ScoreList.java b/app/src/main/java/org/isoron/uhabits/models/ScoreList.java index 23c10ec24..57f4e42a0 100644 --- a/app/src/main/java/org/isoron/uhabits/models/ScoreList.java +++ b/app/src/main/java/org/isoron/uhabits/models/ScoreList.java @@ -29,8 +29,8 @@ import com.activeandroid.query.Delete; import com.activeandroid.query.From; import com.activeandroid.query.Select; -import org.isoron.helpers.ActiveAndroidHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DatabaseHelper; +import org.isoron.uhabits.helpers.DateHelper; import java.io.IOException; import java.io.Writer; @@ -126,7 +126,7 @@ public class ScoreList final int firstScore = newestScoreValue; final long beginning = from; - ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() + DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command() { @Override public void execute() diff --git a/app/src/main/java/org/isoron/uhabits/models/StreakList.java b/app/src/main/java/org/isoron/uhabits/models/StreakList.java index 5f34e0634..81c3a57ea 100644 --- a/app/src/main/java/org/isoron/uhabits/models/StreakList.java +++ b/app/src/main/java/org/isoron/uhabits/models/StreakList.java @@ -23,7 +23,7 @@ import com.activeandroid.ActiveAndroid; import com.activeandroid.query.Delete; import com.activeandroid.query.Select; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.DateHelper; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ExportHabitsTask.java b/app/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java similarity index 57% rename from app/src/main/java/org/isoron/uhabits/fragments/ExportHabitsTask.java rename to app/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java index 4431fcc3d..526e3ff57 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/ExportHabitsTask.java +++ b/app/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java @@ -1,4 +1,23 @@ -package org.isoron.uhabits.fragments; +/* + * Copyright (C) 2016 Álinson Santos Xavier + * + * This file is part of Loop Habit Tracker. + * + * Loop Habit Tracker is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Loop Habit Tracker is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +package org.isoron.uhabits.tasks; import android.content.Intent; import android.net.Uri; @@ -6,23 +25,23 @@ import android.os.AsyncTask; import android.view.View; import android.widget.ProgressBar; -import org.isoron.helpers.ReplayableActivity; +import org.isoron.uhabits.ReplayableActivity; import org.isoron.uhabits.R; -import org.isoron.uhabits.io.HabitsExporter; +import org.isoron.uhabits.io.HabitsCSVExporter; import org.isoron.uhabits.models.Habit; import java.io.File; import java.util.List; -public class ExportHabitsTask extends AsyncTask +public class ExportCSVTask extends AsyncTask { private final ReplayableActivity activity; private ProgressBar progressBar; private final List selectedHabits; String archiveFilename; - public ExportHabitsTask(ReplayableActivity activity, List selectedHabits, - ProgressBar progressBar) + public ExportCSVTask(ReplayableActivity activity, List selectedHabits, + ProgressBar progressBar) { this.selectedHabits = selectedHabits; this.progressBar = progressBar; @@ -64,7 +83,7 @@ public class ExportHabitsTask extends AsyncTask protected Void doInBackground(Void... params) { String dirName = String.format("%s/export/", activity.getExternalCacheDir()); - HabitsExporter exporter = new HabitsExporter(selectedHabits, dirName); + HabitsCSVExporter exporter = new HabitsCSVExporter(selectedHabits, dirName); archiveFilename = exporter.writeArchive(); return null; diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ImportHabitsAsyncTask.java b/app/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java similarity index 91% rename from app/src/main/java/org/isoron/uhabits/fragments/ImportHabitsAsyncTask.java rename to app/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java index 0f7d18682..baf2da75d 100644 --- a/app/src/main/java/org/isoron/uhabits/fragments/ImportHabitsAsyncTask.java +++ b/app/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.fragments; +package org.isoron.uhabits.tasks; import android.os.AsyncTask; import android.support.annotation.NonNull; @@ -28,9 +28,8 @@ import android.widget.ProgressBar; import org.isoron.uhabits.io.GenericImporter; import java.io.File; -import java.io.IOException; -public class ImportHabitsAsyncTask extends AsyncTask +public class ImportDataTask extends AsyncTask { public static final int SUCCESS = 1; public static final int NOT_RECOGNIZED = 2; @@ -52,7 +51,7 @@ public class ImportHabitsAsyncTask extends AsyncTask int result; - public ImportHabitsAsyncTask(@NonNull File file, @Nullable ProgressBar progressBar) + public ImportDataTask(@NonNull File file, @Nullable ProgressBar progressBar) { this.file = file; this.progressBar = progressBar; diff --git a/app/src/main/java/org/isoron/uhabits/views/CheckmarkView.java b/app/src/main/java/org/isoron/uhabits/views/CheckmarkView.java index 6de4cffeb..3f0950fe6 100644 --- a/app/src/main/java/org/isoron/uhabits/views/CheckmarkView.java +++ b/app/src/main/java/org/isoron/uhabits/views/CheckmarkView.java @@ -32,7 +32,7 @@ import android.text.TextPaint; import android.util.AttributeSet; import android.view.View; -import org.isoron.helpers.ColorHelper; +import org.isoron.uhabits.helpers.ColorHelper; import org.isoron.uhabits.R; import org.isoron.uhabits.models.Habit; diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java b/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java index 9a64aa44b..aca5c4fff 100644 --- a/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java +++ b/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java @@ -26,8 +26,8 @@ import android.graphics.Paint; import android.graphics.RectF; import android.util.AttributeSet; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java index d4dc33e3e..9d0211066 100644 --- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java +++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java @@ -29,8 +29,8 @@ import android.os.AsyncTask; import android.util.AttributeSet; import android.view.MotionEvent; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.R; import org.isoron.uhabits.models.Habit; diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java index 1e4c974ee..2128f4e46 100644 --- a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java +++ b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java @@ -29,8 +29,8 @@ import android.graphics.RectF; import android.support.annotation.Nullable; import android.util.AttributeSet; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.R; import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Score; diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java index c4a5115ce..07a606017 100644 --- a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java +++ b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java @@ -26,8 +26,8 @@ import android.graphics.Paint; import android.graphics.Rect; import android.util.AttributeSet; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DateHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Streak; diff --git a/app/src/main/java/org/isoron/uhabits/views/NumberView.java b/app/src/main/java/org/isoron/uhabits/views/NumberView.java index 32cf2f3aa..a73af4a76 100644 --- a/app/src/main/java/org/isoron/uhabits/views/NumberView.java +++ b/app/src/main/java/org/isoron/uhabits/views/NumberView.java @@ -31,8 +31,8 @@ import android.text.TextPaint; import android.util.AttributeSet; import android.view.View; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DialogHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DialogHelper; public class NumberView extends View { diff --git a/app/src/main/java/org/isoron/uhabits/views/RepetitionCountView.java b/app/src/main/java/org/isoron/uhabits/views/RepetitionCountView.java index 38b2aab61..8f617dba6 100644 --- a/app/src/main/java/org/isoron/uhabits/views/RepetitionCountView.java +++ b/app/src/main/java/org/isoron/uhabits/views/RepetitionCountView.java @@ -22,8 +22,8 @@ package org.isoron.uhabits.views; import android.content.Context; import android.util.AttributeSet; -import org.isoron.helpers.DateHelper; -import org.isoron.helpers.DialogHelper; +import org.isoron.uhabits.helpers.DateHelper; +import org.isoron.uhabits.helpers.DialogHelper; import org.isoron.uhabits.models.Habit; import java.util.Calendar; diff --git a/app/src/main/java/org/isoron/uhabits/views/RingView.java b/app/src/main/java/org/isoron/uhabits/views/RingView.java index 2d82fd0f8..a8314a453 100644 --- a/app/src/main/java/org/isoron/uhabits/views/RingView.java +++ b/app/src/main/java/org/isoron/uhabits/views/RingView.java @@ -25,15 +25,14 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.graphics.RectF; -import android.os.Build; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; import android.util.AttributeSet; import android.view.View; -import org.isoron.helpers.ColorHelper; -import org.isoron.helpers.DialogHelper; +import org.isoron.uhabits.helpers.ColorHelper; +import org.isoron.uhabits.helpers.DialogHelper; import org.isoron.uhabits.R; public class RingView extends View diff --git a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java index 1610c243a..4dc96e4a1 100644 --- a/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java +++ b/app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java @@ -34,7 +34,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.RemoteViews; -import org.isoron.helpers.DialogHelper; +import org.isoron.uhabits.helpers.DialogHelper; import org.isoron.uhabits.R; import org.isoron.uhabits.models.Habit;