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

Logo in Menü geädert

Browse Source
This commit is contained in:
m_broelemann 2021-01-05 15:40:43 +01:00
parent 2a50b6f7c3
commit 420b0fac38
4 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
APED/app/src/main/java/com/example/aped/ui/visualization/MainListViewAdapter.java
View File

@ -30,6 +30,10 @@ public class MainListViewAdapter extends BaseAdapter {
private int favoriteImage; private int favoriteImage;
List<String> favoritenList;
public MainListViewAdapter(MainActivity pMainActivity,int pFavoriteMode){ public MainListViewAdapter(MainActivity pMainActivity,int pFavoriteMode){
this.mainActivity = pMainActivity; this.mainActivity = pMainActivity;
this.favoriteMode = pFavoriteMode; this.favoriteMode = pFavoriteMode;
@ -48,6 +52,7 @@ public class MainListViewAdapter extends BaseAdapter {
devices = mainActivity.xml.getDeviceNames().size(); devices = mainActivity.xml.getDeviceNames().size();
}else{ }else{
devices = mainActivity.favorite.getFavorites().size(); devices = mainActivity.favorite.getFavorites().size();
favoritenList = new ArrayList<>(mainActivity.favorite.getFavorites()) ;
} }
return devices; return devices;
} }
@ -92,10 +97,12 @@ public class MainListViewAdapter extends BaseAdapter {
new View.OnClickListener() { new View.OnClickListener() {
@Override @Override
public void onClick(final View view) { public void onClick(final View view) {
if (favoriteMode == 0){ if (favoriteMode == 0){
deviceName = mainActivity.xml.getDeviceNames().get(i); deviceName = mainActivity.xml.getDeviceNames().get(i);
}else{ }else{
deviceName = mainActivity.favorite.getFavorites().get(i); List<String> test = favoritenList;
deviceName = favoritenList.get(i);
} }
if (mainActivity.favorite.getFavorites().contains( if (mainActivity.favorite.getFavorites().contains(
deviceName)) { deviceName)) {
@ -111,9 +118,9 @@ public class MainListViewAdapter extends BaseAdapter {
buttonViewFavoriten.setImageResource( buttonViewFavoriten.setImageResource(
favoriteImage); favoriteImage);
} }
Intent intentneustart = mainActivity.getIntent();// gegen richtigen Befehl tauschen da nur die visualisierung neu gestartet werden soll /**Intent intentneustart = mainActivity.getIntent();// gegen richtigen Befehl tauschen da nur die visualisierung neu gestartet werden soll
mainActivity.finish(); mainActivity.finish();
mainActivity.startActivity(intentneustart); mainActivity.startActivity(intentneustart);*/
} }
}); });
//textViewPin.setText(((List<String>) (mainActivity.xml.getPort(mainActivity.xml.getDeviceNames().get(i))).get("pins")).get(0)); //textViewPin.setText(((List<String>) (mainActivity.xml.getPort(mainActivity.xml.getDeviceNames().get(i))).get("pins")).get(0));

BIN
APED/app/src/main/res/drawable/aped_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 KiB

31
APED/app/src/main/res/layout/nav_header_main.xml
View File

@ -1,35 +1,40 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height" android:layout_height="@dimen/nav_header_height"
android:background="@drawable/side_nav_bar" android:background="@drawable/side_nav_bar"
android:gravity="bottom" android:gravity="bottom"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark"> android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="wrap_content" android:layout_width="110dp"
android:layout_height="wrap_content" android:layout_height="100dp"
android:contentDescription="@string/nav_header_desc" android:contentDescription="@string/nav_header_desc"
android:paddingTop="@dimen/nav_header_vertical_spacing" app:srcCompat="@drawable/aped_logo"
app:srcCompat="@mipmap/ic_launcher_round" /> android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_margin="4dp"/>
<TextView <TextView
android:id="@+id/textViewName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="@string/nav_header_title" android:text="@string/nav_header_title"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:layout_below="@id/imageView"
android:layout_alignParentLeft="true"
android:layout_margin="4dp"/>
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/nav_header_subtitle" /> android:text="@string/nav_header_subtitle"
</LinearLayout> android:layout_below="@id/textViewName"
android:layout_alignParentLeft="true"
android:layout_margin="4dp"/>
</RelativeLayout>

2
APED/app/src/main/res/values/dimens.xml
View File

@ -3,6 +3,6 @@
<dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="nav_header_vertical_spacing">8dp</dimen> <dimen name="nav_header_vertical_spacing">8dp</dimen>
<dimen name="nav_header_height">176dp</dimen> <dimen name="nav_header_height">210dp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
</resources> </resources>