Merge pull request #17 from foodRev/merge-development-user-type

Merge development user type
foodRev · Jun 27, 2017 · 79a9249 · 79a9249
2 parents 64b6fef + 28a0694
commit 79a9249
Show file tree

Hide file tree

Showing 27 changed files with 804 additions and 138 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -40,6 +40,10 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
+    //    compile 'com.google.android.gms:play-services:10.2.1'
+
+
+
     compile 'com.android.support:appcompat-v7:25.3.0'
     compile 'com.android.support:support-v4:25.3.0'
     compile 'com.android.support:design:25.3.0'
@@ -51,19 +55,16 @@ dependencies {
     compile 'com.firebaseui:firebase-ui-database:1.0.1'
     compile 'com.google.android.gms:play-services-auth:10.2.1'
     compile 'com.google.android.gms:play-services-maps:10.2.1'
-//    compile 'com.google.android.gms:play-services:10.2.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
     compile 'com.google.code.gson:gson:2.7'
-
     compile 'agency.tango.android:material-intro-screen:0.0.5'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'de.hdodenhof:circleimageview:1.3.0'
     compile 'com.miguelcatalan:materialsearchview:1.4.0'
-
     testCompile 'junit:junit:4.12'
     testCompile 'org.powermock:powermock-api-mockito:1.6.3'
     testCompile 'org.powermock:powermock-module-junit4:1.6.2'
-    compile 'com.google.code.gson:gson:2.6.2'
 }
 
+
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,41 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="foodrev.org.foodrev"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="foodrev.org.foodrev">
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <!--
          The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
          Google Maps Android API v2, but you must specify either coarse or fine
          location permissions for the 'MyLocation' functionality. 
     -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@drawable/foodrev_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:name=".App"
         android:theme="@style/AppTheme">
         <activity android:name=".presentation.ui.activities.SignInActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".presentation.ui.activities.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".presentation.ui.activities.rapidprototype.DetailItemActivity"
-            android:theme="@style/CustomDialog"/>
+            android:theme="@style/CustomDialog" />
+        <activity
+            android:name=".presentation.ui.activities.rapidprototype.DriverDetailItemActivity"
+            android:theme="@style/CustomDialog" />
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchDetailItemActivity"
-            android:theme="@style/CustomDialog"/>
+            android:theme="@style/CustomDialog" />
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
              (See the file "res/values/google_maps_api.xml").
@@ -46,39 +50,39 @@
         -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/google_maps_key"/>
+            android:value="@string/google_maps_key" />
 
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.FoodMap"
-            android:label="@string/title_activity_food_map"/>
+            android:label="@string/title_activity_food_map" />
         <!--
  ATTENTION: This was auto-generated to add Google Play services to your project for
      App Indexing.  See https://g.co/AppIndexing/AndroidStudio for more information.
         -->
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version"/>
+            android:value="@integer/google_play_services_version" />
 
         <activity
             android:name=".presentation.ui.activities.rapidprototype.IntroSlidesGeneric"
             android:label="@string/title_activity_intro_slides_generic"
-            android:theme="@style/AppIntroTheme"/>
+            android:theme="@style/AppIntroTheme" />
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity"
             android:label="@string/title_activity_coordinator_main"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".presentation.ui.activities.rapidprototype.DriverMode.DriverModeActivity"
             android:label="@string/title_activity_driver"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"
             android:label="@string/title_activity_dispatch_creation"
             android:parentActivityName=".presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity"
             android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity"/>
+                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity" />
         </activity>
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DateTime.DispatchDateTimeSelect"
@@ -87,19 +91,19 @@
             android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
-		</activity>
-        <activity android:name=".presentation.ui.activities.rapidprototype.DetailItemActivity"
-                  android:theme="@style/CustomDialog">
+                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
         </activity>
+        <activity
+            android:name=".presentation.ui.activities.rapidprototype.DetailItemActivity"
+            android:theme="@style/CustomDialog"></activity>
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DriverSelect.DispatchDriverSelect"
             android:label="@string/title_activity_dispatch_driver_select"
             android:parentActivityName=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"
             android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
+                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
         </activity>
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.CommunitySelect.DispatchCommunitySelect"
@@ -108,7 +112,7 @@
             android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
+                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
         </activity>
         <activity
             android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DonorSelect.DispatchDonorSelect"
@@ -117,24 +121,19 @@
             android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
+                android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
         </activity>
-
-
-        <activity
-            android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.ChannelSearchActivity"/>
+        <activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.ChannelSearchActivity" />
+        <activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.CreateChannelActivity" />
+        <activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageMainActivity" />
+        <activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageSearchActivity" />
         <activity
-            android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.CreateChannelActivity"/>
+            android:name=".presentation.ui.activities.rapidprototype.json.JsonActivity"
+            android:theme="@style/AppTheme"></activity>
         <activity
