diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java index 48f96d0..aadd2f4 100644 --- a/APED/app/src/main/java/com/example/aped/MainActivity.java +++ b/APED/app/src/main/java/com/example/aped/MainActivity.java @@ -81,13 +81,25 @@ public class MainActivity extends AppCompatActivity { // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. mAppBarConfiguration = new AppBarConfiguration.Builder( - R.id.nav_all_IOs, R.id.nav_your_IOs).setDrawerLayout(drawer) - .build(); + R.id.nav_all_IOs, R.id.nav_your_IOs,R.id.nav_plots) + .setDrawerLayout(drawer).build(); NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); NavInflater navInflater = navController.getNavInflater(); NavGraph graph = navInflater.inflate(R.navigation.mobile_navigation); - graph.setStartDestination(R.id.nav_your_IOs); + switch (configurationHandler.getCurrentView()){ + case 2: + graph.setStartDestination(R.id.nav_your_IOs); + break; + + case 3: + graph.setStartDestination(R.id.nav_plots); + break; + + default: + graph.setStartDestination(R.id.nav_all_IOs); + break; + } navController.setGraph(graph); NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration); diff --git a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java index 7fe3aaf..c418f0e 100644 --- a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java +++ b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java @@ -35,6 +35,7 @@ public class AllIOsFragment extends Fragment { MainListViewAdapter mainListViewAdapter = new MainListViewAdapter(mainActivity, 0); lv.setAdapter(mainListViewAdapter); + mainActivity.getConfigurationHandler().setCurrentView(1); return view; } diff --git a/APED/app/src/main/java/com/example/aped/ui/favorite_IOs/FavoriteIOsFragment.java b/APED/app/src/main/java/com/example/aped/ui/favorite_IOs/FavoriteIOsFragment.java index be89efa..5616bfd 100644 --- a/APED/app/src/main/java/com/example/aped/ui/favorite_IOs/FavoriteIOsFragment.java +++ b/APED/app/src/main/java/com/example/aped/ui/favorite_IOs/FavoriteIOsFragment.java @@ -33,6 +33,7 @@ public class FavoriteIOsFragment extends Fragment { MainListViewAdapter mainListViewAdapter = new MainListViewAdapter(mainActivity, 1); lv.setAdapter(mainListViewAdapter); + mainActivity.getConfigurationHandler().setCurrentView(2); return view; } } diff --git a/APED/app/src/main/java/com/example/aped/ui/plots/PlotFragment.java b/APED/app/src/main/java/com/example/aped/ui/plots/PlotFragment.java index a34847c..34ac860 100644 --- a/APED/app/src/main/java/com/example/aped/ui/plots/PlotFragment.java +++ b/APED/app/src/main/java/com/example/aped/ui/plots/PlotFragment.java @@ -28,6 +28,7 @@ public class PlotFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + this.mainActivity = (MainActivity) getActivity(); // Inflate the layout for this fragment View view = inflater.inflate(R.layout.fragment_plot, container, false); LineChartView lineChartView = view.findViewById(R.id.test_plot); @@ -56,7 +57,7 @@ public class PlotFragment extends Fragment { lineChartData.setLines(lines); lineChartView.setLineChartData(lineChartData); - + mainActivity.getConfigurationHandler().setCurrentView(3); return view; } } \ No newline at end of file