Refactor package structure and remove AA

app/build.gradle

@@ -20,7 +20,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.1.0'
+    classpath 'com.android.tools.build:gradle:2.2.1'
     // the latest version of the android-apt plugin for annotations
     classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
     // For publishing stuff to Google Play
@@ -32,10 +32,6 @@ buildscript {
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
 
-// For annotations
-apply plugin: 'android-apt'
-def AAVersion = '3.3.2'
-
 repositories {
   jcenter()
 }
@@ -54,7 +50,9 @@ def gitCommitCount =
 
 android {
   compileSdkVersion 23
-  buildToolsVersion '23.0.2'
+  buildToolsVersion '23.0.3'
+
+  dataBinding.enabled = true
 
   lintOptions {
     abortOnError false
@@ -120,14 +118,6 @@ android {
   }
 }
 
-// annotations
-apt {
-  arguments {
-    //resourcePackageName android.defaultConfig.applicationId
-    androidManifestFile variant.outputs[0].processResources.manifestFile
-  }
-}
-
 dependencies {
   //compile fileTree(dir: 'libs', include: '*.jar')
   compile 'com.android.support:support-v4:23.1.0'
@@ -146,9 +136,6 @@ dependencies {
   compile 'com.squareup.retrofit:retrofit:1.6.1'
   // Included libraries
   compile project(':external:datetimepicker')
-  // annotations
-  apt "org.androidannotations:androidannotations:$AAVersion"
-  compile "org.androidannotations:androidannotations-api:$AAVersion"
   // Dropbox and non-free stuff
   playCompile fileTree(dir: 'src/play/libs', include: '*.jar')
   playBetaCompile fileTree(dir: 'src/play/libs', include: '*.jar')

app/src/androidTest/java/com/nononsenseapps/notepad/test/DBFreshTest.java

@@ -1,18 +1,14 @@
 package com.nononsenseapps.notepad.test;
 
-import com.nononsenseapps.notepad.database.DatabaseHandler;
-import com.nononsenseapps.notepad.database.LegacyDBHelper;
-import com.nononsenseapps.notepad.database.MyContentProvider;
-import com.nononsenseapps.notepad.database.Task;
-import com.nononsenseapps.notepad.database.TaskList;
+import com.nononsenseapps.notepad.data.local.sql.DatabaseHandler;
+import com.nononsenseapps.notepad.data.local.sql.LegacyDBHelper;
+import com.nononsenseapps.notepad.data.model.sql.Task;
+import com.nononsenseapps.notepad.data.model.sql.TaskList;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.test.AndroidTestCase;
-import android.test.ProviderTestCase2;
-import android.test.RenamingDelegatingContext;
-import android.test.mock.MockContentResolver;
 import android.test.suitebuilder.annotation.SmallTest;
 
 public class DBFreshTest extends AndroidTestCase {

app/src/androidTest/java/com/nononsenseapps/notepad/test/DBProviderMovementTest.java

@@ -4,9 +4,9 @@
 import java.util.HashSet;
 import java.util.Random;
 
-import com.nononsenseapps.notepad.database.DAO;
-import com.nononsenseapps.notepad.database.Task;
-import com.nononsenseapps.notepad.database.TaskList;
+import com.nononsenseapps.notepad.data.model.sql.DAO;
+import com.nononsenseapps.notepad.data.model.sql.Task;
+import com.nononsenseapps.notepad.data.model.sql.TaskList;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;

app/src/androidTest/java/com/nononsenseapps/notepad/test/DBProviderTest.java

@@ -4,9 +4,8 @@
 import java.util.Calendar;
 import java.util.List;
 
-import com.nononsenseapps.notepad.database.DatabaseHandler;
-import com.nononsenseapps.notepad.database.Task;
-import com.nononsenseapps.notepad.database.TaskList;
+import com.nononsenseapps.notepad.data.model.sql.Task;
+import com.nononsenseapps.notepad.data.model.sql.TaskList;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -15,10 +14,10 @@
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import static com.nononsenseapps.notepad.database.DatabaseHandler.resetTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setEmptyTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setFreshTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.resetTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setEmptyTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setFreshTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setTestDatabase;
 
 public class DBProviderTest extends AndroidTestCase {
 

app/src/androidTest/java/com/nononsenseapps/notepad/test/DBUpgradeTest.java

@@ -1,25 +1,19 @@
 package com.nononsenseapps.notepad.test;
 
-import java.io.File;
+import com.nononsenseapps.notepad.data.local.sql.DatabaseHandler;
+import com.nononsenseapps.notepad.data.local.sql.LegacyDBHelper;
+import com.nononsenseapps.notepad.data.local.sql.LegacyDBHelper.NotePad;
+import com.nononsenseapps.notepad.data.model.sql.Notification;
+import com.nononsenseapps.notepad.data.model.sql.Task;
+import com.nononsenseapps.notepad.data.model.sql.TaskList;
 
-import com.nononsenseapps.notepad.R;
-import com.nononsenseapps.notepad.database.DatabaseHandler;
-import com.nononsenseapps.notepad.database.LegacyDBHelper;
-import com.nononsenseapps.notepad.database.LegacyDBHelper.NotePad;
-import com.nononsenseapps.notepad.database.Notification;
-import com.nononsenseapps.notepad.database.Task;
-import com.nononsenseapps.notepad.database.TaskList;
-
-import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.provider.BaseColumns;
 import android.test.AndroidTestCase;
-import android.test.RenamingDelegatingContext;
 import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
 
 public class DBUpgradeTest extends AndroidTestCase {
 	static final String PREFIX = "dbupgrade_test_";

app/src/androidTest/java/com/nononsenseapps/notepad/test/DaoTaskTest.java

@@ -1,6 +1,6 @@
 package com.nononsenseapps.notepad.test;
 
-import com.nononsenseapps.notepad.database.Task;
+import com.nononsenseapps.notepad.data.model.sql.Task;
 
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;

app/src/androidTest/java/com/nononsenseapps/notepad/test/DashClockSettingsTest.java

@@ -20,7 +20,7 @@
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.nononsenseapps.notepad.dashclock.TasksSettings;
+import com.nononsenseapps.notepad.ui.dashclock.TasksSettings;
 import com.squareup.spoon.Spoon;
 
 /**

app/src/androidTest/java/com/nononsenseapps/notepad/test/FragmentTaskDetailTest.java

@@ -24,8 +24,8 @@
 import android.test.suitebuilder.annotation.SmallTest;
 
 import com.nononsenseapps.notepad.R;
-import com.nononsenseapps.notepad.activities.ActivityEditor;
-import com.nononsenseapps.notepad.database.Task;
+import com.nononsenseapps.notepad.ui.editor.ActivityEditor;
+import com.nononsenseapps.notepad.data.model.sql.Task;
 import com.squareup.spoon.Spoon;
 
 public class FragmentTaskDetailTest extends ActivityInstrumentationTestCase2<ActivityEditor> {

app/src/androidTest/java/com/nononsenseapps/notepad/test/FragmentTaskListsTest.java

@@ -22,10 +22,9 @@
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
-import android.widget.ListView;
 
 import com.nononsenseapps.notepad.R;
-import com.nononsenseapps.notepad.activities.ActivityList;
+import com.nononsenseapps.notepad.ui.list.ActivityList;
 import com.squareup.spoon.Spoon;
 
 public class FragmentTaskListsTest extends ActivityInstrumentationTestCase2<ActivityList> {

app/src/androidTest/java/com/nononsenseapps/notepad/test/GTaskSyncTest.java

@@ -5,23 +5,22 @@
 import java.util.HashMap;
 import java.util.List;
 
-import com.nononsenseapps.notepad.database.DatabaseHandler;
-import com.nononsenseapps.notepad.database.Task;
-import com.nononsenseapps.notepad.database.TaskList;
-import com.nononsenseapps.notepad.sync.googleapi.GoogleTask;
-import com.nononsenseapps.notepad.sync.googleapi.GoogleTaskList;
-import com.nononsenseapps.notepad.sync.googleapi.GoogleTaskSync;
+import com.nononsenseapps.notepad.data.model.sql.Task;
+import com.nononsenseapps.notepad.data.model.sql.TaskList;
+import com.nononsenseapps.notepad.data.model.gtasks.GoogleTask;
+import com.nononsenseapps.notepad.data.model.gtasks.GoogleTaskList;
+import com.nononsenseapps.notepad.data.remote.gtasks.GoogleTaskSync;
 
 import android.database.Cursor;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 import android.util.Pair;
 
-import static com.nononsenseapps.notepad.database.DatabaseHandler.resetTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setEmptyTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setFreshTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.resetTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setEmptyTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setFreshTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setTestDatabase;
 
 public class GTaskSyncTest extends AndroidTestCase {
 	String balle = "balle";

app/src/androidTest/java/com/nononsenseapps/notepad/test/OrgSyncTest.java

@@ -6,12 +6,12 @@
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.nononsenseapps.notepad.database.RemoteTask;
-import com.nononsenseapps.notepad.database.RemoteTaskList;
-import com.nononsenseapps.notepad.database.Task;
-import com.nononsenseapps.notepad.database.TaskList;
-import com.nononsenseapps.notepad.sync.orgsync.OrgConverter;
-import com.nononsenseapps.notepad.sync.orgsync.SDSynchronizer;
+import com.nononsenseapps.notepad.data.model.sql.RemoteTask;
+import com.nononsenseapps.notepad.data.model.sql.RemoteTaskList;
+import com.nononsenseapps.notepad.data.model.sql.Task;
+import com.nononsenseapps.notepad.data.model.sql.TaskList;
+import com.nononsenseapps.notepad.data.local.orgmode.OrgConverter;
+import com.nononsenseapps.notepad.data.local.orgmode.SDSynchronizer;
 
 import org.cowboyprogrammer.org.OrgFile;
 
@@ -21,9 +21,9 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import static com.nononsenseapps.notepad.database.DatabaseHandler.resetTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setEmptyTestDatabase;
-import static com.nononsenseapps.notepad.database.DatabaseHandler.setTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.resetTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setEmptyTestDatabase;
+import static com.nononsenseapps.notepad.data.local.sql.DatabaseHandler.setTestDatabase;
 
 /**
  * Test the synchronizer code.

app/src/androidTest/java/com/nononsenseapps/notepad/test/RFCDateTest.java

@@ -1,14 +1,11 @@
 package com.nononsenseapps.notepad.test;
 
-import java.text.ParseException;
 import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
 
 import android.test.AndroidTestCase;
 import android.util.Log;
 
-import com.nononsenseapps.utils.time.RFC3339Date;
+import com.nononsenseapps.notepad.util.RFC3339Date;
 
 public class RFCDateTest extends AndroidTestCase {
 

app/src/free/java/com/nononsenseapps/notepad/sync/orgsync/DropboxSyncHelper.java → app/src/free/java/com/nononsenseapps/notepad/data/remote/orgmodedropbox/DropboxSyncHelper.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nononsenseapps.notepad.sync.orgsync;
+package com.nononsenseapps.notepad.data.remote.orgmodedropbox;
 
 import android.content.Context;
 import android.support.annotation.NonNull;

app/src/free/java/com/nononsenseapps/notepad/sync/orgsync/DropboxSynchronizer.java → app/src/free/java/com/nononsenseapps/notepad/data/remote/orgmodedropbox/DropboxSynchronizer.java

@@ -15,11 +15,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nononsenseapps.notepad.sync.orgsync;
+package com.nononsenseapps.notepad.data.remote.orgmodedropbox;
 
 import android.app.Activity;
 
-import com.nononsenseapps.notepad.prefs.SyncPrefs;
+import com.nononsenseapps.notepad.data.local.orgmode.Monitor;
+import com.nononsenseapps.notepad.data.local.orgmode.SynchronizerInterface;
+import com.nononsenseapps.notepad.data.service.OrgSyncService;
+import com.nononsenseapps.notepad.ui.settings.SyncPrefs;
 
 import org.cowboyprogrammer.org.OrgFile;
 

app/src/free/java/com/nononsenseapps/filepicker/DropboxFilePickerActivity.java → app/src/free/java/com/nononsenseapps/notepad/ui/orgmodedropbox/DropboxFilePickerActivity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nononsenseapps.filepicker;
+package com.nononsenseapps.notepad.ui.orgmodedropbox;
 
 /**
  * Dummy class. See Play build flavor for real one.