Merge pull request #24 from onero/development

Release 5

.gitignore

@@ -187,3 +187,4 @@ fabric.properties
 
 # End of https://www.gitignore.io/api/java,android,androidstudio
 app/src/main/res/values/secrets.xml
+.idea/caches/build_file_checksums.ser

app/build.gradle

@@ -12,6 +12,10 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
+    testOptions {
+        // Implemented to solve issue: http://tools.android.com/tech-docs/unit-testing-support#TOC-Method-...-not-mocked.-
+        unitTests.returnDefaultValues = true
+    }
     buildTypes {
         release {
             minifyEnabled false

app/src/main/AndroidManifest.xml

@@ -19,9 +19,16 @@
             <receiver android:name=".GUI.Utils.NotificationService"
             android:enabled="true" />
 
-        <activity android:name=".GUI.ProfileActivity"></activity>
-        <activity android:name=".GUI.ContactActivity"></activity>
-        <activity android:name=".GUI.LoginActivity">
+        <activity android:name=".GUI.ProfileActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/profile">
+        </activity>
+        <activity android:name=".GUI.ContactActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/contact">
+        </activity>
+        <activity android:name=".GUI.LoginActivity"
+                  android:screenOrientation="portrait">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -31,26 +38,34 @@
 
         </activity>
         <activity android:name=".GUI.YoutubeActivity"
+                  android:screenOrientation="portrait"
             android:parentActivityName=".GUI.ExerciseListActivity">
 
         </activity>
-        <activity android:name=".GUI.ExerciseListActivity"></activity>
+        <activity android:name=".GUI.ExerciseListActivity"
+            android:screenOrientation="portrait"
+            android:label="@string/exercises">
+        </activity>
         <activity
             android:name=".GUI.Settings.SettingsActivity"
+            android:screenOrientation="portrait"
             android:label="@string/title_activity_settings"
             android:parentActivityName=".GUI.ProfileActivity">
         </activity>
         <activity
             android:name=".GUI.Evaluations.MilestoneListActivity"
+            android:screenOrientation="portrait"
             android:label="@string/milestones">
         </activity>
         <activity
             android:name=".GUI.Evaluations.VisitListActivity"
+            android:screenOrientation="portrait"
             android:label="@string/visits"
             android:parentActivityName=".GUI.Evaluations.MilestoneListActivity">
         </activity>
         <activity
             android:name=".GUI.Evaluations.EvaluationDetailActivity"
+            android:screenOrientation="portrait"
             android:label="@string/evaluation_detail"
             android:parentActivityName=".GUI.Evaluations.MilestoneListActivity">
         </activity>

app/src/main/java/dk/adamino/rehabilitation/BE/Exercise.java

@@ -6,13 +6,4 @@ public class Exercise {
     public String title;
     public String repetition;
     public String videoUrl;
-
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getRepetition() {
-        return repetition;
-    }
 }

app/src/main/java/dk/adamino/rehabilitation/BE/Milestone.java

@@ -6,7 +6,6 @@
  * Created by Adamino.
  */
 public class Milestone {
-    public String uid;
     public String title;
     public String purpose;
     public List<Visit> visits;

app/src/main/java/dk/adamino/rehabilitation/BE/RehabilitationPlan.java

@@ -5,9 +5,7 @@
  * Created by Adamino.
  */
 public class RehabilitationPlan {
-    public String uid;
     public String diagnosis;
     public String goal;
-    public List<String> exerciseIds;
-    public List<Milestone> mMilestones;
+    public List<Exercise> exercises;
 }

app/src/main/java/dk/adamino/rehabilitation/BE/User.java

@@ -4,7 +4,6 @@
  * Created by Adamino.
  */
 public abstract class User {
-    public String uid;
     public String fullName;
     public String email;
     public String password;

app/src/main/java/dk/adamino/rehabilitation/BE/Visit.java

@@ -10,18 +10,18 @@
  * Created by Adamino.
  */
 public class Visit implements Comparable<Visit> {
-    public String uid;
     public Date date;
     public String note;
     private SimpleDateFormat mSimpleDateFormat;
 
     public Visit() {
-        String pattern = "d/M - yyyy";
+        // EEEE is being used to get the whole day instead of only 3 characters.
+        String pattern = "EEEE, d/M - yyyy";
         mSimpleDateFormat = new SimpleDateFormat(pattern, new Locale("da", "DK"));
     }
 
-    public String getDate() {
-        return mSimpleDateFormat.format(date);
+    public String getDateAsUppercaseString() {
+        return mSimpleDateFormat.format(date).toUpperCase();
     }
 
     @Override

app/src/main/java/dk/adamino/rehabilitation/BLL/FirebaseFacade.java

@@ -0,0 +1,43 @@
+package dk.adamino.rehabilitation.BLL;
+
+import dk.adamino.rehabilitation.DAL.FirebaseAuthenticate;
+import dk.adamino.rehabilitation.DAL.FirestoreDAO;
+
+/**
+ * Created by Adamino.
+ */
+public class FirebaseFacade {
+
+    private static FirebaseFacade sInstance;
+
+    public static FirebaseFacade getInstance() {
+        if (sInstance == null) {
+            sInstance = new FirebaseFacade();
+        }
+        return sInstance;
+    }
+
+    /**
+     * Return the FirestoreDAO
+     * @return
+     */
+    public FirestoreDAO getFirestoreDAO() {
+        return FirestoreDAO.getInstance();
+    }
+
+    /**
+     * Return the FirebaseAuthenticate
+     * @return
+     */
+    public FirebaseAuthenticate getFirebaseAuthenticate() {
+        return FirebaseAuthenticate.getInstance();
+    }
+
+    /**
+     * Remove subscriptions from Firestore!
+     */
+    public void unsubscribeFromFirestore() {
+        FirestoreDAO.getInstance().removeAllListeners();
+    }
+
+}

app/src/main/java/dk/adamino/rehabilitation/BLL/LoginManager.java

@@ -0,0 +1,27 @@
+package dk.adamino.rehabilitation.BLL;
+
+/**
+ * Created by Adamino.
+ */
+public class LoginManager {
+
+    /**
+     * Check provided email validity
+     *
+     * @param email
+     * @return
+     */
+    public boolean isEmailValid(String email) {
+        return email.matches("^\\w+([\\.-]?\\w+)*@\\w+([\\.-]?\\w+)*(\\.\\w{2,63})+$");
+    }
+
+    /**
+     * Check password validity
+     *
+     * @param password
+     * @return
+     */
+    public boolean isPasswordValid(String password) {
+        return password.length() >= 5;
+    }
+}