From c25f620fb184d422501999b5f0e807af3b2b03c3 Mon Sep 17 00:00:00 2001 From: m_broelemann Date: Tue, 29 Dec 2020 10:59:01 +0100 Subject: [PATCH] public static entfernt --- .../java/com/example/aped/MainActivity.java | 6 +++--- .../aped/ui/all_IOs/AllIOsFragment.java | 20 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) 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 193537a..6432687 100644 --- a/APED/app/src/main/java/com/example/aped/MainActivity.java +++ b/APED/app/src/main/java/com/example/aped/MainActivity.java @@ -50,11 +50,11 @@ public class MainActivity extends AppCompatActivity { /** was soll angezeigt werden in Navigation.*/ private AppBarConfiguration mAppBarConfiguration; /** 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.*/ - public static IIO uebergabe = new TestIO(); + public IIO uebergabe = new TestIO(); /** zur Verwendung von favorite anstatt der direkten Einbindung.*/ - public static IFAVORITES favorite = new TestFavorites(); + public IFAVORITES favorite = new TestFavorites(); /** allgemeines.*/ @Override 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 74d4105..a1bc6f1 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 @@ -27,6 +27,7 @@ import com.example.aped.R; import java.util.List; public class AllIOsFragment extends Fragment { + private MainActivity mainActivity; ListView lv; SearchView searchView; ArrayAdapter adapter; @@ -40,6 +41,7 @@ public class AllIOsFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + this.mainActivity = (MainActivity) getActivity(); View view = inflater.inflate(R.layout.fragment_all_ios, container, false); lv = (ListView) view.findViewById(R.id.idListView); @@ -52,7 +54,7 @@ public class AllIOsFragment extends Fragment { @Override public int getCount() { - return MainActivity.xml.getDeviceNames().size(); + return mainActivity.xml.getDeviceNames().size(); } @Override @@ -69,15 +71,15 @@ public class AllIOsFragment extends Fragment { @Override 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; - }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; } else{ 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; }else { favorite_image = android.R.drawable.btn_star_big_off; @@ -91,20 +93,20 @@ public class AllIOsFragment extends Fragment { ButtonView_Favoriten.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view){ - if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) { - MainActivity.favorite.removeFavorite(MainActivity.xml.getDeviceNames().get(i)); + if (mainActivity.favorite.getFavorites().contains(mainActivity.xml.getDeviceNames().get(i))) { + mainActivity.favorite.removeFavorite(mainActivity.xml.getDeviceNames().get(i)); favorite_image = android.R.drawable.btn_star_big_off; ButtonView_Favoriten.setImageResource(favorite_image); }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; ButtonView_Favoriten.setImageResource(favorite_image); } } }); imageView.setImageResource(image); - TextView_Name.setText(MainActivity.xml.getDeviceNames().get(i)); - TextView_State.setText(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))); + TextView_Name.setText(mainActivity.xml.getDeviceNames().get(i)); + TextView_State.setText(mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i))); ButtonView_Favoriten.setImageResource(favorite_image); return view; }