From 2b593be1d53b87a30ed013b39e7ebc5ad672215b Mon Sep 17 00:00:00 2001
From: Wang Han <wanghan1995315@gmail.com>
Date: Sat, 19 Jun 2021 19:14:31 +0800
Subject: [PATCH] App (#752)

* [app] Fix popup

* [app] Don't actually need to set binding to null
---
 .../lsposed/manager/ui/fragment/AppListFragment.java | 12 ++++++++----
 .../lsposed/manager/ui/fragment/RepoFragment.java    |  7 -------
 app/src/main/res/navigation/nav_graph.xml            |  9 +++++++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/AppListFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/AppListFragment.java
index 4294b0b8c02..095bd74368c 100644
--- a/app/src/main/java/org/lsposed/manager/ui/fragment/AppListFragment.java
+++ b/app/src/main/java/org/lsposed/manager/ui/fragment/AppListFragment.java
@@ -93,6 +93,14 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         return binding.getRoot();
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (module == null) {
+            getNavController().navigate(R.id.action_app_list_fragment_to_modules_fragment);
+        }
+    }
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -101,10 +109,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         int moduleUserId = args.getModuleUserId();
 
         module = ModuleUtil.getInstance().getModule(modulePackageName, moduleUserId);
-        if (module == null) {
-            getNavController().navigate(R.id.action_modules_fragment);
-            return;
-        }
 
         backupLauncher = registerForActivityResult(new ActivityResultContracts.CreateDocument(),
                 uri -> {
diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java
index d66a41f9981..06bf7af3408 100644
--- a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java
+++ b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java
@@ -177,13 +177,6 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
-        binding = null;
-    }
-
     private class RepoAdapter extends RecyclerView.Adapter<RepoAdapter.ViewHolder> implements Filterable {
         private List<OnlineModule> fullList, showList;
         private final LabelComparator labelComparator = new LabelComparator();
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 142313bf01a..a465f67e1e5 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -92,6 +92,15 @@
         <argument
             android:name="moduleUserId"
             app:argType="integer" />
+        <action
+            android:id="@+id/action_app_list_fragment_to_modules_fragment"
+            app:destination="@id/modules_fragment"
+            app:enterAnim="@anim/fragment_enter"
+            app:exitAnim="@anim/fragment_exit"
+            app:popEnterAnim="@anim/fragment_enter_pop"
+            app:popExitAnim="@anim/fragment_exit_pop"
+            app:popUpTo="@id/main_fragment"
+            app:popUpToInclusive="true" />
     </fragment>
     <fragment
         android:id="@+id/repo_fragment"