bugfixes and redesign

app/src/main/res/drawable/background_full.xml

@@ -6,8 +6,8 @@
         android:color="#FFFFFF" />
     <gradient
         android:angle="180"
-        android:endColor="@color/purple_200"
+        android:endColor="?attr/colorPrimary"
-        android:startColor="#0088FF" />
+        android:startColor="?attr/colorSecondary" />
     <corners
         android:bottomLeftRadius="0dp"
         android:bottomRightRadius="0dp"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp">

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

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:clickable="true"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clickable="true"
         tools:context=".ui.Credits.CreditsFragment">
 
         <ImageView
@@ -167,11 +170,12 @@
             android:id="@+id/cooperation"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="25dp"
             android:gravity="center_horizontal"
             android:text="IN KOOPERATION WITH"
             android:textAlignment="center"
             android:textColor="@color/mtrl_btn_text_color_selector"
-        android:textSize="14sp"
+            android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/MatzeZ" />
@@ -288,3 +292,4 @@
             app:layout_constraintTop_toBottomOf="@+id/mail" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>

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

@@ -33,89 +33,86 @@
         android:layout_marginBottom="-25dp"
         android:scaleType="centerCrop"
         android:src="@drawable/backgroundoverlay"
-        app:layout_constraintBottom_toBottomOf="@+id/button_blue"
+        app:layout_constraintBottom_toBottomOf="@+id/button_reset"
         app:layout_constraintEnd_toEndOf="@+id/button_colorpicker"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/colors"
         app:layout_constraintTop_toTopOf="@+id/button_colorpicker"
         app:layout_constraintVertical_bias="0.0" />
 
     <TextView
         android:id="@+id/background"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_marginLeft="50dp"
-        android:gravity="center_horizontal"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:gravity="center_horizontal|left"
         android:text="@string/hintergrund"
         android:textAlignment="center"
         android:textColor="@color/mtrl_btn_text_color_selector"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@+id/divider"
+        app:layout_constraintEnd_toStartOf="@+id/button_pickimage"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/divider2" />
 
     <TextView
         android:id="@+id/colors"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_marginLeft="50dp"
         android:layout_marginTop="125dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
         android:layout_marginBottom="25dp"
-        android:gravity="center_horizontal"
+        android:gravity="center_horizontal|left"
         android:text="@string/farben"
         android:textAlignment="center"
         android:textColor="@color/mtrl_btn_text_color_selector"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@+id/divider2"
+        app:layout_constraintEnd_toStartOf="@+id/button_colorpicker"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/sprache"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_marginLeft="50dp"
-        android:gravity="center_horizontal"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:gravity="center_horizontal|left"
         android:text="@string/sprache"
         android:textAlignment="center"
         android:textColor="@color/mtrl_btn_text_color_selector"
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@+id/divider3"
+        app:layout_constraintEnd_toStartOf="@+id/button_language"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/divider" />
 
     <TextView
         android:id="@+id/reset_settings"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="50dp"
         android:layout_marginLeft="50dp"
-        android:gravity="center_horizontal"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:gravity="center_horizontal|left"
         android:text="@string/einstellungen_zurücksetzen"
         android:textAlignment="center"
         android:textColor="@color/mtrl_btn_text_color_selector"
         android:textSize="18sp"
-        app:layout_constraintBottom_toTopOf="@+id/divider4"
+        app:layout_constraintBottom_toBottomOf="@+id/button_reset"
+        app:layout_constraintEnd_toStartOf="@+id/button_reset"
         app:layout_constraintStart_toStartOf="@+id/Background"
-        app:layout_constraintTop_toBottomOf="@+id/divider3" />
+        app:layout_constraintTop_toTopOf="@+id/button_reset" />
-
-    <TextView
-        android:id="@+id/nightmode"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="50dp"
-        android:layout_marginLeft="50dp"
-        android:layout_marginTop="20dp"
-        android:gravity="center_horizontal"
-        android:text="@string/farbschema"
-        android:textAlignment="center"
-        android:textColor="@color/mtrl_btn_text_color_selector"
-        android:textSize="18sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider4" />
 
     <Button
         android:id="@+id/button_reset"
@@ -127,7 +124,6 @@
         android:background="@drawable/button_round"
         android:text="@string/button_zurücksetzen"
         app:backgroundTint="@null"
-        app:layout_constraintBottom_toTopOf="@+id/divider4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/divider3" />
 
@@ -173,59 +169,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/divider2" />
 
