From c1b5094dc72946250d136e5e355f49e151947cbf Mon Sep 17 00:00:00 2001
From: Ammar Githam <ammargitham786@gmail.com>
Date: Wed, 11 Nov 2020 20:04:38 +0900
Subject: [PATCH] Move activity notification viewer to its own nav graph. Fixes
 https://github.com/austinhuang0131/barinsta/issues/247

---
 .../instagrabber/activities/MainActivity.java   | 14 ++++----------
 .../settings/MorePreferencesFragment.java       |  3 +--
 .../navigation/direct_messages_nav_graph.xml    |  6 ++++++
 .../main/res/navigation/discover_nav_graph.xml  |  6 ++++++
 app/src/main/res/navigation/feed_nav_graph.xml  |  6 ++++++
 app/src/main/res/navigation/more_nav_graph.xml  | 14 +++++---------
 .../notification_viewer_nav_graph.xml           | 17 +++++++++++++++++
 .../main/res/navigation/profile_nav_graph.xml   |  6 ++++++
 8 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/navigation/notification_viewer_nav_graph.xml

diff --git a/app/src/main/java/awais/instagrabber/activities/MainActivity.java b/app/src/main/java/awais/instagrabber/activities/MainActivity.java
index af1c9bcf..c556eaf3 100644
--- a/app/src/main/java/awais/instagrabber/activities/MainActivity.java
+++ b/app/src/main/java/awais/instagrabber/activities/MainActivity.java
@@ -35,7 +35,6 @@ import androidx.lifecycle.LiveData;
 import androidx.navigation.NavBackStackEntry;
 import androidx.navigation.NavController;
 import androidx.navigation.NavDestination;
-import androidx.navigation.NavDirections;
 import androidx.navigation.ui.NavigationUI;
 
 import com.google.android.material.appbar.AppBarLayout;
@@ -58,7 +57,6 @@ import awais.instagrabber.customviews.helpers.CustomHideBottomViewOnScrollBehavi
 import awais.instagrabber.databinding.ActivityMainBinding;
 import awais.instagrabber.fragments.PostViewV2Fragment;
 import awais.instagrabber.fragments.main.FeedFragment;
-import awais.instagrabber.fragments.settings.MorePreferencesFragmentDirections;
 import awais.instagrabber.interfaces.FetchListener;
 import awais.instagrabber.models.IntentModel;
 import awais.instagrabber.models.SuggestionModel;
