Merge pull request #367 from jogrimst/master

#366 Added content provider module
elimu-ai · Feb 23, 2017 · 2a0378c · 2a0378c
2 parents 37e9933 + 87f6d2a
commit 2a0378c
Show file tree

Hide file tree

Showing 113 changed files with 811 additions and 534 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.literacyapp"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1004001
-        versionName "1.4.1"
+        versionCode 1005002
+        versionName "1.5.2"
 
 //        jackOptions {
 //            enabled true
@@ -56,8 +56,8 @@ android {
 
 greendao {
     schemaVersion android.defaultConfig.versionCode
-    daoPackage 'org.literacyapp.dao'
-    targetGenDir '../app/src/main/java'
+    daoPackage 'org.literacyapp.contentprovider.dao'
+    targetGenDir '../contentprovider/src/main/java'
 }
 
 buildscript {
@@ -77,8 +77,9 @@ dependencies {
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
     androidTestCompile 'com.android.support:support-annotations:23.4.0'
 
-    compile 'org.literacyapp:literacyapp-model:1.1.33'
+    compile project(':contentprovider')
     compile 'org.greenrobot:greendao:3.2.0'
+
     compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.android.support:cardview-v7:23.4.0'
     compile 'com.android.support:design:23.4.0'

diff --git a/app/src/main/java/org/literacyapp/LiteracyApplication.java b/app/src/main/java/org/literacyapp/LiteracyApplication.java
@@ -3,15 +3,17 @@
 import android.app.Application;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.util.Log;
 
-import org.literacyapp.dao.DaoSession;
-import org.literacyapp.dao.CustomDaoMaster;
+import org.literacyapp.contentprovider.dao.CustomDaoMaster;
+import org.literacyapp.contentprovider.dao.DaoSession;
 import org.literacyapp.util.VersionHelper;
 
 public class LiteracyApplication extends Application {
+
     public static final int FACE_RECOGNITION_TRAINING_JOB_ID = 0;
     public static final int CONTENT_SYNCRHONIZATION_JOB_ID = 1;
     public static final int AUTHENTICATION_JOB_ID = 2;
@@ -28,12 +30,6 @@ public void onCreate() {
         Log.i(getClass().getName(), "onCreate");
         super.onCreate();
 
-        // Initialize greenDAO database
-        CustomDaoMaster.DevOpenHelper openHelper = new CustomDaoMaster.DevOpenHelper(getApplicationContext(), "literacyapp-db", null);
-        SQLiteDatabase db = openHelper.getWritableDatabase();
-        CustomDaoMaster daoMaster = new CustomDaoMaster(db);
-        daoSession = daoMaster.newSession();
-
         // Check if the application's versionCode was upgraded
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         int oldVersionCode = sharedPreferences.getInt(PREF_APP_VERSION_CODE, 0);
@@ -61,10 +57,18 @@ public void onInit(int status) {
     }
 
     public DaoSession getDaoSession() {
+        if (daoSession == null) {
+            // Initialize greenDAO database
+            String dbName = Environment.getExternalStorageDirectory() + "/.literacyapp/database/literacyapp-db";
+            CustomDaoMaster.DevOpenHelper openHelper = new CustomDaoMaster.DevOpenHelper(getApplicationContext(), dbName, null);
+            SQLiteDatabase db = openHelper.getWritableDatabase();
+            CustomDaoMaster daoMaster = new CustomDaoMaster(db);
+            daoSession = daoMaster.newSession();
+        }
+
         return daoSession;
     }
 
-
     public TextToSpeech getTts() {
         return tts;
     }

diff --git a/app/src/main/java/org/literacyapp/MainActivity.java b/app/src/main/java/org/literacyapp/MainActivity.java
@@ -8,21 +8,15 @@
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
-import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
-import org.literacyapp.authentication.helper.DetectionHelper;
-import org.literacyapp.dao.LetterDao;
+import org.literacyapp.contentprovider.dao.LetterDao;
 import org.literacyapp.service.synchronization.ReadDeviceAsyncTask;
 import org.literacyapp.util.ConnectivityHelper;
 import org.literacyapp.util.RootHelper;
 
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -37,9 +31,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-        LiteracyApplication literacyApplication = (LiteracyApplication) getApplication();
-        letterDao = literacyApplication.getDaoSession().getLetterDao();
     }
 
     @Override
@@ -66,6 +57,13 @@ protected void onStart() {
             Log.e(getClass().getName(), null, e);
         }
 
+        LiteracyApplication literacyApplication = (LiteracyApplication) getApplication();
+        letterDao = literacyApplication.getDaoSession().getLetterDao();
+
+//        ContentProvider.initializeDb(this);
+//        List<Letter> letters = ContentProvider.getAvailableLetters();
+//        Log.i(getClass().getName(), "letters: " + letters);
+
         if (letterDao.loadAll().isEmpty()) {
             // Download content
             boolean isWifiEnabled = ConnectivityHelper.isWifiEnabled(getApplicationContext());

diff --git a/app/src/main/java/org/literacyapp/authentication/AuthenticationActivity.java b/app/src/main/java/org/literacyapp/authentication/AuthenticationActivity.java
@@ -17,10 +17,10 @@
 import org.literacyapp.authentication.helper.DetectionHelper;
 import org.literacyapp.authentication.thread.RecognitionThread;
 import org.literacyapp.authentication.thread.TrainingThread;
-import org.literacyapp.dao.AuthenticationEventDao;
-import org.literacyapp.dao.DaoSession;
-import org.literacyapp.dao.StudentImageCollectionEventDao;
-import org.literacyapp.model.Student;
+import org.literacyapp.contentprovider.dao.AuthenticationEventDao;
+import org.literacyapp.contentprovider.dao.DaoSession;
+import org.literacyapp.contentprovider.dao.StudentImageCollectionEventDao;
+import org.literacyapp.contentprovider.model.Student;
 import org.literacyapp.util.EnvironmentSettings;
 import org.literacyapp.util.MultimediaHelper;
 import org.opencv.android.CameraBridgeViewBase;
@@ -39,6 +39,7 @@
 import pl.droidsonroids.gif.GifImageView;
 
 public class AuthenticationActivity extends AppCompatActivity implements CameraBridgeViewBase.CvCameraViewListener2 {
+
     public static final long AUTHENTICATION_ANIMATION_TIME = 5000;
     public static final String AUTHENTICATION_ANIMATION_ALREADY_PLAYED_IDENTIFIER = "AuthenticationAnimationAlreadyPlayed";
     public static final String ANIMAL_OVERLAY_IDENTIFIER = "AnimalOverlayName";

diff --git a/app/src/main/java/org/literacyapp/authentication/StudentImageCollectionActivity.java b/app/src/main/java/org/literacyapp/authentication/StudentImageCollectionActivity.java
@@ -13,12 +13,12 @@
 import org.literacyapp.authentication.animaloverlay.AnimalOverlay;
 import org.literacyapp.authentication.animaloverlay.AnimalOverlayHelper;
 import org.literacyapp.authentication.helper.DetectionHelper;
-import org.literacyapp.dao.DaoSession;
-import org.literacyapp.dao.StudentImageCollectionEventDao;
-import org.literacyapp.dao.StudentImageDao;
-import org.literacyapp.model.Device;
-import org.literacyapp.model.StudentImage;
-import org.literacyapp.model.analytics.StudentImageCollectionEvent;
+import org.literacyapp.contentprovider.dao.DaoSession;
+import org.literacyapp.contentprovider.dao.StudentImageCollectionEventDao;
+import org.literacyapp.contentprovider.dao.StudentImageDao;
+import org.literacyapp.contentprovider.model.Device;
+import org.literacyapp.contentprovider.model.StudentImage;
+import org.literacyapp.contentprovider.model.analytics.StudentImageCollectionEvent;
 import org.literacyapp.receiver.BootReceiver;
 import org.literacyapp.util.DeviceInfoHelper;
 import org.literacyapp.util.EnvironmentSettings;
@@ -48,6 +48,7 @@
  */
 
 public class StudentImageCollectionActivity extends AppCompatActivity implements CameraBridgeViewBase.CvCameraViewListener2 {
+
     private JavaCameraView preview;
     private PreProcessorFactory ppF;
     private long lastTime;

diff --git a/app/src/main/java/org/literacyapp/authentication/animaloverlay/AnimalOverlay.java b/app/src/main/java/org/literacyapp/authentication/animaloverlay/AnimalOverlay.java
@@ -1,12 +1,11 @@
 package org.literacyapp.authentication.animaloverlay;
 
-import java.io.File;
-
 /**
  * Created by sladomic on 27.12.16.
  */
 
 public class AnimalOverlay {
+
     private String name;
     private int frameStartX;
     private int frameStartY;

diff --git a/app/src/main/java/org/literacyapp/authentication/animaloverlay/AnimalOverlayHelper.java b/app/src/main/java/org/literacyapp/authentication/animaloverlay/AnimalOverlayHelper.java
@@ -18,6 +18,7 @@
  */
 
 public class AnimalOverlayHelper {
+
     private static final String ANIMAL_OVERLAYS_CONFIG_JSON = "AnimalOverlaysConfig.json";
     private Context context;
 

diff --git a/app/src/main/java/org/literacyapp/authentication/animaloverlay/AnimalOverlaysMap.java b/app/src/main/java/org/literacyapp/authentication/animaloverlay/AnimalOverlaysMap.java
@@ -7,6 +7,7 @@
  */
 
 public class AnimalOverlaysMap {
+
     private Map<String, AnimalOverlay> animalOverlays;
 
     public Map<String, AnimalOverlay> getAnimalOverlays() {

diff --git a/app/src/main/java/org/literacyapp/authentication/fallback/StudentAuthenticationActivity.java b/app/src/main/java/org/literacyapp/authentication/fallback/StudentAuthenticationActivity.java
@@ -7,9 +7,9 @@
 
 import org.literacyapp.LiteracyApplication;
 import org.literacyapp.R;
-import org.literacyapp.dao.StudentDao;
-import org.literacyapp.dao.StudentImageDao;
-import org.literacyapp.model.Student;
+import org.literacyapp.contentprovider.dao.StudentDao;
+import org.literacyapp.contentprovider.dao.StudentImageDao;
+import org.literacyapp.contentprovider.model.Student;
 import org.literacyapp.util.StudentHelper;
 
 import java.io.File;

diff --git a/app/src/main/java/org/literacyapp/authentication/fallback/StudentRegistrationActivity.java b/app/src/main/java/org/literacyapp/authentication/fallback/StudentRegistrationActivity.java
@@ -21,9 +21,9 @@
 
 import org.literacyapp.LiteracyApplication;
 import org.literacyapp.R;
-import org.literacyapp.dao.StudentDao;
-import org.literacyapp.dao.StudentImageDao;
-import org.literacyapp.model.Student;
+import org.literacyapp.contentprovider.dao.StudentDao;
+import org.literacyapp.contentprovider.dao.StudentImageDao;
+import org.literacyapp.contentprovider.model.Student;
 import org.literacyapp.receiver.ScreenOnReceiver;
 import org.literacyapp.util.MediaPlayerHelper;
 import org.literacyapp.util.StudentHelper;

diff --git a/app/src/main/java/org/literacyapp/authentication/fallback/StudentSelectionActivity.java b/app/src/main/java/org/literacyapp/authentication/fallback/StudentSelectionActivity.java
@@ -19,8 +19,8 @@
 import org.literacyapp.LiteracyApplication;
 import org.literacyapp.R;
 import org.literacyapp.authentication.helper.AuthenticationHelper;
-import org.literacyapp.dao.StudentDao;
-import org.literacyapp.model.Student;
+import org.literacyapp.contentprovider.dao.StudentDao;
+import org.literacyapp.contentprovider.model.Student;
 import org.literacyapp.receiver.ScreenOnReceiver;
 import org.literacyapp.util.MediaPlayerHelper;
 

diff --git a/app/src/main/java/org/literacyapp/authentication/helper/AuthenticationHelper.java b/app/src/main/java/org/literacyapp/authentication/helper/AuthenticationHelper.java
@@ -5,11 +5,11 @@
 
 import org.apache.commons.math3.analysis.function.StepFunction;
 import org.literacyapp.LiteracyApplication;
-import org.literacyapp.dao.AuthenticationEventDao;
-import org.literacyapp.dao.DaoSession;
-import org.literacyapp.model.Device;
-import org.literacyapp.model.Student;
-import org.literacyapp.model.analytics.AuthenticationEvent;
+import org.literacyapp.contentprovider.dao.AuthenticationEventDao;
+import org.literacyapp.contentprovider.dao.DaoSession;
+import org.literacyapp.contentprovider.model.Device;
+import org.literacyapp.contentprovider.model.Student;
+import org.literacyapp.contentprovider.model.analytics.AuthenticationEvent;
 import org.literacyapp.receiver.BootReceiver;
 import org.literacyapp.util.DeviceInfoHelper;
 import org.literacyapp.util.StudentUpdateHelper;

diff --git a/app/src/main/java/org/literacyapp/authentication/helper/DetectionHelper.java b/app/src/main/java/org/literacyapp/authentication/helper/DetectionHelper.java
@@ -26,6 +26,7 @@
  */
 
 public class DetectionHelper {
+
     private static final Scalar RED_COLOR = new Scalar(255, 0, 0, 255);
     private static final int MAX_TIME_BEFORE_FALLBACK = 15000;
     private static final int SCREEN_BRIGHTNESS_INCREASE_RATE = 20;

diff --git a/app/src/main/java/org/literacyapp/authentication/thread/AuthenticationThread.java b/app/src/main/java/org/literacyapp/authentication/thread/AuthenticationThread.java
@@ -8,11 +8,11 @@
 
 import org.literacyapp.LiteracyApplication;
 import org.literacyapp.authentication.AuthenticationActivity;
-import org.literacyapp.dao.AuthenticationEventDao;
-import org.literacyapp.dao.DaoSession;
-import org.literacyapp.dao.StudentImageCollectionEventDao;
-import org.literacyapp.model.analytics.AuthenticationEvent;
-import org.literacyapp.model.analytics.StudentImageCollectionEvent;
+import org.literacyapp.contentprovider.dao.AuthenticationEventDao;
+import org.literacyapp.contentprovider.dao.DaoSession;
+import org.literacyapp.contentprovider.dao.StudentImageCollectionEventDao;
+import org.literacyapp.contentprovider.model.analytics.AuthenticationEvent;
+import org.literacyapp.contentprovider.model.analytics.StudentImageCollectionEvent;
 import org.literacyapp.receiver.BootReceiver;
 import org.literacyapp.service.synchronization.AuthenticationJobService;
 
@@ -24,6 +24,7 @@
  */
 
 public class AuthenticationThread extends Thread {
+
     private Context context;
     private AuthenticationJobService authenticationJobService;
 

diff --git a/app/src/main/java/org/literacyapp/authentication/thread/MergeThread.java b/app/src/main/java/org/literacyapp/authentication/thread/MergeThread.java
@@ -7,11 +7,11 @@
 import com.google.gson.reflect.TypeToken;
 
 import org.literacyapp.LiteracyApplication;
-import org.literacyapp.dao.DaoSession;
-import org.literacyapp.dao.StudentDao;
-import org.literacyapp.dao.StudentImageCollectionEventDao;
-import org.literacyapp.model.Student;
-import org.literacyapp.model.analytics.StudentImageCollectionEvent;
+import org.literacyapp.contentprovider.dao.DaoSession;
+import org.literacyapp.contentprovider.dao.StudentDao;
+import org.literacyapp.contentprovider.dao.StudentImageCollectionEventDao;
+import org.literacyapp.contentprovider.model.Student;
+import org.literacyapp.contentprovider.model.analytics.StudentImageCollectionEvent;
 import org.literacyapp.service.synchronization.MergeSimilarStudentsJobService;
 import org.opencv.core.Mat;
 import org.opencv.core.Rect;
@@ -28,6 +28,7 @@
  */
 
 public class MergeThread extends Thread {
+
     private PreProcessorFactory ppF;
     private TrainingThread trainingThread;
     private StudentDao studentDao;

diff --git a/app/src/main/java/org/literacyapp/authentication/thread/RecognitionThread.java b/app/src/main/java/org/literacyapp/authentication/thread/RecognitionThread.java
@@ -5,12 +5,9 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import org.greenrobot.greendao.query.WhereCondition;
-import org.literacyapp.dao.StudentDao;
-import org.literacyapp.dao.StudentImageCollectionEventDao;
-import org.literacyapp.model.Student;
-import org.literacyapp.model.StudentImage;
-import org.literacyapp.model.analytics.StudentImageCollectionEvent;
+import org.literacyapp.contentprovider.dao.StudentImageCollectionEventDao;
+import org.literacyapp.contentprovider.model.Student;
+import org.literacyapp.contentprovider.model.analytics.StudentImageCollectionEvent;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.utils.Converters;
@@ -25,6 +22,7 @@
  */
 
 public class RecognitionThread extends Thread {
+
     private static final double SIMILARITY_THRESHOLD = 0.5;
     private TensorFlow tensorFlow;
     private StudentImageCollectionEventDao studentImageCollectionEventDao;
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ @@
      */
     public class AnimalOverlayHelper {
         private static final String ANIMAL_OVERLAYS_CONFIG_JSON = "AnimalOverlaysConfig.json";
         private Context context;
@@ Expand Down @@