-    <Button
-        android:id="@+id/button_green"
-        android:layout_width="150dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginRight="50dp"
-        android:background="@drawable/button_round"
-        android:text="@string/grün"
-        app:backgroundTint="#00FF0A"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button_yellow" />
-
-    <Button
-        android:id="@+id/button_yellow"
-        android:layout_width="150dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginRight="50dp"
-        android:background="@drawable/button_round"
-        android:text="@string/gelb"
-        android:textColor="#000000"
-        app:backgroundTint="#FFE500"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button_red" />
-
-    <Button
-        android:id="@+id/button_red"
-        android:layout_width="150dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginRight="50dp"
-        android:background="@drawable/button_round"
-        android:text="@string/rot"
-        app:backgroundTint="#FF0000"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider4" />
-
-    <Button
-        android:id="@+id/button_blue"
-        android:layout_width="150dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginRight="50dp"
-        android:background="@drawable/button_round"
-        android:text="@string/blau"
-        app:backgroundTint="#008EFF"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button_green" />
-
     <View
         android:id="@+id/divider"
         android:layout_width="0dp"
@@ -257,14 +200,4 @@
         app:layout_constraintStart_toStartOf="@+id/divider"
         app:layout_constraintTop_toBottomOf="@+id/button_language" />
 
-    <View
-        android:id="@+id/divider4"
-        android:layout_width="0dp"
-        android:layout_height="2dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/background_full"
-        app:layout_constraintEnd_toEndOf="@+id/divider3"
-        app:layout_constraintStart_toStartOf="@+id/divider3"
-        app:layout_constraintTop_toBottomOf="@+id/button_reset" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -232,7 +232,7 @@
         android:text="@string/wlan"
         android:textAlignment="center"
         android:textColor="@color/mtrl_btn_text_color_selector"
-        android:textSize="20sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@+id/textView7"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.485"
@@ -248,7 +248,7 @@
         android:text="@string/kodi"
         android:textAlignment="center"
         android:textColor="@color/mtrl_btn_text_color_selector"
-        android:textSize="20sp"
+        android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.485"

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

@@ -21,108 +21,153 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
+    <ImageView
+        android:id="@drawable/backgroundoverlay"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="-25dp"
+        android:layout_marginLeft="-25dp"
+        android:layout_marginTop="-25dp"
+        android:layout_marginEnd="-25dp"
+        android:layout_marginRight="-25dp"
+        android:layout_marginBottom="-25dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/backgroundoverlay"
+        app:layout_constraintBottom_toBottomOf="@+id/textView2"
+        app:layout_constraintEnd_toEndOf="@+id/schlafzimmeru1an"
+        app:layout_constraintStart_toStartOf="@+id/schlafzimmeru1aus"
+        app:layout_constraintTop_toTopOf="@+id/textView5" />
+
     <Button
         android:id="@+id/schlafzimmeru3an"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:background="@drawable/button_right"
         android:hapticFeedbackEnabled="true"
         android:text="AN"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:backgroundTint="@null"
-        app:layout_constraintStart_toEndOf="@+id/schlafzimmeru3aus"
+        app:layout_constraintBottom_toBottomOf="@+id/textView2"
-        app:layout_constraintTop_toBottomOf="@+id/schlafzimmeru3" />
+        app:layout_constraintStart_toEndOf="@+id/textView2"
-
+        app:layout_constraintTop_toTopOf="@+id/textView2" />
-    <TextView
-        android:id="@+id/schlafzimmeru2"
-        android:layout_width="193dp"
-        android:layout_height="33dp"
-        android:gravity="center_horizontal"
-        android:text="Steckdose 2"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/schlafzimmeru3aus"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@drawable/button_left"
         android:hapticFeedbackEnabled="true"
         android:text="AUS"
-        app:layout_constraintEnd_toStartOf="@+id/schlafzimmeru3an"
+        app:backgroundTint="@null"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/textView2"
-        app:layout_constraintTop_toBottomOf="@+id/schlafzimmeru3" />
+        app:layout_constraintEnd_toStartOf="@+id/textView2"
+        app:layout_constraintTop_toTopOf="@+id/textView2" />
 
     <Button
         android:id="@+id/schlafzimmeru2an"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:background="@drawable/button_right"
         android:hapticFeedbackEnabled="true"
         android:text="AN"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:backgroundTint="@null"
-        app:layout_constraintStart_toEndOf="@+id/schlafzimmeru2aus"
+        app:layout_constraintBottom_toBottomOf="@+id/textView3"
-        app:layout_constraintTop_toBottomOf="@+id/schlafzimmeru2" />
+        app:layout_constraintStart_toEndOf="@+id/textView3"
+        app:layout_constraintTop_toTopOf="@+id/textView3" />
 
     <Button
         android:id="@+id/schlafzimmeru2aus"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
+        android:layout_marginEnd="10dp"
-        android:layout_marginLeft="8dp"
+        android:layout_marginRight="10dp"
+        android:background="@drawable/button_left"
         android:hapticFeedbackEnabled="true"
         android:text="AUS"
