Few Changes [Read Description]

* Name Sanitation Before Displaying, Version changed

* Package Model formed

* Getting Source and Destination is smarter now

* Notice/Message functionality in TripEntries Added
-Gradle 'compile's removed

app/build.gradle

@@ -11,13 +11,13 @@ tasks.whenTaskAdded { task ->
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "26.0.2"
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId 'garbagecollectors.com.unipool'
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 8
-        versionName "1.08"
+        versionCode 110
+        versionName "1.10"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true //important
@@ -43,40 +43,40 @@ android {
 
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     //noinspection GradleCompatible
 
-    compile 'com.google.firebase:firebase-messaging:11.6.0'
-    compile 'com.google.firebase:firebase-database:11.6.0'
-    compile 'com.google.firebase:firebase-core:11.6.0'
-    compile 'com.google.firebase:firebase-auth:11.6.0'
+    implementation 'com.google.firebase:firebase-messaging:11.6.0'
+    implementation 'com.google.firebase:firebase-database:11.6.0'
+    implementation 'com.google.firebase:firebase-core:11.6.0'
+    implementation 'com.google.firebase:firebase-auth:11.6.0'
 
-    compile 'com.google.android.gms:play-services:11.6.0'
-    compile 'com.google.android.gms:play-services-auth:11.6.0'
+    implementation 'com.google.android.gms:play-services:11.6.0'
+    implementation 'com.google.android.gms:play-services-auth:11.6.0'
 
-    compile 'com.android.support:appcompat-v7:27.1.0'
-    compile 'com.android.support:mediarouter-v7:27.1.0'
-    compile 'com.android.support:design:27.1.0'
-    compile 'com.android.support:cardview-v7:27.1.0'
-    compile 'com.android.support:recyclerview-v7:27.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:support-v4:27.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:mediarouter-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.android.support:support-v4:27.1.1'
 
-    compile 'com.android.support:preference-v7:27.1.0'
-    compile 'com.android.support:preference-v14:27.1.0'
+    implementation 'com.android.support:preference-v7:27.1.1'
+    implementation 'com.android.support:preference-v14:27.1.1'
 
-    compile 'com.github.QuadFlask:colorpicker:0.0.13'
+    implementation 'com.github.QuadFlask:colorpicker:0.0.13'
 
-    compile 'com.github.apl-devs:appintro:v4.2.3'
+    implementation 'com.github.apl-devs:appintro:v4.2.3'
 
-    compile 'de.hdodenhof:circleimageview:2.2.0'
+    implementation 'de.hdodenhof:circleimageview:2.2.0'
 
     implementation 'com.squareup.picasso:picasso:2.71828'
 
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
 apply plugin: "com.google.gms.google-services"
 

app/src/main/AndroidManifest.xml

@@ -63,7 +63,6 @@
             android:label="@string/title_requests">
             <intent-filter>
                 <action android:name="android.intent.action.TARGET_NOTIFICATION" />
-
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>

app/src/main/java/garbagecollectors/com/unipool/Constants.java

@@ -0,0 +1,17 @@
+package garbagecollectors.com.unipool;
+
+import java.util.HashMap;
+
+public class Constants
+{
+	public static HashMap<String, String> uniInfo;
+
+	public static void init()
+	{
+		uniInfo = new HashMap<>();
+		uniInfo.put("name", "Shiv Nadar University");
+		uniInfo.put("address", "NH91, Tehsil Dadri, Gautam Buddha Nagar, Greater Noida, Uttar Pradesh 201314, India");
+		uniInfo.put("latitude", "28.525752899999997");
+		uniInfo.put("longitude", "77.57445179999999");
+	}
+}

app/src/main/java/garbagecollectors/com/unipool/FirebaseMessagingService.java

@@ -40,9 +40,11 @@ public void onMessageReceived(RemoteMessage remoteMessage)
 			resultIntent.putExtra("openingTab", 2);
 		else if(notificationBody.contains("sent"))
 			resultIntent.putExtra("openingTab", 1);
-		else if(notificationBody.contains("message"))
+		else if(notificationBody.contains("messageCard"))
 			resultIntent.putExtra("openingTab", 2);
 
+		//resultIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
 		PendingIntent resultPendingIntent =
 				PendingIntent.getActivity(this, 0, resultIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 

app/src/main/java/garbagecollectors/com/unipool/GenLocation.java → app/src/main/java/garbagecollectors/com/unipool/Models/GenLocation.java

@@ -1,4 +1,4 @@
-package garbagecollectors.com.unipool;
+package garbagecollectors.com.unipool.Models;
 
 public class GenLocation
 {

app/src/main/java/garbagecollectors/com/unipool/Message.java → app/src/main/java/garbagecollectors/com/unipool/Models/Message.java

@@ -1,4 +1,4 @@
-package garbagecollectors.com.unipool;
+package garbagecollectors.com.unipool.Models;
 
 public class Message
 {

app/src/main/java/garbagecollectors/com/unipool/PairUp.java → app/src/main/java/garbagecollectors/com/unipool/Models/PairUp.java

@@ -1,4 +1,4 @@
-package garbagecollectors.com.unipool;
+package garbagecollectors.com.unipool.Models;
 
 import java.util.ArrayList;
 

app/src/main/java/garbagecollectors/com/unipool/TripEntry.java → app/src/main/java/garbagecollectors/com/unipool/Models/TripEntry.java

@@ -1,4 +1,4 @@
-package garbagecollectors.com.unipool;
+package garbagecollectors.com.unipool.Models;
 
 import java.text.ParseException;
 import java.util.HashMap;
@@ -15,7 +15,9 @@ public class TripEntry
 
     private GenLocation source, destination;
 
-    public TripEntry(String name, String entry_id, String user_id, String time, String date, GenLocation source, GenLocation destination, HashMap<String, Float> lambdaMap) throws ParseException
+    private String message;
+
+    public TripEntry(String name, String entry_id, String user_id, String time, String date, GenLocation source, GenLocation destination, HashMap<String, Float> lambdaMap, String message) throws ParseException
     {
         this.entry_id = entry_id;
         this.user_id = user_id;
@@ -24,6 +26,7 @@ public TripEntry(String name, String entry_id, String user_id, String time, Stri
         this.source = source;
         this.destination = destination;
         this.name = name;
+        this.message = message;
     }
 
     public TripEntry(TripEntry tripEntry)   //copyConstructor
@@ -95,4 +98,13 @@ public GenLocation getDestination()
         return destination;
     }
 
+    public String getMessage()
+    {
+        return message;
+    }
+
+    public void setMessage(String message)
+    {
+        this.message = message;
+    }
 }

app/src/main/java/garbagecollectors/com/unipool/User.java → app/src/main/java/garbagecollectors/com/unipool/Models/User.java

@@ -1,4 +1,4 @@
-package garbagecollectors.com.unipool;
+package garbagecollectors.com.unipool.Models;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/garbagecollectors/com/unipool/UtilityMethods.java

@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
+import android.view.View;
 
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -24,6 +25,10 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+import garbagecollectors.com.unipool.Models.Message;
+import garbagecollectors.com.unipool.Models.PairUp;
+import garbagecollectors.com.unipool.Models.TripEntry;
+import garbagecollectors.com.unipool.Models.User;
 import garbagecollectors.com.unipool.activities.BaseActivity;
 import garbagecollectors.com.unipool.adapters.TripEntryAdapter;
 import garbagecollectors.com.unipool.adapters.UserAdapter;
@@ -222,10 +227,17 @@ public static ArrayList<TripEntry> removeFromList(ArrayList<TripEntry> list, Str
     public static void fillTripEntryHolder(TripEntryAdapter.MyHolder holder, TripEntry tripEntry)
     {
         holder.date.setText(tripEntry.getDate());
-        holder.name_user.setText(tripEntry.getName());
+        holder.name_user.setText(sanitizeName(tripEntry.getName()));
         holder.travel_time.setText(tripEntry.getTime());
         holder.source.setText("From " + tripEntry.getSource().getName());
         holder.destination.setText("to " + tripEntry.getDestination().getName());
+
+        if(tripEntry.getMessage() != null)
+        {
+            holder.cardArrow.setVisibility(View.VISIBLE);
+            holder.messageCard.setVisibility(View.VISIBLE);
+            holder.messageText.setText(tripEntry.getMessage());
+        }
     }
 
     public static void fillUserHolder(UserAdapter.MyHolder holder, User user)

app/src/main/java/garbagecollectors/com/unipool/activities/AboutActivity.java

@@ -111,6 +111,7 @@ private void dealWithSelectedMenuItem(MenuItem menuItem)
 				BaseActivity.mAuth.signOut();
 				finish();
 				startActivity(new Intent(this, LoginActivity.class));
+				break;
 
 			case R.id.nav_home:
 				finish();

app/src/main/java/garbagecollectors/com/unipool/activities/BaseActivity.java

@@ -30,10 +30,11 @@
 import java.util.HashMap;
 
 import de.hdodenhof.circleimageview.CircleImageView;
-import garbagecollectors.com.unipool.Message;
+import garbagecollectors.com.unipool.Constants;
+import garbagecollectors.com.unipool.Models.Message;
+import garbagecollectors.com.unipool.Models.TripEntry;
+import garbagecollectors.com.unipool.Models.User;
 import garbagecollectors.com.unipool.R;
-import garbagecollectors.com.unipool.TripEntry;
-import garbagecollectors.com.unipool.User;
 import garbagecollectors.com.unipool.UtilityMethods;
 import garbagecollectors.com.unipool.activities.RequestActivity.ChatFragment;
 import garbagecollectors.com.unipool.activities.RequestActivity.ReceivedRequestsFragment;
@@ -79,6 +80,8 @@ protected void onCreate(Bundle savedInstanceState)
             super.onCreate(savedInstanceState);
             setContentView(getContentViewId());
 
+            Constants.init();
+
             mAuth = FirebaseAuth.getInstance();
             currentUser = mAuth.getCurrentUser();
 
@@ -177,11 +180,12 @@ public void onCancelled(DatabaseError error)
                     // Failed to read value
                         Log.w("UserDB", "Failed to read userDB value.", error.toException());
                         Toast.makeText(getApplicationContext(), "Network Issues!", Toast.LENGTH_SHORT).show();
-                    }
-                });
+                }
+
+            });
 
