Develop

kute-android-app/app/build.gradle

@@ -36,19 +36,23 @@ dependencies {
 
 
 
-    compile 'com.google.firebase:firebase-core:10.0.1'
-    compile 'com.google.firebase:firebase-auth:10.0.1'
-    compile 'com.google.firebase:firebase-database:10.0.1'
-    compile 'com.google.android.gms:play-services-auth:10.0.1'
-    compile 'com.google.android.gms:play-services-plus:10.0.1'
-    compile 'com.google.android.gms:play-services-maps:10.0.1'
-    compile 'com.google.android.gms:play-services-location:10.0.1'
+    compile 'com.google.firebase:firebase-core:11.0.1'
+    compile 'com.google.firebase:firebase-auth:11.0.1'
+    compile 'com.google.firebase:firebase-database:11.0.1'
+    compile 'com.google.android.gms:play-services-auth:11.0.1'
+    compile 'com.google.android.gms:play-services-plus:11.0.1'
+    compile 'com.google.android.gms:play-services-maps:11.0.1'
+    compile 'com.google.android.gms:play-services-location:11.0.1'
+    compile 'com.google.android.gms:play-services-places:11.0.1'
     compile 'com.facebook.android:facebook-android-sdk:4.25.0'
     compile 'com.android.volley:volley:1.0.0'
     compile 'com.android.support:appcompat-v7:25.1.1'
     compile 'com.android.support:design:25.1.1'
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'org.osmdroid:osmdroid-android:5.6.4'
+    compile 'com.google.firebase:firebase-messaging:11.0.1'
+    compile 'com.google.firebase:firebase-core:11.0.1'
     testCompile 'junit:junit:4.12'
 }
 

kute-android-app/app/src/main/AndroidManifest.xml

@@ -4,86 +4,103 @@
           package="com.scorelab.kute.kute">
 
 
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera.autofocus"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.camera.flash"
-        android:required="false" />
-
-    <application
-        android:name=".KuteApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+<uses-permission android:name="android.permission.INTERNET"/>
+<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+<uses-permission android:name="android.permission.CAMERA"/>
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+<uses-feature
+    android:name="android.hardware.camera"
+    android:required="false"/>
+<uses-feature
+    android:name="android.hardware.camera.autofocus"
+    android:required="false"/>
+<uses-feature
+    android:name="android.hardware.camera.flash"
+    android:required="false"/>
+
+<application
+    android:name=".KuteApplication"
+    android:allowBackup="true"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:supportsRtl="true"
+    android:theme="@style/AppTheme">
+    <meta-data
+        android:name="com.facebook.sdk.ApplicationId"
+        android:value="@string/facebook_app_id"/>
+    <meta-data
+        android:name="com.google.android.geo.API_KEY"
+        android:value="@string/googlemapApi"/>
+
+    <activity android:name=".SplashActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+    </activity>
+    <activity android:name=".Activity.RegisterActivity">
+    </activity>
+    <activity
+        android:name="com.facebook.FacebookActivity"
+        android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
         android:label="@string/app_name"
