MO_Mobile_Systeme/APED_App
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://its-gitlab.init.hs-owl.de/mo_b_l/aped_app

Browse Source
This commit is contained in:
paul-loedige 2020-12-29 11:47:08 +01:00
commit bbd9ec737a
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APED/app/src/main/java/com/example/aped/MainActivity.java
View File

@ -50,11 +50,11 @@ public class MainActivity extends AppCompatActivity {
/** was soll angezeigt werden in Navigation.*/ /** was soll angezeigt werden in Navigation.*/
private AppBarConfiguration mAppBarConfiguration; private AppBarConfiguration mAppBarConfiguration;
/** zur Verwendung von xml anstatt der direkten Einbindung.*/ /** zur Verwendung von xml anstatt der direkten Einbindung.*/
public static IXML xml = new TestXML(); public IXML xml = new TestXML();
/** zur Verwendung von uebergabe anstatt der direkten Einbindung.*/ /** zur Verwendung von uebergabe anstatt der direkten Einbindung.*/
public static IIO uebergabe = new TestIO(); public IIO uebergabe = new TestIO();
/** zur Verwendung von favorite anstatt der direkten Einbindung.*/ /** zur Verwendung von favorite anstatt der direkten Einbindung.*/
public static IFAVORITES favorite = new TestFavorites(); public IFAVORITES favorite = new TestFavorites();
/** allgemeines.*/ /** allgemeines.*/
@Override @Override

20
APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
View File

@ -27,6 +27,7 @@ import com.example.aped.R;
import java.util.List; import java.util.List;
public class AllIOsFragment extends Fragment { public class AllIOsFragment extends Fragment {
private MainActivity mainActivity;
ListView lv; ListView lv;
SearchView searchView; SearchView searchView;
ArrayAdapter<String> adapter; ArrayAdapter<String> adapter;
@ -40,6 +41,7 @@ public class AllIOsFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, public View onCreateView(LayoutInflater inflater,
ViewGroup container, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
this.mainActivity = (MainActivity) getActivity();
View view = inflater.inflate(R.layout.fragment_all_ios, container, View view = inflater.inflate(R.layout.fragment_all_ios, container,
false); false);
lv = (ListView) view.findViewById(R.id.idListView); lv = (ListView) view.findViewById(R.id.idListView);
@ -52,7 +54,7 @@ public class AllIOsFragment extends Fragment {
@Override @Override
public int getCount() { public int getCount() {
return MainActivity.xml.getDeviceNames().size(); return mainActivity.xml.getDeviceNames().size();
} }
@Override @Override
@ -69,15 +71,15 @@ public class AllIOsFragment extends Fragment {
@Override @Override
public View getView(int i, View view, ViewGroup viewGroup) { public View getView(int i, View view, ViewGroup viewGroup) {
if(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="TRUE") { if(mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i)).equals("TRUE")) {
image=R.drawable.green_signal; image=R.drawable.green_signal;
}else if (MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="FALSE") { }else if (mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i)).equals("FALSE")) {
image = R.drawable.red_signal; image = R.drawable.red_signal;
} }
else{ else{
image = R.drawable.off_signal; image = R.drawable.off_signal;
} }
if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) { if (mainActivity.favorite.getFavorites().contains(mainActivity.xml.getDeviceNames().get(i))) {
favorite_image = android.R.drawable.btn_star_big_on; favorite_image = android.R.drawable.btn_star_big_on;
}else { }else {
favorite_image = android.R.drawable.btn_star_big_off; favorite_image = android.R.drawable.btn_star_big_off;
@ -91,20 +93,20 @@ public class AllIOsFragment extends Fragment {
ButtonView_Favoriten.setOnClickListener(new View.OnClickListener(){ ButtonView_Favoriten.setOnClickListener(new View.OnClickListener(){
@Override @Override
public void onClick(View view){ public void onClick(View view){
if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) { if (mainActivity.favorite.getFavorites().contains(mainActivity.xml.getDeviceNames().get(i))) {
MainActivity.favorite.removeFavorite(MainActivity.xml.getDeviceNames().get(i)); mainActivity.favorite.removeFavorite(mainActivity.xml.getDeviceNames().get(i));
favorite_image = android.R.drawable.btn_star_big_off; favorite_image = android.R.drawable.btn_star_big_off;
ButtonView_Favoriten.setImageResource(favorite_image); ButtonView_Favoriten.setImageResource(favorite_image);
}else { }else {
MainActivity.favorite.addFavorite(MainActivity.xml.getDeviceNames().get(i)); mainActivity.favorite.addFavorite(mainActivity.xml.getDeviceNames().get(i));
favorite_image = android.R.drawable.btn_star_big_on; favorite_image = android.R.drawable.btn_star_big_on;
ButtonView_Favoriten.setImageResource(favorite_image); ButtonView_Favoriten.setImageResource(favorite_image);
} }
} }
}); });
imageView.setImageResource(image); imageView.setImageResource(image);
TextView_Name.setText(MainActivity.xml.getDeviceNames().get(i)); TextView_Name.setText(mainActivity.xml.getDeviceNames().get(i));
TextView_State.setText(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))); TextView_State.setText(mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i)));
ButtonView_Favoriten.setImageResource(favorite_image); ButtonView_Favoriten.setImageResource(favorite_image);
return view; return view;
} }