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 aadd2f4..f0d567a 100644 --- a/APED/app/src/main/java/com/example/aped/MainActivity.java +++ b/APED/app/src/main/java/com/example/aped/MainActivity.java @@ -57,7 +57,7 @@ public class MainActivity extends AppCompatActivity { /** To use favorite instead of direct inclusion.*/ private IFAVORITES favorite; - public String start = "@+id/nav_all_IOs"; + /** * On create method of the main activity. * Sets various displays and start settings. @@ -81,18 +81,18 @@ 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,R.id.nav_plots) + R.id.nav_all_IOs, R.id.nav_favorite_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); - switch (configurationHandler.getCurrentView()){ - case 2: - graph.setStartDestination(R.id.nav_your_IOs); + switch (configurationHandler.getCurrentView()) { + case R.id.nav_favorite_IOs: + graph.setStartDestination(R.id.nav_favorite_IOs); break; - case 3: + case R.id.nav_plots: graph.setStartDestination(R.id.nav_plots); break; 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 c418f0e..78cc8b4 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,7 +35,7 @@ public class AllIOsFragment extends Fragment { MainListViewAdapter mainListViewAdapter = new MainListViewAdapter(mainActivity, 0); lv.setAdapter(mainListViewAdapter); - mainActivity.getConfigurationHandler().setCurrentView(1); + mainActivity.getConfigurationHandler().setCurrentView(R.id.nav_all_IOs); 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 5616bfd..42d0c2b 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,7 +33,8 @@ public class FavoriteIOsFragment extends Fragment { MainListViewAdapter mainListViewAdapter = new MainListViewAdapter(mainActivity, 1); lv.setAdapter(mainListViewAdapter); - mainActivity.getConfigurationHandler().setCurrentView(2); + mainActivity.getConfigurationHandler() + .setCurrentView(R.id.nav_favorite_IOs); 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 34ac860..15d6239 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 @@ -1,20 +1,14 @@ package com.example.aped.ui.plots; import android.os.Bundle; - import androidx.fragment.app.Fragment; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; - import com.example.aped.MainActivity; import com.example.aped.R; - import java.util.ArrayList; -import java.util.Arrays; import java.util.List; - import lecho.lib.hellocharts.model.AxisValue; import lecho.lib.hellocharts.model.Line; import lecho.lib.hellocharts.model.LineChartData; @@ -23,29 +17,38 @@ import lecho.lib.hellocharts.view.LineChartView; public class PlotFragment extends Fragment { + /** Include the MainActivity.*/ private MainActivity mainActivity; + /** + * paul + * @param inflater + * @param container + * @param savedInstanceState + * @return + */ @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { + public View onCreateView(final LayoutInflater inflater, + final ViewGroup container, + final 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); - String[] xAxisData = {"15:30","15:31","15:32"}; - int[] yAxisData = {1,3,2}; + String[] xAxisData = {"15:30", "15:31", "15:32"}; + int[] yAxisData = {1, 3, 2}; List yAxisValues = new ArrayList(); List xAxisValues = new ArrayList(); Line line = new Line(yAxisValues); - for(int i = 0; i < xAxisData.length; i++){ + for (int i = 0; i < xAxisData.length; i++) { xAxisValues.add(i, new AxisValue(i).setLabel(xAxisData[i])); } - for (int i = 0; i < yAxisData.length; i++){ + for (int i = 0; i < yAxisData.length; i++) { yAxisValues.add(new PointValue(i, yAxisData[i])); } @@ -57,7 +60,7 @@ public class PlotFragment extends Fragment { lineChartData.setLines(lines); lineChartView.setLineChartData(lineChartData); - mainActivity.getConfigurationHandler().setCurrentView(3); + mainActivity.getConfigurationHandler().setCurrentView(R.id.nav_plots); return view; } -} \ No newline at end of file +} diff --git a/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java b/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java index 1f416ef..19d1da4 100644 --- a/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java +++ b/APED/app/src/main/java/com/example/aped/utils/ConfigurationHandler.java @@ -224,7 +224,8 @@ public class ConfigurationHandler implements IFAVORITES { /** * Setter for currentView. - * @param pCurrentView the name of the current view + * @param pCurrentView + * @return currentView */ public int setCurrentView(final int pCurrentView) { this.currentView = pCurrentView; diff --git a/APED/app/src/main/res/menu/activity_main_drawer.xml b/APED/app/src/main/res/menu/activity_main_drawer.xml index b1b8dbf..0d75ca6 100644 --- a/APED/app/src/main/res/menu/activity_main_drawer.xml +++ b/APED/app/src/main/res/menu/activity_main_drawer.xml @@ -9,7 +9,7 @@ android:icon="@android:drawable/ic_menu_sort_by_size" android:title="@string/menu_all_IOs" />