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-28 18:38:51 +01:00
commit 05abb922d1
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,9 @@ import android.widget.Toast;
import com.example.aped.communication.IIO; import com.example.aped.communication.IIO;
import com.example.aped.utils.ExternalStorageHandler; import com.example.aped.utils.ExternalStorageHandler;
import com.example.aped.communication.TestIO; import com.example.aped.communication.TestIO;
import com.example.aped.utils.IFAVORITES;
import com.example.aped.utils.IXML; import com.example.aped.utils.IXML;
import com.example.aped.utils.TestFavorites;
import com.example.aped.utils.TestXML; import com.example.aped.utils.TestXML;
import com.example.aped.utils.XMLHandler; import com.example.aped.utils.XMLHandler;
import com.google.android.material.navigation.NavigationView; import com.google.android.material.navigation.NavigationView;
@ -51,6 +53,8 @@ public class MainActivity extends AppCompatActivity {
public static IXML xml = new TestXML(); public static 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 static IIO uebergabe = new TestIO();
/** zur Verwendung von favorite anstatt der direkten Einbindung.*/
public static IFAVORITES favorite = new TestFavorites();
/** allgemeines.*/ /** allgemeines.*/
@Override @Override

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

@ -30,11 +30,11 @@ public class AllIOsFragment extends Fragment {
ListView lv; ListView lv;
SearchView searchView; SearchView searchView;
ArrayAdapter<String> adapter; ArrayAdapter<String> adapter;
List<String> name = MainActivity.xml.getDeviceNames();//{"IN1", "Temperatur extern > 5°C", "Strom Heizung < 10A"}; //List<String> name = MainActivity.xml.getDeviceNames();//{"IN1", "Temperatur extern > 5°C", "Strom Heizung < 10A"};
//String[] state = {"FALSE", "TRUE", "FALSE"}; //String[] state = {"FALSE", "TRUE", "FALSE"};
int[] images =new int[name.size()];// {R.drawable.red_signal, R.drawable.green_signal, R.drawable.red_signal}; int image;// =new int[MainActivity.xml.getDeviceNames().size()];// {R.drawable.red_signal, R.drawable.green_signal, R.drawable.red_signal};
int[] favoriten = new int[name.size()];//{android.R.drawable.btn_star_big_off, android.R.drawable.btn_star_big_on, android.R.drawable.btn_star_big_off}; int favorite_image ;//= new int[MainActivity.xml.getDeviceNames().size()];//{android.R.drawable.btn_star_big_off, android.R.drawable.btn_star_big_on, android.R.drawable.btn_star_big_off};
int[] favoriten_state = new int[name.size()]; //int[] favoriten_state = new int[MainActivity.xml.getDeviceNames().size()];
@Override @Override
public View onCreateView(LayoutInflater inflater, public View onCreateView(LayoutInflater inflater,
@ -52,7 +52,7 @@ public class AllIOsFragment extends Fragment {
@Override @Override
public int getCount() { public int getCount() {
return name.size(); return MainActivity.xml.getDeviceNames().size();
} }
@Override @Override
@ -69,17 +69,18 @@ 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(name.get(i))=="FALSE") if(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="TRUE") {
{ image=R.drawable.green_signal;
images[i]=R.drawable.red_signal; }else if (MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="FALSE") {
}else { image = R.drawable.red_signal;
images[i] = R.drawable.green_signal;
} }
if(favoriten_state[i]==0) else{
{ image = R.drawable.off_signal;
favoriten[i]=android.R.drawable.btn_star_big_off; }
if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) {
favorite_image = android.R.drawable.btn_star_big_on;
}else { }else {
favoriten[i] = android.R.drawable.btn_star_big_on; favorite_image = android.R.drawable.btn_star_big_off;
} }
view = getLayoutInflater().inflate(R.layout.listview_layout, null); view = getLayoutInflater().inflate(R.layout.listview_layout, null);
ImageView imageView = (ImageView) view.findViewById(R.id.images); ImageView imageView = (ImageView) view.findViewById(R.id.images);
@ -90,21 +91,21 @@ 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(favoriten_state[i]==0){ if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) {
favoriten_state[i]=1; MainActivity.favorite.removeFavorite(MainActivity.xml.getDeviceNames().get(i));
favoriten[i]=android.R.drawable.btn_star_big_on; favorite_image = android.R.drawable.btn_star_big_off;
ButtonView_Favoriten.setImageResource(favoriten[i]); ButtonView_Favoriten.setImageResource(favorite_image);
}else { }else {
favoriten_state[i]=0; MainActivity.favorite.addFavorite(MainActivity.xml.getDeviceNames().get(i));
favoriten[i]=android.R.drawable.btn_star_big_off; favorite_image = android.R.drawable.btn_star_big_on;
ButtonView_Favoriten.setImageResource(favoriten[i]); ButtonView_Favoriten.setImageResource(favorite_image);
} }
} }
}); });
imageView.setImageResource(images[i]); imageView.setImageResource(image);
TextView_Name.setText(name.get(i)); TextView_Name.setText(MainActivity.xml.getDeviceNames().get(i));
TextView_State.setText(MainActivity.uebergabe.read(name.get(i))); TextView_State.setText(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i)));
ButtonView_Favoriten.setImageResource(favoriten[i]); ButtonView_Favoriten.setImageResource(favorite_image);
return view; return view;
} }
} }

1
APED/app/src/main/java/com/example/aped/utils/TestXML.java
View File

@ -13,6 +13,7 @@ public class TestXML implements IXML {
List<String> returnList = new ArrayList<>(); List<String> returnList = new ArrayList<>();
returnList.add("stoff"); returnList.add("stoff");
returnList.add("schnaps"); returnList.add("schnaps");
returnList.add("whatever");
return returnList; return returnList;
} }

BIN
APED/app/src/main/res/drawable/off_signal.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB