From fa70aad80ec6035217926b85fbd968bd8bed3cdf Mon Sep 17 00:00:00 2001
From: JG-Cody <julian.guerster@regensburg-mail.de>
Date: Fri, 11 Jun 2021 19:07:06 +0200
Subject: [PATCH] =?UTF-8?q?strings=20hinzugef=C3=BCgt...=20dynamische=20bu?=
 =?UTF-8?q?ttons=20vorbereitet=20und=20=C3=BCberarbeitet...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../de/jg_cody/Teraplex/AddButtonDialog.java  |  5 +-
 .../de/jg_cody/Teraplex/AddButtonsDialog.java |  4 +-
 app/src/main/res/layout/doublebutton.xml      | 59 +++++++++++++++++++
 app/src/main/res/layout/fragment_credits.xml  | 12 ++--
 .../res/layout/fragment_einstellungen.xml     | 10 ++--
 app/src/main/res/layout/fragment_kueche.xml   |  8 +++
 app/src/main/res/layout/singlebutton.xml      | 40 ++++++++-----
 app/src/main/res/values/strings.xml           | 18 ++++--
 8 files changed, 122 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/layout/doublebutton.xml

diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java
index 072059e..1d3704f 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java
@@ -41,9 +41,12 @@ public class AddButtonDialog extends DialogFragment {
                     }
                 });
 
+
         editTextUsername = view.findViewById(R.id.button_name);
         editTextPassword = view.findViewById(R.id.button_command);
-        return builder.create();
+        AlertDialog mDialog = builder.create();
+        mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round);
+        return mDialog;
     }
 
     @Override
diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialog.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialog.java
index 26f55ad..7e618cf 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialog.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialog.java
@@ -44,7 +44,9 @@ public class AddButtonsDialog extends DialogFragment {
         editTextUsername = view.findViewById(R.id.button_name);
         editTextPassword = view.findViewById(R.id.button_command);
 
-        return builder.create();
+        AlertDialog mDialog = builder.create();
+        mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round);
+        return mDialog;
     }
 
     @Override
diff --git a/app/src/main/res/layout/doublebutton.xml b/app/src/main/res/layout/doublebutton.xml
new file mode 100644
index 0000000..010fecd
--- /dev/null
+++ b/app/src/main/res/layout/doublebutton.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:layout_weight="1"
+        android:background="@drawable/button_left"
+        android:insetLeft="25dp"
+        android:insetRight="25dp"
+        android:text="Button1"
+        app:backgroundTint="@null" />
+
+    <Button
+        android:id="@+id/TEXT"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_weight="1"
+        android:background="@drawable/button_middle"
+        android:insetLeft="25dp"
+        android:insetRight="25dp"
+        android:text="Button2"
+        app:backgroundTint="@null" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:layout_weight="1"
+        android:background="@drawable/button_right"
+        android:insetLeft="25dp"
+        android:insetRight="25dp"
+        android:text="Button2"
+        app:backgroundTint="@null" />
+
+    <ImageView
+        android:id="@+id/image_remove"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center"
+        android:layout_margin="5dp"
+        app:srcCompat="@drawable/clear_black_24dp"
+        app:tint="?attr/colorOnPrimary"
+        tools:ignore="VectorDrawableCompat">
+
+    </ImageView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml
index fd5320f..08b0336 100644
--- a/app/src/main/res/layout/fragment_credits.xml
+++ b/app/src/main/res/layout/fragment_credits.xml
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
                 android:gravity="center_horizontal"
-                android:text="LIZENZ"
+                android:text="@string/licence"
                 android:textAlignment="center"
                 android:textColor="@color/mtrl_btn_text_color_selector"
                 android:textSize="18sp"
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
                 android:gravity="center_horizontal"
-                android:text="PROGRAMMCODE"
+                android:text="@string/appcode"
                 android:textAlignment="center"
                 android:textColor="@color/mtrl_btn_text_color_selector"
                 android:textSize="18sp"
@@ -108,7 +108,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
                 android:gravity="center_horizontal"
-                android:text="TEAM"
+                android:text="@string/team"
                 android:textAlignment="center"
                 android:textColor="@color/mtrl_btn_text_color_selector"
                 android:textSize="18sp"
@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
                 android:gravity="center_horizontal"
-                android:text="KONTAKT"
+                android:text="@string/contact"
                 android:textAlignment="center"
                 android:textColor="@color/mtrl_btn_text_color_selector"
                 android:textSize="18sp"
@@ -162,7 +162,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="150dp"
                 android:gravity="center_horizontal"
-                android:text="TERAPLEX v1.1.1"
+                android:text="@string/version"
                 android:textAlignment="center"
                 android:textColor="@color/mtrl_btn_text_color_selector"
                 android:textSize="18sp"
@@ -177,7 +177,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
                 android:gravity="center_horizontal"
-                android:text="IN KOOPERATION WITH"
+                android:text="@string/cooperation"
                 android:textAlignment="center"
                 android:textColor="@color/mtrl_btn_text_color_selector"
                 android:textSize="18sp"
diff --git a/app/src/main/res/layout/fragment_einstellungen.xml b/app/src/main/res/layout/fragment_einstellungen.xml
index 820a8bf..b31154f 100644
--- a/app/src/main/res/layout/fragment_einstellungen.xml
+++ b/app/src/main/res/layout/fragment_einstellungen.xml
@@ -141,7 +141,7 @@
                 android:layout_marginEnd="50dp"
                 android:layout_marginRight="50dp"
                 android:background="@drawable/button_theme_red_blue"