@@ -634,14 +632,10 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
     }
 
     private void showActivityView() {
-        binding.bottomNavView.setSelectedItemId(R.id.more_nav_graph);
-        binding.bottomNavView.post(() -> {
-            if (currentNavControllerLiveData == null) return;
-            final NavController navController = currentNavControllerLiveData.getValue();
-            if (navController == null) return;
-            final NavDirections navDirections = MorePreferencesFragmentDirections.actionMorePreferencesFragmentToNotificationsViewer();
-            navController.navigate(navDirections);
-        });
+        if (currentNavControllerLiveData == null) return;
+        final NavController navController = currentNavControllerLiveData.getValue();
+        if (navController == null) return;
+        navController.navigate(R.id.action_global_notificationsViewerFragment);
     }
 
     private void bindActivityCheckerService() {
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
index 8b12bb38..74cb4edd 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
@@ -103,8 +103,7 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
         screen.addPreference(getDivider(context));
         if (isLoggedIn) {
             screen.addPreference(getPreference(R.string.action_notif, R.drawable.ic_not_liked, preference -> {
-                final NavDirections navDirections = MorePreferencesFragmentDirections.actionMorePreferencesFragmentToNotificationsViewer();
-                NavHostFragment.findNavController(this).navigate(navDirections);
+                NavHostFragment.findNavController(this).navigate(R.id.action_global_notificationsViewerFragment);
                 return true;
             }));
         }
diff --git a/app/src/main/res/navigation/direct_messages_nav_graph.xml b/app/src/main/res/navigation/direct_messages_nav_graph.xml
index 532d5dcc..9839d56e 100644
--- a/app/src/main/res/navigation/direct_messages_nav_graph.xml
+++ b/app/src/main/res/navigation/direct_messages_nav_graph.xml
@@ -38,6 +38,12 @@
             app:nullable="false" />
     </action>
 
+    <include app:graph="@navigation/notification_viewer_nav_graph" />
+
+    <action
+        android:id="@+id/action_global_notificationsViewerFragment"
+        app:destination="@id/notification_viewer_nav_graph" />
+
     <fragment
         android:id="@+id/directMessagesInboxFragment"
         android:name="awais.instagrabber.fragments.directmessages.DirectMessageInboxFragment"
diff --git a/app/src/main/res/navigation/discover_nav_graph.xml b/app/src/main/res/navigation/discover_nav_graph.xml
index c9e38ca7..f119b78b 100644
--- a/app/src/main/res/navigation/discover_nav_graph.xml
+++ b/app/src/main/res/navigation/discover_nav_graph.xml
@@ -57,6 +57,12 @@
             app:nullable="false" />
     </action>
 
+    <include app:graph="@navigation/notification_viewer_nav_graph" />
+
+    <action
+        android:id="@+id/action_global_notificationsViewerFragment"
+        app:destination="@id/notification_viewer_nav_graph" />
+
     <fragment
         android:id="@+id/discoverFragment"
         android:name="awais.instagrabber.fragments.main.DiscoverFragment"
diff --git a/app/src/main/res/navigation/feed_nav_graph.xml b/app/src/main/res/navigation/feed_nav_graph.xml
index 439c526b..0803fe8c 100644
--- a/app/src/main/res/navigation/feed_nav_graph.xml
+++ b/app/src/main/res/navigation/feed_nav_graph.xml
@@ -57,6 +57,12 @@
             app:nullable="false" />
     </action>
 
+    <include app:graph="@navigation/notification_viewer_nav_graph" />
+
+    <action
+        android:id="@+id/action_global_notificationsViewerFragment"
+        app:destination="@id/notification_viewer_nav_graph" />
+
     <fragment
         android:id="@+id/feedFragment"
         android:name="awais.instagrabber.fragments.main.FeedFragment"
diff --git a/app/src/main/res/navigation/more_nav_graph.xml b/app/src/main/res/navigation/more_nav_graph.xml
index f2e9cfff..50d9cf54 100644
--- a/app/src/main/res/navigation/more_nav_graph.xml
+++ b/app/src/main/res/navigation/more_nav_graph.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/more_nav_graph"
     app:startDestination="@id/morePreferencesFragment">
 
@@ -9,6 +8,7 @@
     <include app:graph="@navigation/hashtag_nav_graph" />
     <include app:graph="@navigation/location_nav_graph" />
     <include app:graph="@navigation/comments_nav_graph" />
+    <include app:graph="@navigation/notification_viewer_nav_graph" />
 
     <action
         android:id="@+id/action_global_profileFragment"
@@ -37,6 +37,10 @@
             app:nullable="false" />
     </action>
 
+    <action
+        android:id="@+id/action_global_notificationsViewerFragment"
+        app:destination="@id/notification_viewer_nav_graph" />
+
     <fragment
         android:id="@+id/morePreferencesFragment"
         android:name="awais.instagrabber.fragments.settings.MorePreferencesFragment"
@@ -47,9 +51,6 @@
         <action
             android:id="@+id/action_morePreferencesFragment_to_aboutFragment"
             app:destination="@id/aboutFragment" />
-        <action
-            android:id="@+id/action_morePreferencesFragment_to_notificationsViewer"
-            app:destination="@id/notificationsViewer" />
         <action
             android:id="@+id/action_morePreferencesFragment_to_favoritesFragment"
             app:destination="@id/favoritesFragment" />
@@ -69,11 +70,6 @@
         android:id="@+id/aboutFragment"
         android:name="awais.instagrabber.fragments.settings.AboutFragment"
         android:label="@string/action_about" />
-    <fragment
-        android:id="@+id/notificationsViewer"
-        android:name="awais.instagrabber.fragments.NotificationsViewerFragment"
-        android:label="@string/title_notifications"
-        tools:layout="@layout/fragment_notifications_viewer" />
     <fragment
         android:id="@+id/themePreferencesFragment"
         android:name="awais.instagrabber.fragments.settings.ThemePreferencesFragment"
diff --git a/app/src/main/res/navigation/notification_viewer_nav_graph.xml b/app/src/main/res/navigation/notification_viewer_nav_graph.xml
new file mode 100644
index 00000000..9a7f586f
--- /dev/null
+++ b/app/src/main/res/navigation/notification_viewer_nav_graph.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/notification_viewer_nav_graph"
+    app:startDestination="@id/notificationsViewer">
+
+    <fragment
+        android:id="@+id/notificationsViewer"
+        android:name="awais.instagrabber.fragments.NotificationsViewerFragment"
+        android:label="@string/title_notifications"
+        tools:layout="@layout/fragment_notifications_viewer" />
+
+    <action
+        android:id="@+id/action_global_notificationsViewerFragment"
+        app:destination="@id/notificationsViewer" />
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/profile_nav_graph.xml b/app/src/main/res/navigation/profile_nav_graph.xml
index aad54aee..58b2d1d4 100644
--- a/app/src/main/res/navigation/profile_nav_graph.xml
+++ b/app/src/main/res/navigation/profile_nav_graph.xml
@@ -58,6 +58,12 @@
             app:nullable="false" />
     </action>
 
+    <include app:graph="@navigation/notification_viewer_nav_graph" />
+
+    <action
+        android:id="@+id/action_global_notificationsViewerFragment"
+        app:destination="@id/notification_viewer_nav_graph" />
+
     <fragment
         android:id="@+id/profileFragment"
         android:name="awais.instagrabber.fragments.main.ProfileFragment"