-            android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageMainActivity"/>
-        <activity
-            android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageSearchActivity"/>
-        <activity android:name=".presentation.ui.activities.rapidprototype.json.JsonActivity"
-                  android:theme="@style/AppTheme">
-        </activity>
-        <activity android:name=".presentation.ui.activities.rapidprototype.ai.AiUiSummary"
-                  android:theme="@style/CustomDialog">
-        </activity>
+            android:name=".presentation.ui.activities.rapidprototype.ai.AiUiSummary"
+            android:theme="@style/CustomDialog"></activity>
+        <activity android:name=".presentation.ui.activities.UserTypeActivity"></activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/foodrev/org/foodrev/domain/infos/models/DriverTasks.java b/app/src/main/java/foodrev/org/foodrev/domain/infos/models/DriverTasks.java
@@ -0,0 +1,21 @@
+package foodrev.org.foodrev.domain.infos.models;
+
+/**
+ * Created by darver on 4/14/17.
+ */
+
+public class DriverTasks {
+    public String sourceKey;
+    public String destinationKey;
+    public int progress;
+
+    public DriverTasks() {
+
+    }
+
+    public DriverTasks(String sourceKey, String destinationKey, int progress) {
+        this.sourceKey = sourceKey;
+        this.destinationKey = destinationKey;
+        this.progress = progress;
+    }
+}
diff --git a/app/src/main/java/foodrev/org/foodrev/domain/interactors/impl/SampleInteractorImpl.java b/app/src/main/java/foodrev/org/foodrev/domain/interactors/impl/SampleInteractorImpl.java
diff --git a/app/src/main/java/foodrev/org/foodrev/domain/models/Coordinator.java b/app/src/main/java/foodrev/org/foodrev/domain/models/Coordinator.java
@@ -5,6 +5,17 @@
  */
 
 public class Coordinator extends PointOfContact {
+//    private String firstName;
+//    private String lastName;
+//    private String email;
+//    private String sms;
+//    private String phoneNumber;
+//    private boolean isAvailable;
+//    private int preferredMethodOfContact;
+
+    public Coordinator() {
+
+    }
 
     public Coordinator(String firstName,
                        String lastName,
@@ -22,4 +33,38 @@ public Coordinator(String firstName,
         this.preferredMethodOfContact = preferredMethodOfContact;
     }
 
+//    @Override
+//    public String getFirstName() {
+//        return firstName;
+//    }
+//
+//    @Override
+//    public String getLastName() {
+//        return lastName;
+//    }
+//
+//    @Override
+//    public String getEmail() {
+//        return email;
+//    }
+//
+//    @Override
+//    public String getSms() {
+//        return sms;
+//    }
+//
+//    @Override
+//    public String getPhoneNumber() {
+//        return phoneNumber;
+//    }
+//
+//    @Override
+//    public boolean isAvailable() {
+//        return isAvailable;
+//    }
+//
+//    @Override
+//    public int getPreferredMethodOfContact() {
+//        return preferredMethodOfContact;
+//    }
 }
diff --git a/app/src/main/java/foodrev/org/foodrev/domain/repository/Repository.java b/app/src/main/java/foodrev/org/foodrev/domain/repository/Repository.java
diff --git a/app/src/main/java/foodrev/org/foodrev/presentation/presenters/DriverModePresenter.java b/app/src/main/java/foodrev/org/foodrev/presentation/presenters/DriverModePresenter.java
@@ -1,5 +1,6 @@
 package foodrev.org.foodrev.presentation.presenters;
 
+import foodrev.org.foodrev.domain.infos.models.DriverTasks;
 import foodrev.org.foodrev.presentation.presenters.base.BasePresenter;
 import foodrev.org.foodrev.presentation.ui.BaseView;
 
@@ -10,8 +11,9 @@
 public interface DriverModePresenter extends BasePresenter<DriverModePresenter.View> {
     interface View extends BaseView {
 //        void signOut();
-            void goToSignInActivity();
+        void goToSignInActivity();
 //            void goToDetailItemActivity();
+        void populateDriverModeTasks(DriverTasks driverTasks);
     }
 
     void signOut();

diff --git a/app/src/main/java/foodrev/org/foodrev/presentation/presenters/SignInPresenter.java b/app/src/main/java/foodrev/org/foodrev/presentation/presenters/SignInPresenter.java
@@ -14,7 +14,7 @@ public interface SignInPresenter extends BasePresenter<SignInPresenter.View>,
     interface View extends BaseView {
         void startGoogleSignIn(GoogleApiClient googleApiClient);
         void displaySignInError();
-        void goToMainActivity();
+        void goToIntroSlides();
         //TODO: remove
         void showRetrievedData(String string);
     }

diff --git a/app/src/main/java/foodrev/org/foodrev/presentation/presenters/UserTypePresenter.java b/app/src/main/java/foodrev/org/foodrev/presentation/presenters/UserTypePresenter.java
@@ -0,0 +1,17 @@
+package foodrev.org.foodrev.presentation.presenters;
+
+import foodrev.org.foodrev.presentation.presenters.base.BasePresenter;
+import foodrev.org.foodrev.presentation.ui.BaseView;
+
+/**
+ * Created by darver on 5/15/17.
+ */
+
+public interface UserTypePresenter extends BasePresenter<UserTypePresenter.View> {
+    interface View extends BaseView {
+        void goToCoordinatorMode();
+        void goToDriverMode();
+    }
+    void coordinatorSelected();
+    void driverSelected();
+}