-                android:text="RED\nBLUE"
+                android:text="@string/red_blue"
                 app:backgroundTint="@null"
                 app:layout_constraintBottom_toTopOf="@+id/button_theme_green_yellow"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -155,7 +155,7 @@
                 android:layout_marginEnd="50dp"
                 android:layout_marginRight="50dp"
                 android:background="@drawable/button_theme_orange_turquoise"
-                android:text="ORANGE\nTURQUOISE"
+                android:text="@string/orange_turquoise"
                 app:backgroundTint="@null"
                 app:layout_constraintBottom_toTopOf="@+id/button_theme_yellow_blue"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -169,7 +169,7 @@
                 android:layout_marginEnd="50dp"
                 android:layout_marginRight="50dp"
                 android:background="@drawable/button_theme_yellow_blue"
-                android:text="YELLOW\nBLUE"
+                android:text="@string/yellow_blue"
                 app:backgroundTint="@null"
                 app:layout_constraintBottom_toTopOf="@+id/button_theme_pink_green"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -183,7 +183,7 @@
                 android:layout_marginEnd="50dp"
                 android:layout_marginRight="50dp"
                 android:background="@drawable/button_theme_pink_green"
-                android:text="PINK\nGREEN"
+                android:text="@string/pink_green"
                 app:backgroundTint="@null"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/button_theme_yellow_blue" />
@@ -196,7 +196,7 @@
                 android:layout_marginEnd="50dp"
                 android:layout_marginRight="50dp"
                 android:background="@drawable/button_theme_green_yellow"
-                android:text="GREEN\nYELLOW"
+                android:text="@string/green_yellow"
                 app:backgroundTint="@null"
                 app:layout_constraintBottom_toTopOf="@+id/button_theme_orange_turquoise"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_kueche.xml b/app/src/main/res/layout/fragment_kueche.xml
index 0e1e458..e2f6f5d 100644
--- a/app/src/main/res/layout/fragment_kueche.xml
+++ b/app/src/main/res/layout/fragment_kueche.xml
@@ -35,4 +35,12 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <LinearLayout
+        android:layout_width="394dp"
+        android:layout_height="10dp"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/Background"></LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/singlebutton.xml b/app/src/main/res/layout/singlebutton.xml
index 4f46c13..29b9ea1 100644
--- a/app/src/main/res/layout/singlebutton.xml
+++ b/app/src/main/res/layout/singlebutton.xml
@@ -1,37 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+xmlns:app="http://schemas.android.com/apk/res-auto"
+xmlns:tools="http://schemas.android.com/tools"
+android:orientation="horizontal"
+android:layout_width="match_parent"
+android:layout_height="wrap_content">
 
 
     <Button
-        android:id="@+id/button2"
-        android:layout_width="299dp"
-        android:layout_height="wrap_content"
+        android:id="@+id/TEXT"
+        android:layout_width="200dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:layout_marginTop="5dp"
         android:layout_weight="1"
+        android:background="@drawable/button_left"
         android:insetLeft="25dp"
         android:insetRight="25dp"
-        android:text="Button1" />
+        android:text="TEXT"
+        app:backgroundTint="@null" />
 
     <Button
-        android:id="@+id/button3"
-        android:layout_width="299dp"
-        android:layout_height="wrap_content"
+        android:id="@+id/button"
+        android:layout_width="100dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
         android:layout_weight="1"
+        android:background="@drawable/button_right"
         android:insetLeft="25dp"
         android:insetRight="25dp"
-        android:text="Button2" />
+        android:text="Button2"
+        app:backgroundTint="@null" />
 
     <ImageView
         android:id="@+id/image_remove"
-        android:layout_width="46dp"
-        android:layout_height="48dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_gravity="center"
+        android:layout_margin="5dp"
         app:srcCompat="@drawable/clear_black_24dp"
-        app:tint="@color/black"
+        app:tint="?attr/colorOnPrimary"
         tools:ignore="VectorDrawableCompat">
 
     </ImageView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c29ae81..d87b525 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,13 +48,21 @@
     <string name="einstellungen_zurücksetzen">RESET SETTINGS</string>
     <string name="button_zurücksetzen">RESET</string>
     <string name="themes">COLORSCHEME</string>
-    <string name="blau">BLUE</string>
-    <string name="rot">RED</string>
-    <string name="grün">GREEN</string>
-    <string name="gelb">YELLOW</string>
-    <string name="reset_app">RESET APP</string>
+    <string name="red_blue">RED\nBLUE</string>
+    <string name="green_yellow">GREEN\nYELLOW</string>
+    <string name="orange_turquoise">ORANGE\nTURQUOISE</string>
+    <string name="yellow_blue">YELLOW\nBLUE</string>
+    <string name="pink_green">PINK\nGREEN</string>
+    <string name="reset_app">RESET\nAPP</string>
     <string name="are_you_sure_to_reset">ARE YOU SURE YOU WANT TO RESET THE APP AND DELETE ALL YOUR SETTINGS?</string>
 
+    //credits
+    <string name="version">TERAPLEX v1.1.1</string>
+    <string name="licence">LICENCE</string>
+    <string name="contact">CONTACT</string>
+    <string name="appcode">APPCODE</string>
+    <string name="team">TEAM</string>
+    <string name="cooperation">IN COOPERATION WITH</string>
 
     <string name="menu_home">HOME</string>
     <string name="menu_konsole">CONSOLE</string>