From c47b0c3b54c4612f72adc316eb771b94612ff612 Mon Sep 17 00:00:00 2001
From: JG-Cody <julian.guerster@regensburg-mail.de>
Date: Mon, 28 Jun 2021 19:41:35 +0200
Subject: [PATCH] added doublebutton to dynamic content

---
 .../Teraplex/AddButtonsDialogDouble.java      | 19 ++++++++++++-------
 app/src/main/res/layout/doublebutton.xml      | 12 +++---------
 app/src/main/res/layout/headline.xml          | 17 +++++++++++++++--
 app/src/main/res/layout/singlebutton.xml      | 12 ++++--------
 app/src/main/res/layout/space.xml             | 17 +++++++++++++++--
 5 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java
index 8d29800..1cc112d 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonsDialogDouble.java
@@ -17,7 +17,7 @@ import de.jg_cody.Teraplex.ui.Flur.FlurFragment;
 public class AddButtonsDialogDouble extends DialogFragment {
     private AddButtonsDialogListenerDouble listener;
 
-    private EditText name, command1, button1, command2, button2;
+    private EditText editText_name, editText_command1, editText_button1, editText_command2, editText_button2;
     private FlurFragment frag;
 
     @Override
@@ -38,15 +38,20 @@ public class AddButtonsDialogDouble extends DialogFragment {
                 .setPositiveButton("ADD", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-
+                        String command1 = editText_command1.getText().toString();
+                        String command2 = editText_command2.getText().toString();
+                        String name = editText_name.getText().toString();
+                        String button1 = editText_button1.getText().toString();
+                        String button2 = editText_button2.getText().toString();
+                        listener.applyTextsDouble(name,command1,button1,command2,button2);
                     }
                 });
 
-        name = getActivity().findViewById(R.id.dialogDouble_editText_name);
-        command1 = getActivity().findViewById(R.id.dialogDouble_editText_command1);
-        command2 = getActivity().findViewById(R.id.dialogDouble_editText_command2);
-        button1 = getActivity().findViewById(R.id.dialogDouble_editText_button1);
-        button2 = getActivity().findViewById(R.id.dialogDouble_editText_button2);
+        editText_name = view.findViewById(R.id.dialogDouble_editText_name);
+        editText_command1 = view.findViewById(R.id.dialogDouble_editText_command1);
+        editText_command2 = view.findViewById(R.id.dialogDouble_editText_command2);
+        editText_button1 = view.findViewById(R.id.dialogDouble_editText_button1);
+        editText_button2 = view.findViewById(R.id.dialogDouble_editText_button2);
 
         AlertDialog mDialog = builder.create();
         mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round);
diff --git a/app/src/main/res/layout/doublebutton.xml b/app/src/main/res/layout/doublebutton.xml
index 7c317dc..e4e3448 100644
--- a/app/src/main/res/layout/doublebutton.xml
+++ b/app/src/main/res/layout/doublebutton.xml
@@ -10,37 +10,31 @@
 
     <Button
         android:id="@+id/doubleButton_bLeft"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
         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/doubleButton_text"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
         android:layout_height="40dp"
         android:layout_margin="5dp"
         android:layout_weight="1"
         android:background="@drawable/button_middle"
-        android:insetLeft="25dp"
-        android:insetRight="25dp"
         android:text="Button1"
         app:backgroundTint="@null" />
 
     <Button
         android:id="@+id/doubleButton_bRight"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
         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" />
 
diff --git a/app/src/main/res/layout/headline.xml b/app/src/main/res/layout/headline.xml
index fcf1d8e..0ec5bd1 100644
--- a/app/src/main/res/layout/headline.xml
+++ b/app/src/main/res/layout/headline.xml
@@ -8,14 +8,27 @@
 
     <Button
         android:id="@+id/headline_text"
-        android:layout_width="200dp"
+        android:layout_width="0dp"
         android:layout_height="40dp"
         android:layout_margin="5dp"
         android:layout_marginTop="5dp"
         android:layout_weight="1"
-        android:background="@drawable/button_round"
+        android:background="@drawable/backgroundoverlay"
         android:insetLeft="25dp"
         android:insetRight="25dp"
         android:text="TEXT"
         app:backgroundTint="@null" />
+
+    <ImageView
+        android:id="@+id/image_remove3"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center"
+        android:layout_margin="5dp"
+        android:visibility="visible"
+        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/singlebutton.xml b/app/src/main/res/layout/singlebutton.xml
index 9c62b85..2197082 100644
--- a/app/src/main/res/layout/singlebutton.xml
+++ b/app/src/main/res/layout/singlebutton.xml
@@ -9,26 +9,22 @@
 
     <Button
         android:id="@+id/singleButton_text"
-        android:layout_width="200dp"
+        android:layout_width="10dp"
         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:layout_weight="2"
+        android:background="@drawable/button_middle"
         android:text="TEXT"
         app:backgroundTint="@null" />
 
     <Button
         android:id="@+id/singleButton_button"
-        android:layout_width="100dp"
+        android:layout_width="0dp"
         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" />
 
diff --git a/app/src/main/res/layout/space.xml b/app/src/main/res/layout/space.xml
index bcdf557..44e5e96 100644
--- a/app/src/main/res/layout/space.xml
+++ b/app/src/main/res/layout/space.xml
@@ -7,7 +7,20 @@
     android:layout_height="wrap_content">
 
     <Space
-        android:layout_width="wrap_content"
-        android:layout_height="50dp"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
         android:layout_weight="1" />
+
+    <ImageView
+        android:id="@+id/image_remove2"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_gravity="center"
+        android:layout_margin="5dp"
+        android:visibility="visible"
+        app:srcCompat="@drawable/clear_black_24dp"
+        app:tint="?attr/colorOnPrimary"
+        tools:ignore="VectorDrawableCompat">
+
+    </ImageView>
 </LinearLayout>
\ No newline at end of file