-                bottomNavigationView = findViewById(R.id.bottom_navigation);
-                bottomNavigationView.setOnNavigationItemSelectedListener(this);
+            bottomNavigationView = findViewById(R.id.bottom_navigation);
+            bottomNavigationView.setOnNavigationItemSelectedListener(this);
         }
 
         catch(NullPointerException nlp)
@@ -311,34 +315,40 @@ protected void dealWithSelectedMenuItem(MenuItem menuItem)
 		{
 			case R.id.nav_about:
 				startActivity(new Intent(this, AboutActivity.class));
+                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
 				break;
 
 			case R.id.nav_logout:
 				mAuth.signOut();
 				finish();
 				startActivity(new Intent(this, LoginActivity.class));
+                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
 				break;
 
             case R.id.nav_home:
                 finish();
                 startActivity(new Intent(this, HomeActivity.class));
+                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                 break;
 
             case R.id.nav_newEntry:
                 finish();
                 startActivity(new Intent(this, NewEntryActivity.class));
+                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                 break;
 
             case R.id.nav_requests:
                 finish();
                 startActivity(new Intent(this, RequestActivity.class));
+                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                 break;
 
             case R.id.nav_chat:
                 finish();
                 Intent chatIntent = new Intent(this, RequestActivity.class);
                 chatIntent.putExtra("openingTab", 2);
                 startActivity(chatIntent);
+                overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
                 break;
 		}
 	}

