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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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" />
+
+
\ 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 @@
+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">
+ android:text="TEXT"
+ app:backgroundTint="@null" />
+ android:text="Button2"
+ app:backgroundTint="@null" />
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 @@
RESET SETTINGS
RESET
COLORSCHEME
- BLUE
- RED
- GREEN
- YELLOW
- RESET APP
+ RED\nBLUE
+ GREEN\nYELLOW
+ ORANGE\nTURQUOISE
+ YELLOW\nBLUE
+ PINK\nGREEN
+ RESET\nAPP
ARE YOU SURE YOU WANT TO RESET THE APP AND DELETE ALL YOUR SETTINGS?
+ //credits
+ TERAPLEX v1.1.1
+ LICENCE
+ CONTACT
+ APPCODE
+ TEAM
+ IN COOPERATION WITH
HOME
CONSOLE