-        android:supportsRtl="true"
+    />
+    <activity android:name=".Activity.MainActivity">
+    </activity>
+    <activity
+        android:name=".LandActivity"
+        android:label="@string/title_activity_land"
         android:theme="@style/AppTheme">
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id"/>
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="@string/googlemapApi"/>
-
-        <activity android:name=".SplashActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".Activity.RegisterActivity">
-        </activity>
-        <activity
-            android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name"
-            />
-        <activity android:name=".Activity.MainActivity">
-        </activity>
-        <activity
-            android:name=".LandActivity"
-            android:label="@string/title_activity_land"
-            android:theme="@style/AppTheme">
-        </activity>
-        <activity android:name=".Activity.TaskSelection"/>
-        <activity android:name=".Activity.VehicleSelection"/>
-
-        <service
-            android:name=".Services.BacKService"
-            android:process=":backservice"/>
-
-        <activity android:name=".Activity.SwitchPrivatePublicActivity"/>
-        <activity android:name=".PrivateVehicles.App.Activities.Main"/>
-        <activity android:name=".PrivateVehicles.App.Activities.CurrentFriendList"/>
-
-        <service android:name=".PrivateVehicles.App.Services.SyncFacebookFriendsToFirebase"/>
-
-        <activity android:name=".PrivateVehicles.App.Activities.PersonDetail"
-                  android:screenOrientation="portrait"/>  <!-- to avoid memory leaks via screen orientation change  -->
-
-        <activity android:name=".PrivateVehicles.App.Activities.ProfilePictureActivity"/>
-        <activity android:name=".PrivateVehicles.App.Activities.InitialDetailDialogs">
-
-        </activity>
-        <activity android:name=".PrivateVehicles.App.Activities.Routes.SelfRouteDetailActivity">
-
-        </activity>
-        <activity android:name=".PrivateVehicles.App.Activities.Routes.AddRouteActivity">
-
-            </activity>
-        <activity android:name=".PrivateVehicles.App.Activities.Routes.RouteDetail"/>
-        <activity android:name=".PrivateVehicles.App.Activities.Utils.DaysPicker"/>
-        <activity android:name=".PrivateVehicles.App.Activities.Routes.RouteListPerson"/>
-
-    </application>
-
-</manifest>
+    </activity>
+    <activity android:name=".Activity.TaskSelection"/>
+    <activity android:name=".Activity.VehicleSelection"/>
+
+    <service
+        android:name=".Services.BacKService"
+        android:process=":backservice"/>
+
+    <activity android:name=".Activity.SwitchPrivatePublicActivity"/>
+    <activity android:name=".PrivateVehicles.App.Activities.Main"/>
+    <activity android:name=".PrivateVehicles.App.Activities.CurrentFriendList"/>
+
+    <service android:name=".PrivateVehicles.App.Services.SyncFacebookFriendsToFirebase"/>
+
+    <activity android:name=".PrivateVehicles.App.Activities.PersonDetail"
+              android:screenOrientation="portrait"/>  <!-- to avoid memory leaks via screen orientation change  -->
+
+    <activity android:name=".PrivateVehicles.App.Activities.ProfilePictureActivity"/>
+    <activity android:name=".PrivateVehicles.App.Activities.InitialDetailDialogs">
+
+    </activity>
+    <activity android:name=".PrivateVehicles.App.Activities.Routes.SelfRouteDetailActivity">
+
+    </activity>
+    <activity android:name=".PrivateVehicles.App.Activities.Routes.AddRouteActivity">
+
+    </activity>
+    <activity android:name=".PrivateVehicles.App.Activities.Routes.RouteDetail"/>
+    <activity android:name=".PrivateVehicles.App.Activities.Utils.DaysPicker"/>
+    <activity android:name=".PrivateVehicles.App.Activities.Routes.RouteListPerson"/>
+    <activity android:name=".PrivateVehicles.App.Activities.Travel.StartRide">
+
+    </activity>
+    <activity android:name=".PrivateVehicles.App.Activities.Travel.AddTrip"/>
+    <activity android:name=".PrivateVehicles.App.Activities.Travel.GetSeatsInfo"/>
+
+    <service android:name=".PrivateVehicles.App.Services.MyFirebaseInstanceIDService">
+        <intent-filter>
+            <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+        </intent-filter>
+    </service>
+    <service android:name=".PrivateVehicles.App.Services.MyFirebaseMessagingService">
+        <intent-filter>
+            <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+        </intent-filter>
+    </service>
+
+</application>
+
+</manifest>
+

kute-android-app/app/src/main/java/com/scorelab/kute/kute/Activity/SwitchPrivatePublicActivity.java

@@ -21,6 +21,8 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.FirebaseInstanceIdService;
 import com.scorelab.kute.kute.LandActivity;
 import com.scorelab.kute.kute.PrivateVehicles.App.Activities.InitialDetailDialogs;
 import com.scorelab.kute.kute.PrivateVehicles.App.Activities.Main;
@@ -96,7 +98,7 @@ public void onClick(View v) {
     /**************** Custom Functions Invoked only once on app installation *******/
 
     public void registerFirebaseDbSelf(final SharedPreferences pref) {
-        Person temp = new Person(pref.getString("Name", null), pref.getString("Id", null), pref.getString("Profile_Image", null));
+        Person temp = new Person(pref.getString("Name", null), pref.getString("Id", null), pref.getString("Profile_Image", null), FirebaseInstanceId.getInstance().getToken());
         DatabaseReference root = FirebaseDatabase.getInstance().getReference();
         DatabaseReference users = root.child("Users");
         Log.d(TAG, "Saving Self To db");

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/CurrentFriendList.java

@@ -35,13 +35,19 @@ public class CurrentFriendList extends AppCompatActivity implements RecyclerItem
     ProgressBar progressBar;
     boolean is_async_task_running=false;// A boolean created to prevent a new asynctask being created everytime we scroll down
     LoadFirebaseFriends load_friends_async;
+    String source;
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.current_friends_activity);
 
         person_list = (ArrayList<String>)getIntent().getSerializableExtra("FriendList");
         person_detail_list=(ArrayList<Person>) getIntent().getSerializableExtra("FriendDetailList");
+        source=(String) getIntent().getSerializableExtra("Source");
+        if(source.equals("Trip"))
+            recycler_adapter = new FriendRecyclerAdapter("Travelling With",person_detail_list, this, this);
+        else
+            recycler_adapter = new FriendRecyclerAdapter("Current Friends",person_detail_list, this, this);
         /************** Initialise the views *********/
         //TODO get friends from facebook and google and get their images
         Log.d(TAG,"The length of the person list is:"+Integer.toString(person_list.size()));
@@ -54,7 +60,7 @@ public void onClick(View v) {
             }
         });
         friend_recycler = (RecyclerView) findViewById(R.id.personRecycler);
