Merge branch 'master' of https://github.com/JG-Cody/Terraplex into zwicki_branch

 Conflicts:

	app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurFragment.java

app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ListAdapter.java

@@ -1,5 +1,6 @@
 package de.jg_cody.Teraplex.ui.rooms;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -7,6 +8,8 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 
 import de.jg_cody.Teraplex.R;
@@ -36,8 +39,10 @@ public class ListAdapter extends ArrayAdapter {
         this.objects = objects;
 
     }
+    @SuppressLint("InflateParams")
+    @NotNull
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    public View getView(int position, View convertView, @NotNull ViewGroup parent) {
 
         IViewHolder viewHolder= null;
         ListItem listViewItem = objects.get(position);
@@ -76,10 +81,6 @@ public class ListAdapter extends ArrayAdapter {
 
                 //convertView.setTag(viewHolder);
 
-            }
-            else if(listViewItemType == OPTION3BUTTON)
-            {
-
             }
         }
         else{

app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderDoubleButton.java

@@ -39,8 +39,7 @@ public class ViewHolderDoubleButton implements IViewHolder{
     @Override
     public View[] getViews()
     {
-        View[] views = {getbLeft(),getbRight()};
+        return new View[]{getbLeft(),getbRight()};
-        return views;
 
 
     }

app/src/main/java/de/jg_cody/Teraplex/ui/rooms/ViewHolderSingleButton.java

@@ -32,8 +32,7 @@ public class ViewHolderSingleButton implements IViewHolder {
         @Override
         public View[] getViews()
         {
-            View[] views = {getbRun(),};
+            return new View[]{getbRun(),};
-            return views;
 
 
         }

app/src/main/res/layout/fragment_credits.xml

@@ -10,7 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"

app/src/main/res/layout/fragment_einstellungen.xml

@@ -10,7 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"

app/src/main/res/layout/fragment_home.xml

@@ -15,7 +15,7 @@
         android:layout_height="0dp"
         android:background="#80FFFFFF"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout/fragment_konsole.xml

@@ -13,7 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout/fragment_kueche.xml

@@ -13,7 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout/fragment_main.xml

@@ -13,7 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout/fragment_schlafzimmer.xml

@@ -13,7 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

app/src/main/res/layout/fragment_zeitsteuerung.xml

@@ -13,7 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/background"
+        android:src="@drawable/fog_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"