app/src/main/java/garbagecollectors/com/unipool/activities/HomeActivity.java

@@ -26,7 +26,7 @@
 
 public class HomeActivity extends BaseActivity
 {
-    RecyclerView recycle;
+    static RecyclerView recycle;
     static HomeActivityTEA recyclerAdapter;
 
     static public RelativeLayout noEntryRelativeLayout;
@@ -185,4 +185,9 @@ public static void updateRecycleAdapter()
 
     	recyclerAdapter.notifyDataSetChanged();
     }
+
+	public static RecyclerView getRecycle()
+	{
+		return recycle;
+	}
 }

app/src/main/java/garbagecollectors/com/unipool/activities/LoginActivity.java

@@ -35,12 +35,12 @@
 import java.util.HashMap;
 
 import garbagecollectors.com.unipool.AppStatus;
-import garbagecollectors.com.unipool.GenLocation;
-import garbagecollectors.com.unipool.Message;
-import garbagecollectors.com.unipool.PairUp;
+import garbagecollectors.com.unipool.Models.GenLocation;
+import garbagecollectors.com.unipool.Models.Message;
+import garbagecollectors.com.unipool.Models.PairUp;
+import garbagecollectors.com.unipool.Models.TripEntry;
+import garbagecollectors.com.unipool.Models.User;
 import garbagecollectors.com.unipool.R;
-import garbagecollectors.com.unipool.TripEntry;
-import garbagecollectors.com.unipool.User;
 
 import static garbagecollectors.com.unipool.activities.BaseActivity.finalCurrentUser;
 
@@ -228,7 +228,7 @@ private void firebaseAuthWithGoogle(GoogleSignInAccount acct)
                     }
                     else
                     {
-                        // If sign in fails, display a message to the user.
+                        // If sign in fails, display a messageCard to the user.
                         Log.w(TAG, "signInWithCredential:failure", task.getException());
                         Toast.makeText(LoginActivity.this, "Authentication failed.",
                                 Toast.LENGTH_SHORT).show();
@@ -297,7 +297,7 @@ private void dummyInitFinalCurrentUser(FirebaseUser user) throws ParseException
         GenLocation dummyGenLocation = new GenLocation("dummy", "dummy", 0d, 0d);
 
         TripEntry dummyTripEntry = new TripEntry("dummy", "dummyId", "DummyUser", "12:00",
-                                                    "1/11/12", dummyGenLocation, dummyGenLocation, dummyLambdaMap);
+                                                    "1/11/12", dummyGenLocation, dummyGenLocation, dummyLambdaMap, "dummyMessage");
 
         HashMap<String, TripEntry> dummyUserEntries = new HashMap<>();
         dummyUserEntries.put("dummy", dummyTripEntry);

app/src/main/java/garbagecollectors/com/unipool/activities/MessageListActivity.java

@@ -24,10 +24,10 @@
 import java.util.HashMap;
 import java.util.TreeMap;
 
-import garbagecollectors.com.unipool.Message;
-import garbagecollectors.com.unipool.PairUp;
+import garbagecollectors.com.unipool.Models.Message;
+import garbagecollectors.com.unipool.Models.PairUp;
+import garbagecollectors.com.unipool.Models.User;
 import garbagecollectors.com.unipool.R;
-import garbagecollectors.com.unipool.User;
 import garbagecollectors.com.unipool.UtilityMethods;
 
 import static garbagecollectors.com.unipool.activities.BaseActivity.notificationDatabaseReference;