-        recycler_adapter = new FriendRecyclerAdapter(person_detail_list, this, this);
+
         final android.support.v7.widget.LinearLayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
         friend_recycler.setLayoutManager(mLayoutManager);
         friend_recycler.setItemAnimator(new DefaultItemAnimator());
@@ -64,17 +70,21 @@ public void onClick(View v) {
             public void onScrolled(RecyclerView recyclerView,
                                    int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
-                visibleItemCount[0] = mLayoutManager.getChildCount();//Gives the number of children currently on the screen
-                totalItemCount[0] = mLayoutManager.getItemCount();//gives total items of recycler view
-                pastVisiblesItems[0] = mLayoutManager.findFirstVisibleItemPosition();//gives the index of item at the top of the screen
-                Log.d("Recycler",String.format("visible %d past visible %d total %d",visibleItemCount[0],pastVisiblesItems[0],totalItemCount[0]));
-                if ((visibleItemCount[0] + pastVisiblesItems[0]) >= totalItemCount[0]&& visibleItemCount[0]!=totalItemCount[0] ) {
-                    if(mLayoutManager.findLastCompletelyVisibleItemPosition()==recycler_adapter.getItemCount()-1 /*&& recycleradapter.getItemCount()>5 You have your ofset values here*/){
-                        //************************* Reached the End of recycler View ***********/
-                        Log.d(TAG,"reached the Bottom");
-                        //******************** Call The function to load more data *********//
-                        loadRecyclerItems(recycler_adapter.getItemCount()-1);
+                try {
+                    visibleItemCount[0] = mLayoutManager.getChildCount();//Gives the number of children currently on the screen
+                    totalItemCount[0] = mLayoutManager.getItemCount();//gives total items of recycler view
+                    pastVisiblesItems[0] = mLayoutManager.findFirstVisibleItemPosition();//gives the index of item at the top of the screen
+                    Log.d("Recycler", String.format("visible %d past visible %d total %d", visibleItemCount[0], pastVisiblesItems[0], totalItemCount[0]));
+                    if ((visibleItemCount[0] + pastVisiblesItems[0]) >= totalItemCount[0] && visibleItemCount[0] != totalItemCount[0]) {
+                        if (mLayoutManager.findLastCompletelyVisibleItemPosition() == recycler_adapter.getItemCount() - 1 /*&& recycleradapter.getItemCount()>5 You have your ofset values here*/) {
+                            //************************* Reached the End of recycler View ***********/
+                            Log.d(TAG, "reached the Bottom");
+                            //******************** Call The function to load more data *********//
+                            loadRecyclerItems(recycler_adapter.getItemCount() - 1);
+                        }
                     }
+                }catch (Exception e){
+                    Log.d(TAG,"Exception in OnScroll "+e.toString());
                 }
             }
         });

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/Main.java

@@ -50,7 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
         route_request_number = (TextView) findViewById(R.id.numberRouteRequests);
         route_request=(ImageButton)findViewById(R.id.routeRequests);
-        search=(ImageButton)findViewById(R.id.searchIcon);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
@@ -114,16 +113,16 @@ public void onBackPressed() {
     private void setupProfileFragment()
     {
         getSupportFragmentManager().beginTransaction().replace(R.id.frameDrawer, new UserSelfProfileFragment(), "UserSelfProfileFragment").commit();
-        search.setImageResource(R.drawable.ic_mode_edit_white_24dp);
+        route_request.setImageResource(R.drawable.ic_mode_edit_white_24dp);
         route_request_number.setVisibility(View.GONE);
-        route_request.setVisibility(View.GONE);
+
     }
 
     private void setupHomeFragment(){
         getSupportFragmentManager().beginTransaction().replace(R.id.frameDrawer, new HomeBaseFragment(), "HomeBaseFragment").commit();
-        search.setImageResource(R.drawable.ic_search_white_24dp);
+        route_request.setImageResource(R.drawable.ic_search_white_24dp);
         route_request_number.setVisibility(View.VISIBLE);
-        route_request.setVisibility(View.VISIBLE);
+
     }
 
 }

kute-android-app/app/src/main/java/com/scorelab/kute/kute/PrivateVehicles/App/Activities/PersonDetail.java

@@ -230,7 +230,7 @@ private void fillPersonDetails() {
     //setting up the routes detail of a person
     private void setupRoutesRow(){
         load_routes=new LoadPersonRoutesAsyncTask(this);
-        load_routes.execute(p.name);
+        load_routes.execute(p.id);
         view_all_routes=(AppCompatButton)findViewById(R.id.viewAllRoutes);
         view_all_routes.setOnClickListener(this);
         view_all_routes.setEnabled(false);