namensänderung und code conventions

This commit is contained in:
m_broelemann 2021-01-07 22:00:32 +01:00
parent 9abdca53ef
commit 4a88885267
7 changed files with 30 additions and 25 deletions

View File

@ -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);
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;

View File

@ -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;
}

View File

@ -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;
}
}

View File

@ -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,11 +17,20 @@ 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);
@ -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;
}
}

View File

@ -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;

View File

@ -9,7 +9,7 @@
android:icon="@android:drawable/ic_menu_sort_by_size"
android:title="@string/menu_all_IOs" />
<item
android:id="@+id/nav_your_IOs"
android:id="@+id/nav_favorite_IOs"
android:icon="@android:drawable/btn_star_big_on"
android:title="@string/menu_favorite_IOs" />
<item

View File

@ -12,7 +12,7 @@
tools:layout="@layout/fragment_all_ios" />
<fragment
android:id="@+id/nav_your_IOs"
android:id="@+id/nav_favorite_IOs"
android:name="com.example.aped.ui.favorite_IOs.FavoriteIOsFragment"
android:label="@string/menu_favorite_IOs"
tools:layout="@layout/fragment_your_ios" />