namensänderung und code conventions
This commit is contained in:
parent
9abdca53ef
commit
4a88885267
@ -57,7 +57,7 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
/** To use favorite instead of direct inclusion.*/
|
/** To use favorite instead of direct inclusion.*/
|
||||||
private IFAVORITES favorite;
|
private IFAVORITES favorite;
|
||||||
public String start = "@+id/nav_all_IOs";
|
|
||||||
/**
|
/**
|
||||||
* On create method of the main activity.
|
* On create method of the main activity.
|
||||||
* Sets various displays and start settings.
|
* 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
|
// Passing each menu ID as a set of Ids because each
|
||||||
// menu should be considered as top level destinations.
|
// menu should be considered as top level destinations.
|
||||||
mAppBarConfiguration = new AppBarConfiguration.Builder(
|
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();
|
.setDrawerLayout(drawer).build();
|
||||||
NavController navController = Navigation.findNavController(this,
|
NavController navController = Navigation.findNavController(this,
|
||||||
R.id.nav_host_fragment);
|
R.id.nav_host_fragment);
|
||||||
NavInflater navInflater = navController.getNavInflater();
|
NavInflater navInflater = navController.getNavInflater();
|
||||||
NavGraph graph = navInflater.inflate(R.navigation.mobile_navigation);
|
NavGraph graph = navInflater.inflate(R.navigation.mobile_navigation);
|
||||||
switch (configurationHandler.getCurrentView()){
|
switch (configurationHandler.getCurrentView()) {
|
||||||
case 2:
|
case R.id.nav_favorite_IOs:
|
||||||
graph.setStartDestination(R.id.nav_your_IOs);
|
graph.setStartDestination(R.id.nav_favorite_IOs);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case R.id.nav_plots:
|
||||||
graph.setStartDestination(R.id.nav_plots);
|
graph.setStartDestination(R.id.nav_plots);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ public class AllIOsFragment extends Fragment {
|
|||||||
MainListViewAdapter mainListViewAdapter =
|
MainListViewAdapter mainListViewAdapter =
|
||||||
new MainListViewAdapter(mainActivity, 0);
|
new MainListViewAdapter(mainActivity, 0);
|
||||||
lv.setAdapter(mainListViewAdapter);
|
lv.setAdapter(mainListViewAdapter);
|
||||||
mainActivity.getConfigurationHandler().setCurrentView(1);
|
mainActivity.getConfigurationHandler().setCurrentView(R.id.nav_all_IOs);
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +33,8 @@ public class FavoriteIOsFragment extends Fragment {
|
|||||||
MainListViewAdapter mainListViewAdapter =
|
MainListViewAdapter mainListViewAdapter =
|
||||||
new MainListViewAdapter(mainActivity, 1);
|
new MainListViewAdapter(mainActivity, 1);
|
||||||
lv.setAdapter(mainListViewAdapter);
|
lv.setAdapter(mainListViewAdapter);
|
||||||
mainActivity.getConfigurationHandler().setCurrentView(2);
|
mainActivity.getConfigurationHandler()
|
||||||
|
.setCurrentView(R.id.nav_favorite_IOs);
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,20 +1,14 @@
|
|||||||
package com.example.aped.ui.plots;
|
package com.example.aped.ui.plots;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
import com.example.aped.MainActivity;
|
import com.example.aped.MainActivity;
|
||||||
import com.example.aped.R;
|
import com.example.aped.R;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import lecho.lib.hellocharts.model.AxisValue;
|
import lecho.lib.hellocharts.model.AxisValue;
|
||||||
import lecho.lib.hellocharts.model.Line;
|
import lecho.lib.hellocharts.model.Line;
|
||||||
import lecho.lib.hellocharts.model.LineChartData;
|
import lecho.lib.hellocharts.model.LineChartData;
|
||||||
@ -23,29 +17,38 @@ import lecho.lib.hellocharts.view.LineChartView;
|
|||||||
|
|
||||||
public class PlotFragment extends Fragment {
|
public class PlotFragment extends Fragment {
|
||||||
|
|
||||||
|
/** Include the MainActivity.*/
|
||||||
private MainActivity mainActivity;
|
private MainActivity mainActivity;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* paul
|
||||||
|
* @param inflater
|
||||||
|
* @param container
|
||||||
|
* @param savedInstanceState
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(final LayoutInflater inflater,
|
||||||
Bundle savedInstanceState) {
|
final ViewGroup container,
|
||||||
|
final Bundle savedInstanceState) {
|
||||||
this.mainActivity = (MainActivity) getActivity();
|
this.mainActivity = (MainActivity) getActivity();
|
||||||
// Inflate the layout for this fragment
|
// Inflate the layout for this fragment
|
||||||
View view = inflater.inflate(R.layout.fragment_plot, container, false);
|
View view = inflater.inflate(R.layout.fragment_plot, container, false);
|
||||||
LineChartView lineChartView = view.findViewById(R.id.test_plot);
|
LineChartView lineChartView = view.findViewById(R.id.test_plot);
|
||||||
|
|
||||||
String[] xAxisData = {"15:30","15:31","15:32"};
|
String[] xAxisData = {"15:30", "15:31", "15:32"};
|
||||||
int[] yAxisData = {1,3,2};
|
int[] yAxisData = {1, 3, 2};
|
||||||
|
|
||||||
List yAxisValues = new ArrayList();
|
List yAxisValues = new ArrayList();
|
||||||
List xAxisValues = new ArrayList();
|
List xAxisValues = new ArrayList();
|
||||||
|
|
||||||
Line line = new Line(yAxisValues);
|
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]));
|
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]));
|
yAxisValues.add(new PointValue(i, yAxisData[i]));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,7 +60,7 @@ public class PlotFragment extends Fragment {
|
|||||||
lineChartData.setLines(lines);
|
lineChartData.setLines(lines);
|
||||||
|
|
||||||
lineChartView.setLineChartData(lineChartData);
|
lineChartView.setLineChartData(lineChartData);
|
||||||
mainActivity.getConfigurationHandler().setCurrentView(3);
|
mainActivity.getConfigurationHandler().setCurrentView(R.id.nav_plots);
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -224,7 +224,8 @@ public class ConfigurationHandler implements IFAVORITES {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Setter for currentView.
|
* Setter for currentView.
|
||||||
* @param pCurrentView the name of the current view
|
* @param pCurrentView
|
||||||
|
* @return currentView
|
||||||
*/
|
*/
|
||||||
public int setCurrentView(final int pCurrentView) {
|
public int setCurrentView(final int pCurrentView) {
|
||||||
this.currentView = pCurrentView;
|
this.currentView = pCurrentView;
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
android:icon="@android:drawable/ic_menu_sort_by_size"
|
android:icon="@android:drawable/ic_menu_sort_by_size"
|
||||||
android:title="@string/menu_all_IOs" />
|
android:title="@string/menu_all_IOs" />
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_your_IOs"
|
android:id="@+id/nav_favorite_IOs"
|
||||||
android:icon="@android:drawable/btn_star_big_on"
|
android:icon="@android:drawable/btn_star_big_on"
|
||||||
android:title="@string/menu_favorite_IOs" />
|
android:title="@string/menu_favorite_IOs" />
|
||||||
<item
|
<item
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
tools:layout="@layout/fragment_all_ios" />
|
tools:layout="@layout/fragment_all_ios" />
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/nav_your_IOs"
|
android:id="@+id/nav_favorite_IOs"
|
||||||
android:name="com.example.aped.ui.favorite_IOs.FavoriteIOsFragment"
|
android:name="com.example.aped.ui.favorite_IOs.FavoriteIOsFragment"
|
||||||
android:label="@string/menu_favorite_IOs"
|
android:label="@string/menu_favorite_IOs"
|
||||||
tools:layout="@layout/fragment_your_ios" />
|
tools:layout="@layout/fragment_your_ios" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user