Merge branch 'master' into anim

app/src/main/java/app/insti/Utils.java

 package app.insti;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -7,6 +8,7 @@ import android.os.Bundle;
 import android.support.transition.Fade;
 import android.support.transition.Slide;
 import android.support.transition.Transition;
+import android.support.design.widget.NavigationView;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
@@ -217,6 +219,16 @@ public final class Utils {
         darkTheme = !darkTheme;
         Intent intent = new Intent(context, MainActivity.class);
         context.startActivity(intent);
+        context.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
         context.finish();
     }
+
+    public static void setSelectedMenuItem(Activity activity, int id) {
+        if (activity != null) {
+            NavigationView navigationView = activity.findViewById(R.id.nav_view);
+            if (navigationView != null) {
+                navigationView.setCheckedItem(id);
+            }
+        }
+    }
 }

app/src/main/java/app/insti/activity/MainActivity.java

@@ -98,11 +98,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private RetrofitInterface retrofitInterface;
     private List<Notification> notifications = null;
 
-    /**
-     * which menu item should be checked on activity start
-     */
-    private int initMenuChecked = R.id.nav_feed;
-
     public static void hideKeyboard(Activity activity) {
         InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
         //Find the currently focused view, so we can grab the correct window token from it.
@@ -165,7 +160,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             private GestureDetector gestureDetector = new GestureDetector(MainActivity.this, new GestureDetector.SimpleOnGestureListener() {
                 @Override
                 public boolean onDoubleTap(MotionEvent e) {
-                    Toast.makeText(MainActivity.this, "You have unlocked super max pro mode", Toast.LENGTH_SHORT).show();
                     Utils.changeTheme(MainActivity.this);
                     return super.onDoubleTap(e);
                 }
@@ -343,7 +337,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 openEventFragment(id);
                 return;
             case DATA_TYPE_NEWS:
-                initMenuChecked = R.id.nav_news;
                 updateFragment(new NewsFragment());
                 return;
         }
@@ -360,10 +353,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             switch (type) {
                 case DATA_TYPE_PT:
                     if (extra.contains("/trainingblog")) {
-                        initMenuChecked = R.id.nav_training_blog;
                         openTrainingBlog();
                     } else {
-                        initMenuChecked = R.id.nav_placement_blog;
                         openPlacementBlog();
                     }
                     return;
@@ -467,7 +458,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private void initNavigationView() {
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
-        navigationView.setCheckedItem(initMenuChecked);
     }
 
     private void updateNavigationView() {

app/src/main/java/app/insti/fragment/AboutFragment.java

@@ -16,6 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import app.insti.R;
+import app.insti.Utils;
 import de.hdodenhof.circleimageview.CircleImageView;
 
 /**
@@ -43,6 +44,7 @@ public class AboutFragment extends BaseFragment {
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("About");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_settings);
 
         /* Map CircleImageView ids to image URLs */
         final Map<Integer, String> team = new HashMap<Integer, String>() {{

app/src/main/java/app/insti/fragment/CalendarFragment.java

@@ -61,6 +61,7 @@ public class CalendarFragment extends BaseFragment {
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Calendar");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_calendar);
 
         final CalendarView simpleCalendarView = (CalendarView) view.findViewById(R.id.simpleCalendarView); // get the reference of CalendarView
         simpleCalendarView.setFirstDayOfWeek(1); // set Sunday as the first day of the week

app/src/main/java/app/insti/fragment/ComplaintsFragment.java

@@ -16,6 +16,7 @@ import android.widget.Button;
 
 import app.insti.Constants;
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.adapter.ComplaintFragmentViewPagerAdapter;
 
 public class ComplaintsFragment extends BaseFragment {
@@ -28,8 +29,10 @@ public class ComplaintsFragment extends BaseFragment {
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View view = inflater.inflate(R.layout.fragment_complaints, container, false);
+
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Complaints/Suggestions");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_complaint);
 
         Bundle bundle = getArguments();
         userID = bundle.getString(Constants.USER_ID);

app/src/main/java/app/insti/fragment/ExploreFragment.java

@@ -102,6 +102,7 @@ public class ExploreFragment extends Fragment {
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Explore");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_explore);
 
         final EditText searchEditText = getView().findViewById(R.id.explore_search);
 

app/src/main/java/app/insti/fragment/FeedFragment.java

@@ -52,6 +52,8 @@ public class FeedFragment extends BaseFragment {
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Feed");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_feed);
+
         feedRecyclerView = view.findViewById(R.id.feed_recycler_view);
         mLayoutManager = new LinearLayoutManager(getContext());
         feedRecyclerView.setLayoutManager(mLayoutManager);

app/src/main/java/app/insti/fragment/MapFragment.java

@@ -145,7 +145,6 @@ public class MapFragment extends Fragment implements TextWatcher,
     private boolean editTextFocused = false;
     private Toast toast;
     private String message = "Sorry, no such place in our data.";
-    private boolean locationsShown = false;
     private boolean GPSIsSetup = false;
     private boolean followingUser = false;
     private Marker user = new Marker("You", "", 0, 0, -10, "");
@@ -220,6 +219,9 @@ public class MapFragment extends Fragment implements TextWatcher,
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("InstiMap");
 
+        /* Set selected menu item */
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_map);
+
         /* Initialize */
         editText = (EditText) getView().findViewById(R.id.search);
         setFonts();
@@ -233,10 +235,7 @@ public class MapFragment extends Fragment implements TextWatcher,
             @Override
             public void onResponse(Call<List<Venue>> call, Response<List<Venue>> response) {
                 if (response.isSuccessful()) {
-                    if (!locationsShown) {
                     setupWithData(response.body());
-                        locationsShown = true;
-                    }
                 }
             }
 

app/src/main/java/app/insti/fragment/MessMenuFragment.java

@@ -60,6 +60,7 @@ public class MessMenuFragment extends BaseFragment {
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Mess Menu");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_mess_menu);
 
         hostel = (String) getArguments().get(Constants.USER_HOSTEL);
         displayMenu(hostel);

app/src/main/java/app/insti/fragment/NewsFragment.java

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import java.util.List;
 
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.adapter.NewsAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.NewsArticle;
@@ -39,6 +40,8 @@ public class NewsFragment extends RecyclerViewFragment<NewsArticle, NewsAdapter>
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("News");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_news);
+
         setHasOptionsMenu(true);
         updateData();
 

app/src/main/java/app/insti/fragment/PlacementBlogFragment.java

@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import java.util.List;
 
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.adapter.PlacementBlogAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.PlacementBlogPost;
@@ -40,6 +41,8 @@ public class PlacementBlogFragment extends RecyclerViewFragment<PlacementBlogPos
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Placement Blog");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_placement_blog);
+
         setHasOptionsMenu(true);
         updateData();
 

app/src/main/java/app/insti/fragment/QuickLinksFragment.java

@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import app.insti.R;
+import app.insti.Utils;
 
 public class QuickLinksFragment extends BaseFragment {
 
@@ -22,6 +23,7 @@ public class QuickLinksFragment extends BaseFragment {
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Quick Links");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_qlinks);
 
         TextView CMS = getActivity().findViewById(R.id.button_CMS);
         TextView CMSMaint = getActivity().findViewById(R.id.button_CMSMaint);

app/src/main/java/app/insti/fragment/RecyclerViewFragment.java

@@ -87,7 +87,7 @@ public abstract class RecyclerViewFragment<T extends Clickable, S extends Recycl
         /* Skip if we're already destroyed */
         if (getActivity() == null || getView() == null) return;
 
-        if (adapter == null) {
+        if (adapter == null || recyclerView.getAdapter() != adapter) {
             initAdapter(result);
         } else {
             adapter.setPosts(result);

app/src/main/java/app/insti/fragment/SettingsFragment.java

@@ -49,6 +49,7 @@ public class SettingsFragment extends Fragment {
         super.onStart();
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Settings");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_settings);
 
         Bundle bundle = getArguments();
 

app/src/main/java/app/insti/fragment/TrainingBlogFragment.java

@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import java.util.List;
 
 import app.insti.R;
+import app.insti.Utils;
 import app.insti.adapter.TrainingBlogAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.TrainingBlogPost;
@@ -40,6 +41,8 @@ public class TrainingBlogFragment extends RecyclerViewFragment<TrainingBlogPost,
 
         Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
         toolbar.setTitle("Internship Blog");
+        Utils.setSelectedMenuItem(getActivity(), R.id.nav_training_blog);
+
         setHasOptionsMenu(true);
         updateData();
 

app/src/main/res/drawable/baseline_account_circle_gray_36.xml

+<vector android:height="36dp" android:tint="#757575"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
+</vector>

app/src/main/res/drawable/baseline_exit_to_app_gray_36.xml

+<vector android:height="36dp" android:tint="#757575"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>

app/src/main/res/drawable/baseline_feedback_gray_36.xml

+<vector android:height="36dp" android:tint="#757575"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,14h-2v-2h2v2zM13,10h-2L11,6h2v4z"/>
+</vector>

app/src/main/res/drawable/baseline_info_gray_36.xml

+<vector android:height="36dp" android:tint="#757575"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>

app/src/main/res/layout/fragment_settings.xml

@@ -49,7 +49,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="16dp"
-        android:drawableStart="@drawable/baseline_account_circle_black_36"
+        android:drawableStart="@drawable/baseline_account_circle_gray_36"
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="Update Profile"
@@ -62,7 +62,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="16dp"
-        android:drawableStart="@drawable/baseline_feedback_black_36"
+        android:drawableStart="@drawable/baseline_feedback_gray_36"
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="Feedback"
@@ -75,7 +75,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="16dp"
-        android:drawableStart="@drawable/baseline_info_black_36"
+        android:drawableStart="@drawable/baseline_info_gray_36"
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="About"
@@ -88,7 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="16dp"
-        android:drawableStart="@drawable/baseline_exit_to_app_black_36"
+        android:drawableStart="@drawable/baseline_exit_to_app_gray_36"
         android:gravity="center_vertical"
         android:padding="16dp"
         android:text="Logout"

app/src/main/res/values/styles.xml

@@ -10,7 +10,6 @@
         <item name="themeColorInverse">#000000</item>
         <item name="newsColor">#F2F2F2</item>
         <item name="urlColor">@color/colorPrimary</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -26,7 +25,6 @@
         <item name="themeColorInverse">#FFFFFF</item>
         <item name="newsColor">#00000000</item>
         <item name="urlColor">@color/colorAccent</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
     </style>
 
     <style name="AppThemeDark.NoActionBar">