isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganize files

Browse Source
pull/77/merge
Alinson S. Xavier 10 years ago
parent e6b7b8b590
commit c9793df7c7
45 changed files with 107 additions and 110 deletions
Show Stats Download Patch File Download Diff File

2
app/src/androidTest/java/org/isoron/uhabits/unit/models/CheckmarkListTest.java
Unescape View File

@ -22,7 +22,7 @@ package org.isoron.uhabits.unit.models;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest; 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.isoron.uhabits.models.Habit;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

2
app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitFixtures.java
Unescape View File

@ -19,7 +19,7 @@
package org.isoron.uhabits.unit.models; package org.isoron.uhabits.unit.models;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
public class HabitFixtures public class HabitFixtures

2
app/src/androidTest/java/org/isoron/uhabits/unit/models/HabitTest.java
Unescape View File

@ -23,7 +23,7 @@ import android.graphics.Color;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest; 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.isoron.uhabits.models.Habit;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

2
app/src/androidTest/java/org/isoron/uhabits/unit/models/RepetitionListTest.java
Unescape View File

@ -22,7 +22,7 @@ package org.isoron.uhabits.unit.models;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest; 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.isoron.uhabits.models.Habit;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

6
app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreListTest.java
Unescape View File

@ -22,8 +22,8 @@ package org.isoron.uhabits.unit.models;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import org.isoron.helpers.ActiveAndroidHelper; import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Score; import org.isoron.uhabits.models.Score;
import org.junit.After; import org.junit.After;
@ -132,7 +132,7 @@ public class ScoreListTest
private void toggleRepetitions(final int from, final int to) private void toggleRepetitions(final int from, final int to)
{ {
ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command()
{ {
@Override @Override
public void execute() public void execute()

8
app/src/androidTest/java/org/isoron/uhabits/unit/models/ScoreTest.java
Unescape View File

@ -19,19 +19,12 @@
package org.isoron.uhabits.unit.models; package org.isoron.uhabits.unit.models;
import android.graphics.Color;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.SmallTest; 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.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.util.LinkedList;
import java.util.List;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.nullValue;
@ -40,7 +33,6 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import org.isoron.uhabits.models.Score; import org.isoron.uhabits.models.Score;
import org.isoron.uhabits.models.Repetition;
import org.isoron.uhabits.models.Checkmark; import org.isoron.uhabits.models.Checkmark;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)

2
app/src/main/java/org/isoron/uhabits/AboutActivity.java
Unescape View File

@ -28,7 +28,7 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
public class AboutActivity extends Activity implements View.OnClickListener public class AboutActivity extends Activity implements View.OnClickListener
{ {

2
app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
Unescape View File

@ -36,7 +36,7 @@ import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.content.LocalBroadcastManager; 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.helpers.ReminderHelper;
import org.isoron.uhabits.models.Checkmark; import org.isoron.uhabits.models.Checkmark;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

5
app/src/main/java/org/isoron/uhabits/MainActivity.java
Unescape View File

@ -39,9 +39,8 @@ import android.support.v4.content.LocalBroadcastManager;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.helpers.ReplayableActivity;
import org.isoron.uhabits.fragments.ListHabitsFragment; import org.isoron.uhabits.fragments.ListHabitsFragment;
import org.isoron.uhabits.helpers.ReminderHelper; import org.isoron.uhabits.helpers.ReminderHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

3
app/src/main/java/org/isoron/helpers/ReplayableActivity.java → app/src/main/java/org/isoron/uhabits/ReplayableActivity.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.helpers; package org.isoron.uhabits;
import android.app.Activity; import android.app.Activity;
import android.app.backup.BackupManager; import android.app.backup.BackupManager;
@ -25,7 +25,6 @@ import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Toast; import android.widget.Toast;
import org.isoron.uhabits.R;
import org.isoron.uhabits.commands.Command; import org.isoron.uhabits.commands.Command;
import java.util.LinkedList; import java.util.LinkedList;

1
app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java
Unescape View File

@ -30,7 +30,6 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import org.isoron.helpers.ReplayableActivity;
import org.isoron.uhabits.fragments.ShowHabitFragment; import org.isoron.uhabits.fragments.ShowHabitFragment;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

2
app/src/main/java/org/isoron/uhabits/dialogs/WeekdayPickerDialog.java
Unescape View File

@ -25,7 +25,7 @@ import android.app.DialogFragment;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
public class WeekdayPickerDialog extends DialogFragment public class WeekdayPickerDialog extends DialogFragment

7
app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java
Unescape View File

@ -32,7 +32,6 @@ import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
@ -41,9 +40,9 @@ import com.android.colorpicker.ColorPickerSwatch;
import com.android.datetimepicker.time.RadialPickerLayout; import com.android.datetimepicker.time.RadialPickerLayout;
import com.android.datetimepicker.time.TimePickerDialog; import com.android.datetimepicker.time.TimePickerDialog;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.helpers.DialogHelper.OnSavedListener; import org.isoron.uhabits.helpers.DialogHelper.OnSavedListener;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.commands.Command; import org.isoron.uhabits.commands.Command;
import org.isoron.uhabits.commands.CreateHabitCommand; import org.isoron.uhabits.commands.CreateHabitCommand;

2
app/src/main/java/org/isoron/uhabits/fragments/HabitListAdapter.java
Unescape View File

@ -27,7 +27,7 @@ import android.widget.BaseAdapter;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.helpers.ListHabitsHelper; import org.isoron.uhabits.helpers.ListHabitsHelper;
import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.loaders.HabitListLoader;

13
app/src/main/java/org/isoron/uhabits/dialogs/HabitSelectionCallback.java → app/src/main/java/org/isoron/uhabits/fragments/HabitSelectionCallback.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.uhabits.dialogs; package org.isoron.uhabits.fragments;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -29,16 +29,15 @@ import android.widget.ProgressBar;
import com.android.colorpicker.ColorPickerDialog; import com.android.colorpicker.ColorPickerDialog;
import com.android.colorpicker.ColorPickerSwatch; import com.android.colorpicker.ColorPickerSwatch;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.helpers.ReplayableActivity; import org.isoron.uhabits.ReplayableActivity;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.commands.ArchiveHabitsCommand; import org.isoron.uhabits.commands.ArchiveHabitsCommand;
import org.isoron.uhabits.commands.ChangeHabitColorCommand; import org.isoron.uhabits.commands.ChangeHabitColorCommand;
import org.isoron.uhabits.commands.DeleteHabitsCommand; import org.isoron.uhabits.commands.DeleteHabitsCommand;
import org.isoron.uhabits.commands.UnarchiveHabitsCommand; import org.isoron.uhabits.commands.UnarchiveHabitsCommand;
import org.isoron.uhabits.fragments.EditHabitFragment; import org.isoron.uhabits.tasks.ExportCSVTask;
import org.isoron.uhabits.fragments.ExportHabitsTask;
import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.loaders.HabitListLoader;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
@ -219,6 +218,6 @@ public class HabitSelectionCallback implements ActionMode.Callback
private void onExportHabitsClick(final LinkedList<Habit> selectedHabits) private void onExportHabitsClick(final LinkedList<Habit> selectedHabits)
{ {
new ExportHabitsTask(activity, selectedHabits, progressBar).execute(); new ExportCSVTask(activity, selectedHabits, progressBar).execute();
} }
} }

23
app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
Unescape View File

@ -50,19 +50,20 @@ import com.mobeta.android.dslv.DragSortListView;
import com.mobeta.android.dslv.DragSortListView.DropListener; import com.mobeta.android.dslv.DragSortListView.DropListener;
import org.isoron.uhabits.commands.Command; import org.isoron.uhabits.commands.Command;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.helpers.DialogHelper.OnSavedListener; import org.isoron.uhabits.helpers.DialogHelper.OnSavedListener;
import org.isoron.helpers.ReplayableActivity; import org.isoron.uhabits.ReplayableActivity;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.commands.ToggleRepetitionCommand; import org.isoron.uhabits.commands.ToggleRepetitionCommand;
import org.isoron.uhabits.dialogs.FilePickerDialog; import org.isoron.uhabits.dialogs.FilePickerDialog;
import org.isoron.uhabits.dialogs.HabitSelectionCallback; import org.isoron.uhabits.helpers.HintManager;
import org.isoron.uhabits.dialogs.HintManager;
import org.isoron.uhabits.helpers.ListHabitsHelper; import org.isoron.uhabits.helpers.ListHabitsHelper;
import org.isoron.uhabits.helpers.ReminderHelper; import org.isoron.uhabits.helpers.ReminderHelper;
import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.loaders.HabitListLoader;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.tasks.ExportCSVTask;
import org.isoron.uhabits.tasks.ImportDataTask;
import java.io.File; import java.io.File;
import java.util.Date; import java.util.Date;
@ -72,7 +73,7 @@ import java.util.List;
public class ListHabitsFragment extends Fragment public class ListHabitsFragment extends Fragment
implements OnSavedListener, OnItemClickListener, OnLongClickListener, DropListener, implements OnSavedListener, OnItemClickListener, OnLongClickListener, DropListener,
OnClickListener, HabitListLoader.Listener, AdapterView.OnItemLongClickListener, OnClickListener, HabitListLoader.Listener, AdapterView.OnItemLongClickListener,
HabitSelectionCallback.Listener, ImportHabitsAsyncTask.Listener HabitSelectionCallback.Listener, ImportDataTask.Listener
{ {
long lastLongClick = 0; long lastLongClick = 0;
private boolean isShortToggleEnabled; private boolean isShortToggleEnabled;
@ -439,7 +440,7 @@ public class ListHabitsFragment extends Fragment
@Override @Override
public void onFileSelected(File file) public void onFileSelected(File file)
{ {
ImportHabitsAsyncTask task = new ImportHabitsAsyncTask(file, progressBar); ImportDataTask task = new ImportDataTask(file, progressBar);
task.setListener(ListHabitsFragment.this); task.setListener(ListHabitsFragment.this);
task.execute(); task.execute();
} }
@ -452,12 +453,12 @@ public class ListHabitsFragment extends Fragment
{ {
switch (result) switch (result)
{ {
case ImportHabitsAsyncTask.SUCCESS: case ImportDataTask.SUCCESS:
loader.updateAllHabits(true); loader.updateAllHabits(true);
activity.showToast(R.string.habits_imported); activity.showToast(R.string.habits_imported);
break; break;
case ImportHabitsAsyncTask.NOT_RECOGNIZED: case ImportDataTask.NOT_RECOGNIZED:
activity.showToast(R.string.file_not_recognized); activity.showToast(R.string.file_not_recognized);
break; break;
@ -469,6 +470,6 @@ public class ListHabitsFragment extends Fragment
public void exportAllHabits() public void exportAllHabits()
{ {
new ExportHabitsTask(activity, Habit.getAll(true), progressBar).execute(); new ExportCSVTask(activity, Habit.getAll(true), progressBar).execute();
} }
} }

4
app/src/main/java/org/isoron/uhabits/fragments/ShowHabitFragment.java
Unescape View File

@ -37,8 +37,8 @@ import android.widget.LinearLayout;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.HabitBroadcastReceiver; import org.isoron.uhabits.HabitBroadcastReceiver;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.ShowHabitActivity; import org.isoron.uhabits.ShowHabitActivity;

2
app/src/main/java/org/isoron/helpers/ColorHelper.java → app/src/main/java/org/isoron/uhabits/helpers/ColorHelper.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.helpers; package org.isoron.uhabits.helpers;
import android.graphics.Color; import android.graphics.Color;

8
app/src/main/java/org/isoron/helpers/ActiveAndroidHelper.java → app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java
Unescape View File

@ -1,8 +1,8 @@
package org.isoron.helpers; package org.isoron.uhabits.helpers;
import com.activeandroid.ActiveAndroid; import com.activeandroid.ActiveAndroid;
public class ActiveAndroidHelper public class DatabaseHelper
{ {
public interface Command public interface Command
{ {
@ -17,10 +17,6 @@ public class ActiveAndroidHelper
command.execute(); command.execute();
ActiveAndroid.setTransactionSuccessful(); ActiveAndroid.setTransactionSuccessful();
} }
catch (RuntimeException e)
{
throw e;
}
finally finally
{ {
ActiveAndroid.endTransaction(); ActiveAndroid.endTransaction();

2
app/src/main/java/org/isoron/helpers/DateHelper.java → app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.helpers; package org.isoron.uhabits.helpers;
import android.content.Context; import android.content.Context;
import android.text.format.DateFormat; import android.text.format.DateFormat;

2
app/src/main/java/org/isoron/helpers/DialogHelper.java → app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.helpers; package org.isoron.uhabits.helpers;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;

3
app/src/main/java/org/isoron/uhabits/dialogs/HintManager.java → app/src/main/java/org/isoron/uhabits/helpers/HintManager.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.uhabits.dialogs; package org.isoron.uhabits.helpers;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
@ -27,7 +27,6 @@ import android.preference.PreferenceManager;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
public class HintManager public class HintManager

1
app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java
Unescape View File

@ -30,7 +30,6 @@ import android.widget.Button;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.loaders.HabitListLoader; import org.isoron.uhabits.loaders.HabitListLoader;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

1
app/src/main/java/org/isoron/uhabits/helpers/ReminderHelper.java
Unescape View File

@ -28,7 +28,6 @@ import android.os.Build;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.HabitBroadcastReceiver; import org.isoron.uhabits.HabitBroadcastReceiver;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

2
app/src/main/java/org/isoron/uhabits/io/HabitBullCSVImporter.java
Unescape View File

@ -24,7 +24,7 @@ import android.support.annotation.NonNull;
import com.activeandroid.ActiveAndroid; import com.activeandroid.ActiveAndroid;
import com.opencsv.CSVReader; import com.opencsv.CSVReader;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.io.BufferedReader; import java.io.BufferedReader;

6
app/src/main/java/org/isoron/uhabits/io/HabitsExporter.java → app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java
Unescape View File

@ -19,7 +19,7 @@
package org.isoron.uhabits.io; 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.CheckmarkList;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.ScoreList; import org.isoron.uhabits.models.ScoreList;
@ -35,7 +35,7 @@ import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
public class HabitsExporter public class HabitsCSVExporter
{ {
private List<Habit> habits; private List<Habit> habits;
@ -44,7 +44,7 @@ public class HabitsExporter
private String exportDirName; private String exportDirName;
public HabitsExporter(List<Habit> habits, String exportDirName) public HabitsCSVExporter(List<Habit> habits, String exportDirName)
{ {
this.habits = habits; this.habits = habits;
this.exportDirName = exportDirName; this.exportDirName = exportDirName;

6
app/src/main/java/org/isoron/uhabits/io/RewireDBImporter.java
Unescape View File

@ -23,8 +23,8 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import org.isoron.helpers.ActiveAndroidHelper; import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.io.File; import java.io.File;
@ -56,7 +56,7 @@ public class RewireDBImporter extends AbstractImporter
final SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null, final SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null,
SQLiteDatabase.OPEN_READONLY); SQLiteDatabase.OPEN_READONLY);
ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command()
{ {
@Override @Override
public void execute() public void execute()

6
app/src/main/java/org/isoron/uhabits/io/TickmateDBImporter.java
Unescape View File

@ -23,8 +23,8 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import org.isoron.helpers.ActiveAndroidHelper; import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.io.File; import java.io.File;
@ -56,7 +56,7 @@ public class TickmateDBImporter extends AbstractImporter
final SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null, final SQLiteDatabase db = SQLiteDatabase.openDatabase(file.getPath(), null,
SQLiteDatabase.OPEN_READONLY); SQLiteDatabase.OPEN_READONLY);
ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command()
{ {
@Override @Override
public void execute() public void execute()

2
app/src/main/java/org/isoron/uhabits/loaders/HabitListLoader.java
Unescape View File

@ -24,7 +24,7 @@ import android.os.Handler;
import android.view.View; import android.view.View;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.util.HashMap; import java.util.HashMap;

2
app/src/main/java/org/isoron/uhabits/models/CheckmarkList.java
Unescape View File

@ -29,7 +29,7 @@ import com.activeandroid.Cache;
import com.activeandroid.query.Delete; import com.activeandroid.query.Delete;
import com.activeandroid.query.Select; import com.activeandroid.query.Select;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;

5
app/src/main/java/org/isoron/uhabits/models/Habit.java
Unescape View File

@ -37,13 +37,12 @@ import com.activeandroid.util.SQLiteUtils;
import com.opencsv.CSVReader; import com.opencsv.CSVReader;
import com.opencsv.CSVWriter; import com.opencsv.CSVWriter;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.io.Writer; import java.io.Writer;
import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;

2
app/src/main/java/org/isoron/uhabits/models/RepetitionList.java
Unescape View File

@ -29,7 +29,7 @@ import com.activeandroid.query.Delete;
import com.activeandroid.query.From; import com.activeandroid.query.From;
import com.activeandroid.query.Select; import com.activeandroid.query.Select;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import java.util.Arrays; import java.util.Arrays;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;

6
app/src/main/java/org/isoron/uhabits/models/ScoreList.java
Unescape View File

@ -29,8 +29,8 @@ import com.activeandroid.query.Delete;
import com.activeandroid.query.From; import com.activeandroid.query.From;
import com.activeandroid.query.Select; import com.activeandroid.query.Select;
import org.isoron.helpers.ActiveAndroidHelper; import org.isoron.uhabits.helpers.DatabaseHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
@ -126,7 +126,7 @@ public class ScoreList
final int firstScore = newestScoreValue; final int firstScore = newestScoreValue;
final long beginning = from; final long beginning = from;
ActiveAndroidHelper.executeAsTransaction(new ActiveAndroidHelper.Command() DatabaseHelper.executeAsTransaction(new DatabaseHelper.Command()
{ {
@Override @Override
public void execute() public void execute()

2
app/src/main/java/org/isoron/uhabits/models/StreakList.java
Unescape View File

@ -23,7 +23,7 @@ import com.activeandroid.ActiveAndroid;
import com.activeandroid.query.Delete; import com.activeandroid.query.Delete;
import com.activeandroid.query.Select; import com.activeandroid.query.Select;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

31
app/src/main/java/org/isoron/uhabits/fragments/ExportHabitsTask.java → app/src/main/java/org/isoron/uhabits/tasks/ExportCSVTask.java
Unescape View File

@ -1,4 +1,23 @@
package org.isoron.uhabits.fragments; /*
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.tasks;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@ -6,22 +25,22 @@ import android.os.AsyncTask;
import android.view.View; import android.view.View;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import org.isoron.helpers.ReplayableActivity; import org.isoron.uhabits.ReplayableActivity;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.io.HabitsExporter; import org.isoron.uhabits.io.HabitsCSVExporter;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
public class ExportHabitsTask extends AsyncTask<Void, Void, Void> public class ExportCSVTask extends AsyncTask<Void, Void, Void>
{ {
private final ReplayableActivity activity; private final ReplayableActivity activity;
private ProgressBar progressBar; private ProgressBar progressBar;
private final List<Habit> selectedHabits; private final List<Habit> selectedHabits;
String archiveFilename; String archiveFilename;
public ExportHabitsTask(ReplayableActivity activity, List<Habit> selectedHabits, public ExportCSVTask(ReplayableActivity activity, List<Habit> selectedHabits,
ProgressBar progressBar) ProgressBar progressBar)
{ {
this.selectedHabits = selectedHabits; this.selectedHabits = selectedHabits;
@ -64,7 +83,7 @@ public class ExportHabitsTask extends AsyncTask<Void, Void, Void>
protected Void doInBackground(Void... params) protected Void doInBackground(Void... params)
{ {
String dirName = String.format("%s/export/", activity.getExternalCacheDir()); String dirName = String.format("%s/export/", activity.getExternalCacheDir());
HabitsExporter exporter = new HabitsExporter(selectedHabits, dirName); HabitsCSVExporter exporter = new HabitsCSVExporter(selectedHabits, dirName);
archiveFilename = exporter.writeArchive(); archiveFilename = exporter.writeArchive();
return null; return null;

7
app/src/main/java/org/isoron/uhabits/fragments/ImportHabitsAsyncTask.java → app/src/main/java/org/isoron/uhabits/tasks/ImportDataTask.java
Unescape View File

@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.isoron.uhabits.fragments; package org.isoron.uhabits.tasks;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -28,9 +28,8 @@ import android.widget.ProgressBar;
import org.isoron.uhabits.io.GenericImporter; import org.isoron.uhabits.io.GenericImporter;
import java.io.File; import java.io.File;
import java.io.IOException;
public class ImportHabitsAsyncTask extends AsyncTask<Void, Void, Void> public class ImportDataTask extends AsyncTask<Void, Void, Void>
{ {
public static final int SUCCESS = 1; public static final int SUCCESS = 1;
public static final int NOT_RECOGNIZED = 2; public static final int NOT_RECOGNIZED = 2;
@ -52,7 +51,7 @@ public class ImportHabitsAsyncTask extends AsyncTask<Void, Void, Void>
int result; int result;
public ImportHabitsAsyncTask(@NonNull File file, @Nullable ProgressBar progressBar) public ImportDataTask(@NonNull File file, @Nullable ProgressBar progressBar)
{ {
this.file = file; this.file = file;
this.progressBar = progressBar; this.progressBar = progressBar;

2
app/src/main/java/org/isoron/uhabits/views/CheckmarkView.java
Unescape View File

@ -32,7 +32,7 @@ import android.text.TextPaint;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

4
app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java
Unescape View File

@ -26,8 +26,8 @@ import android.graphics.Paint;
import android.graphics.RectF; import android.graphics.RectF;
import android.util.AttributeSet; import android.util.AttributeSet;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;

4
app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
Unescape View File

@ -29,8 +29,8 @@ import android.os.AsyncTask;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

4
app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
Unescape View File

@ -29,8 +29,8 @@ import android.graphics.RectF;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.AttributeSet; import android.util.AttributeSet;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Score; import org.isoron.uhabits.models.Score;

4
app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
Unescape View File

@ -26,8 +26,8 @@ import android.graphics.Paint;
import android.graphics.Rect; import android.graphics.Rect;
import android.util.AttributeSet; import android.util.AttributeSet;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Streak; import org.isoron.uhabits.models.Streak;

4
app/src/main/java/org/isoron/uhabits/views/NumberView.java
Unescape View File

@ -31,8 +31,8 @@ import android.text.TextPaint;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
public class NumberView extends View public class NumberView extends View
{ {

4
app/src/main/java/org/isoron/uhabits/views/RepetitionCountView.java
Unescape View File

@ -22,8 +22,8 @@ package org.isoron.uhabits.views;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import org.isoron.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.util.Calendar; import java.util.Calendar;

5
app/src/main/java/org/isoron/uhabits/views/RingView.java
Unescape View File

@ -25,15 +25,14 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.RectF; import android.graphics.RectF;
import android.os.Build;
import android.text.Layout; import android.text.Layout;
import android.text.StaticLayout; import android.text.StaticLayout;
import android.text.TextPaint; import android.text.TextPaint;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import org.isoron.helpers.ColorHelper; import org.isoron.uhabits.helpers.ColorHelper;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
public class RingView extends View public class RingView extends View

2
app/src/main/java/org/isoron/uhabits/widgets/BaseWidgetProvider.java
Unescape View File

@ -34,7 +34,7 @@ import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import org.isoron.helpers.DialogHelper; import org.isoron.uhabits.helpers.DialogHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;

Write Preview
Loading…
Cancel
Save