Merge pull request #246 from wncc/issue202

Fix feed being selected on activity resume

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;
 import android.os.Bundle;
+import android.support.design.widget.NavigationView;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
@@ -136,4 +138,13 @@ public final class Utils {
         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.
@@ -342,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;
         }
@@ -359,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;
@@ -466,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

@@ -83,6 +83,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

@@ -219,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();

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/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();