From 3bdfd66dfcb2c30d67665c3e85c87acfa8b38f4a Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Wed, 14 Apr 2021 17:37:24 +0200 Subject: [PATCH] Redirection to library fragment after sync --- .../play/ui/activities/MainActivity.java | 2 +- .../play/ui/fragment/HomeFragment.java | 25 ++++++++----------- app/src/main/res/navigation/nav_graph.xml | 5 ++++ 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activities/MainActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activities/MainActivity.java index 01301d97..97c36a13 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/activities/MainActivity.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/activities/MainActivity.java @@ -232,7 +232,7 @@ public class MainActivity extends BaseActivity { if (Objects.requireNonNull(navController.getCurrentDestination()).getId() == R.id.landingFragment) { navController.navigate(R.id.action_landingFragment_to_homeFragment); } else if (Objects.requireNonNull(navController.getCurrentDestination()).getId() == R.id.syncFragment) { - navController.navigate(R.id.action_syncFragment_to_homeFragment); + navController.navigate(R.id.action_syncFragment_to_libraryFragment); } else if (Objects.requireNonNull(navController.getCurrentDestination()).getId() == R.id.loginFragment) { navController.navigate(R.id.action_loginFragment_to_homeFragment); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java index 7045de4b..6be88718 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java @@ -99,20 +99,17 @@ public class HomeFragment extends Fragment { activity.navController.navigate(R.id.action_homeFragment_to_songListPageFragment, bundle); }); - bind.syncMusicButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); - builder.setMessage("Force reload your entire music library") - .setTitle("Force sync") - .setNegativeButton(R.string.ignore, null) - .setPositiveButton("Sync", (dialog, id) -> { - PreferenceUtil.getInstance(requireContext()).setSync(false); - PreferenceUtil.getInstance(requireContext()).setSongGenreSync(false); - activity.goToSync(); - }) - .show(); - } + bind.syncMusicButton.setOnClickListener(v -> { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + builder.setMessage("Force reload your entire music library") + .setTitle("Force sync") + .setNegativeButton(R.string.ignore, null) + .setPositiveButton("Sync", (dialog, id) -> { + PreferenceUtil.getInstance(requireContext()).setSync(false); + PreferenceUtil.getInstance(requireContext()).setSongGenreSync(false); + activity.goToSync(); + }) + .show(); }); } diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 08930e65..56de7ec9 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -54,6 +54,11 @@ app:destination="@id/homeFragment" app:popUpTo="@id/syncFragment" app:popUpToInclusive="true" /> +