-        app:layout_constraintEnd_toStartOf="@+id/schlafzimmeru2an"
+        app:backgroundTint="@null"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/textView3"
-        app:layout_constraintTop_toBottomOf="@+id/schlafzimmeru2" />
+        app:layout_constraintEnd_toStartOf="@+id/textView3"
-
+        app:layout_constraintTop_toTopOf="@+id/textView3" />
-    <TextView
-        android:id="@+id/schlafzimmeru1"
-        android:layout_width="193dp"
-        android:layout_height="33dp"
-        android:gravity="center_horizontal"
-        android:text="Steckdose 1"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toTopOf="@+id/schlafzimmeru2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/schlafzimmeru3"
-        android:layout_width="193dp"
-        android:layout_height="33dp"
-        android:gravity="center_horizontal"
-        android:text="Steckdose 3"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/schlafzimmeru2" />
 
     <Button
         android:id="@+id/schlafzimmeru1aus"
-        android:layout_width="87dp"
+        android:layout_width="wrap_content"
-        android:layout_height="56dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@drawable/button_left"
         android:hapticFeedbackEnabled="true"
         android:text="AUS"
-        app:layout_constraintEnd_toStartOf="@+id/schlafzimmeru1an"
+        app:backgroundTint="@null"
+        app:layout_constraintBottom_toBottomOf="@+id/textView5"
+        app:layout_constraintEnd_toStartOf="@+id/textView5"
+        app:layout_constraintTop_toTopOf="@+id/textView5" />
+
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="200dp"
+        android:background="@drawable/button_middle"
+        android:gravity="center"
+        android:text="STECKDOSE 1"
+        android:textAlignment="center"
+        android:textColor="@color/mtrl_btn_text_color_selector"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/schlafzimmeru1" />
+        app:layout_constraintTop_toTopOf="@+id/Background" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/button_middle"
+        android:gravity="center"
+        android:text="STECKDOSE 3"
+        android:textAlignment="center"
+        android:textColor="@color/mtrl_btn_text_color_selector"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView3" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/button_middle"
+        android:gravity="center"
+        android:text="STECKDOSE 2"
+        android:textAlignment="center"
+        android:textColor="@color/mtrl_btn_text_color_selector"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView5" />
 
     <Button
         android:id="@+id/schlafzimmeru1an"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginLeft="10dp"
+        android:background="@drawable/button_right"
         android:hapticFeedbackEnabled="true"
         android:text="AN"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:backgroundTint="@null"
-        app:layout_constraintStart_toEndOf="@+id/schlafzimmeru1aus"
+        app:layout_constraintBottom_toBottomOf="@+id/textView5"
-        app:layout_constraintTop_toBottomOf="@+id/schlafzimmeru1" />
+        app:layout_constraintStart_toEndOf="@+id/textView5"
+        app:layout_constraintTop_toTopOf="@+id/textView5" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values-de-rDE/strings.xml

@@ -21,7 +21,7 @@
     <string name="menu_sprache">SPRACHE</string>
     <string name="menu_schliessen">SCHLIESSEN</string>
     <string name="colorpicker">WÄHLE DEINE FARBE</string>
-    <string name="ok">OK</string>
+    <string name="ok">WEITER</string>
     <string name="action_logout">AUSLOGGEN</string>
     <string name="Welcome_to_your_HOMEAUTOMATION_APP">WILLKOMMEN BEI TERAPLEX</string>
     <string name="login">EINLOGGEN</string>
@@ -51,4 +51,9 @@
     <string name="ssh_remote">SSH-FERNBEDIENUNG</string>
     <string name="please_login">BITTE VERBINDE DICH MIT DEINEM SERVER</string>
     <string name="sie_sind_als_angemeldet">DU BIST ALS  {USERNAME} AUF {IP}</string>
+    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="logout">AUSLOGGEN</string>
+    <string name="are_you_sure_to_reset">MÖCHTEST DU WIRKLICH DIE APP UND ALLE IHRE EINSTELLUNGEN ZURÜCKSETZEN?</string>
+    <string name="reset_app">APP ZURÜCKSETZEN</string>
+    <string name="menu_über">ABOUT</string>
 </resources>

app/src/main/res/values-tlh/strings.xml

@@ -45,4 +45,6 @@
     <string name="button_hintergrund_wählen">nobHa\'</string>
     <string name="button_zurücksetzen">lI\'</string>
     <string name="ssh_remote">verengan</string>
+    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="logout">parmaq</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -9,7 +9,7 @@
     <string name="SSH_User">Navigation header</string>
     <string name="SSH_Password">Navigation header</string>
     <string name="SSH_Command">Navigation header</string>
-    <string name="action_logout">logout</string>
+    <string name="action_logout">LOGOUT</string>
     <string name="ssh_remote">SSH-REMOTE</string>
 
     //home