From 3803884f49a71aa7bb6710315c7c6c69e6fde862 Mon Sep 17 00:00:00 2001 From: tehcneko <7764726+tehcneko@users.noreply.github.com> Date: Mon, 31 May 2021 18:25:17 +0800 Subject: [PATCH] [app] Fix fragment animation when start from shortcuts (#709) --- .../lsposed/manager/ui/activity/MainActivity.java | 14 ++++++-------- app/src/main/res/navigation/nav_graph.xml | 7 +++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java index cc18ef3d..691ebd5a 100644 --- a/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java @@ -32,6 +32,7 @@ import androidx.navigation.NavController; import androidx.navigation.Navigation; import androidx.navigation.fragment.NavHostFragment; +import org.lsposed.manager.NavGraphDirections; import org.lsposed.manager.R; import org.lsposed.manager.databinding.ActivityMainBinding; import org.lsposed.manager.ui.activity.base.BaseActivity; @@ -84,22 +85,19 @@ public class MainActivity extends BaseActivity { } NavController navController = navHostFragment.getNavController(); if (intent.getAction() != null && intent.getAction().equals("android.intent.action.APPLICATION_PREFERENCES")) { - navController.navigate(R.id.settings_fragment); + navController.navigate(R.id.action_settings_fragment); } else if (intent.hasExtra("modulePackageName")) { - Bundle bundle = new Bundle(); - bundle.putString("modulePackageName", intent.getStringExtra("modulePackageName")); - bundle.putInt("moduleUserId", intent.getIntExtra("moduleUserId", -1)); - navController.navigate(R.id.app_list_fragment, bundle); + navController.navigate(NavGraphDirections.actionAppListFragment(intent.getStringExtra("modulePackageName"), intent.getIntExtra("moduleUserId", -1))); } else if (!TextUtils.isEmpty(intent.getDataString())) { switch (intent.getDataString()) { case "modules": - navController.navigate(R.id.modules_fragment); + navController.navigate(R.id.action_modules_fragment); break; case "logs": - navController.navigate(R.id.logs_fragment); + navController.navigate(R.id.action_logs_fragment); break; case "repo": - navController.navigate(R.id.repo_fragment); + navController.navigate(R.id.action_repo_fragment); break; } } diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index ca50cf81..142313bf 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -145,4 +145,11 @@ app:exitAnim="@anim/fragment_exit" app:popEnterAnim="@anim/fragment_enter_pop" app:popExitAnim="@anim/fragment_exit_pop" /> +