From ca05fb53e5e42323e59c947cc7d5e7d93f83a4bf Mon Sep 17 00:00:00 2001
From: Joel <joel@baldaufwd.de>
Date: Fri, 12 Mar 2021 22:22:49 +0100
Subject: [PATCH] Layout scrollbar (V0.4)

---
 app/build.gradle                              |   2 +-
 .../java/de/joel/zoomhelper/MainActivity.java |   3 +
 .../main/res/layout-land/activity_main.xml    |  50 ++++
 app/src/main/res/layout-v26/activity_main.xml | 260 ------------------
 app/src/main/res/layout-v26/icons.xml         |  74 +++++
 app/src/main/res/layout/activity_main.xml     | 255 ++---------------
 app/src/main/res/layout/buttons.xml           |  25 ++
 app/src/main/res/layout/icons.xml             |  69 +++++
 app/src/main/res/layout/mainform.xml          | 142 ++++++++++
 9 files changed, 387 insertions(+), 493 deletions(-)
 create mode 100644 app/src/main/res/layout-land/activity_main.xml
 delete mode 100644 app/src/main/res/layout-v26/activity_main.xml
 create mode 100644 app/src/main/res/layout-v26/icons.xml
 create mode 100644 app/src/main/res/layout/buttons.xml
 create mode 100644 app/src/main/res/layout/icons.xml
 create mode 100644 app/src/main/res/layout/mainform.xml

diff --git a/app/build.gradle b/app/build.gradle
index 43f24f2..7059dd4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName '0.3'
+        versionName '0.4'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/de/joel/zoomhelper/MainActivity.java b/app/src/main/java/de/joel/zoomhelper/MainActivity.java
index 991ae77..e5596eb 100644
--- a/app/src/main/java/de/joel/zoomhelper/MainActivity.java
+++ b/app/src/main/java/de/joel/zoomhelper/MainActivity.java
@@ -15,6 +15,7 @@ import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.ScrollView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
@@ -55,6 +56,8 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        final ScrollView scrollview = ((ScrollView) findViewById(R.id.scrollArea));
+        scrollview.post(() -> scrollview.scrollTo(0, scrollview.getChildAt(0).getHeight()));
         watchMeetingNameBox();
         fillDropdownMeetingName();
         if (getLastMeeting() != -1) {
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 0000000..c3f5173
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,50 @@
+<?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:id="@+id/layoutBegin"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginStart="30dp"
+    android:layout_marginTop="30dp"
+    android:layout_marginEnd="30dp"
+    android:layout_marginBottom="30dp"
+    android:orientation="vertical"
+    tools:context=".MainActivity">
+
+    <ScrollView
+        android:id="@+id/scrollArea"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <include layout="@layout/mainform" />
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:baselineAligned="false"
+        android:orientation="horizontal">
+
+        <include
+            layout="@layout/buttons"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <include
+            layout="@layout/icons"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v26/activity_main.xml b/app/src/main/res/layout-v26/activity_main.xml
deleted file mode 100644
index 0e9a8de..0000000
--- a/app/src/main/res/layout-v26/activity_main.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/layoutBegin"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.8"
-        app:layout_constraintWidth_percent="0.8">
-
-        <ScrollView
-            android:id="@+id/scrollArea"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="22dp"
-            android:fillViewport="true"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/imageAdd">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/textMeetingName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/MeetingName"
-                    app:layout_constraintBottom_toTopOf="@+id/TextMeetingName"
-                    app:layout_constraintHorizontal_weight="90"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-                <de.joel.zoomhelper.InstantAutoComplete
-                    android:id="@+id/TextMeetingName"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="22dp"
-                    android:inputType="text"
-                    app:layout_constraintBottom_toTopOf="@+id/textName"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintWidth_percent="0.9" />
-
-                <ImageView
-                    android:id="@+id/image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:padding="5dp"
-                    android:src="@mipmap/baseline_arrow_drop_down_black_24"
-                    app:layout_constraintStart_toEndOf="@+id/TextMeetingName"
-                    app:layout_constraintTop_toTopOf="@+id/TextMeetingName" />
-
-
-                <TextView
-                    android:id="@+id/textID"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/MeetingID"
-                    app:layout_constraintBottom_toTopOf="@+id/textBoxID"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-                <EditText
-                    android:id="@+id/textBoxID"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="22dp"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:inputType="text"
-                    app:layout_constraintBottom_toTopOf="@+id/textPW"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintWidth_percent="0.9" />
-
-                <TextView
-                    android:id="@+id/textPW"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="22dp"
-                    android:text="@string/Password"
-                    app:layout_constraintBottom_toTopOf="@+id/layoutPW"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/layoutPW"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="70dp"
-                    android:background="@android:color/transparent"
-                    app:boxBackgroundColor="@android:color/transparent"
-                    app:layout_constraintBottom_toTopOf="@+id/textMeetingName"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintWidth_percent="0.9"
-                    app:passwordToggleDrawable="@drawable/show_password_selector"
-                    app:passwordToggleEnabled="true">
-
-                    <EditText
-                        android:id="@+id/editTextTextPassword2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <TextView
-                    android:id="@+id/textName"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="22dp"
-                    android:text="@string/DisplayName"
-                    app:layout_constraintBottom_toTopOf="@+id/textBoxName"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-
-                <de.joel.zoomhelper.InstantAutoComplete
-                    android:id="@+id/textBoxName"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="22dp"
-                    android:inputType="text"
-                    app:layout_constraintBottom_toTopOf="@+id/textAtt"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintWidth_percent="0.9" />
-
-                <ImageView
-                    android:id="@+id/image2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:padding="5dp"
-                    android:src="@mipmap/baseline_arrow_drop_down_black_24"
-                    app:layout_constraintStart_toEndOf="@+id/textBoxName"
-                    app:layout_constraintTop_toTopOf="@+id/textBoxName" />
-
-                <TextView
-                    android:id="@+id/textAtt"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="22dp"
-                    android:text="@string/AttendeesInput"
-                    app:layout_constraintBottom_toTopOf="@+id/editAtt"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-                <EditText
-                    android:id="@+id/editAtt"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:inputType="number"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintWidth_percent="0.9" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </ScrollView>
-
-        <ImageView
-            android:id="@+id/imageAdd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="22dp"
-            android:layout_marginEnd="15dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:focusable="true"
-            android:tooltipText="@string/addTooltip"
-            app:layout_constraintEnd_toStartOf="@+id/imageTrash"
-            app:layout_constraintTop_toBottomOf="@+id/scrollArea"
-            app:srcCompat="@drawable/iconfinder_pluscircle_7124019_32" />
-
-        <ImageView
-            android:id="@+id/imageTrash"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:focusable="true"
-            android:tooltipText="@string/deleteTooltip"
-            app:layout_constraintEnd_toStartOf="@+id/imageSave"
-            app:layout_constraintTop_toTopOf="@+id/imageAdd"
-            app:srcCompat="@drawable/iconfinder_trash_7124159_32" />
-
-        <ImageView
-            android:id="@+id/imageSave"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:focusable="true"
-            android:tooltipText="@string/saveTooltip"
-            app:layout_constraintEnd_toStartOf="@+id/imageShare"
-            app:layout_constraintTop_toTopOf="@+id/imageAdd"
-            app:srcCompat="@drawable/iconfinder_save_7124134_32" />
-
-        <ImageView
-            android:id="@+id/imageShare"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="15dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:focusable="true"
-            android:tooltipText="@string/shareTooltip"
-            app:layout_constraintEnd_toStartOf="@+id/imageAttend"
-            app:layout_constraintTop_toTopOf="@+id/imageAdd"
-            app:srcCompat="@drawable/iconfinder_share_7124186_32" />
-
-        <ImageView
-            android:id="@+id/imageAttend"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:clickable="true"
-            android:focusable="true"
-            android:tooltipText="@string/joinTooltip"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/imageAdd"
-            app:srcCompat="@drawable/iconfinder_phone_7124181_32" />
-
-        <Button
-            android:id="@+id/btnSave"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="22dp"
-            android:onClick="btnSave_onClick"
-            android:text="@string/Save"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageTrash" />
-
-        <Button
-            android:id="@+id/btnJoin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:onClick="btnJoin_onClick"
-            android:text="@string/Join"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/btnSave" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v26/icons.xml b/app/src/main/res/layout-v26/icons.xml
new file mode 100644
index 0000000..06673d5
--- /dev/null
+++ b/app/src/main/res/layout-v26/icons.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/icons"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/imageAdd"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:tooltipText="@string/addTooltip"
+        app:layout_constraintEnd_toStartOf="@+id/imageTrash"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/iconfinder_pluscircle_7124019_32" />
+
+    <ImageView
+        android:id="@+id/imageTrash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:tooltipText="@string/deleteTooltip"
+        app:layout_constraintEnd_toStartOf="@+id/imageSave"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_trash_7124159_32" />
+
+    <ImageView
+        android:id="@+id/imageSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:tooltipText="@string/saveTooltip"
+        app:layout_constraintEnd_toStartOf="@+id/imageShare"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_save_7124134_32" />
+
+    <ImageView
+        android:id="@+id/imageShare"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:tooltipText="@string/shareTooltip"
+        app:layout_constraintEnd_toStartOf="@+id/imageAttend"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_share_7124186_32" />
+
+    <ImageView
+        android:id="@+id/imageAttend"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:tooltipText="@string/joinTooltip"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_phone_7124181_32" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 42e0659..b185818 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,248 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/layoutBegin"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginStart="30dp"
+    android:layout_marginTop="30dp"
+    android:layout_marginEnd="30dp"
+    android:layout_marginBottom="30dp"
+    android:orientation="vertical"
     tools:context=".MainActivity">
 
     <ScrollView
         android:id="@+id/scrollArea"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="22dp"
-        android:fillViewport="true"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="0dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/textMeetingName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/MeetingName"
-                app:layout_constraintBottom_toTopOf="@+id/TextMeetingName"
-                app:layout_constraintHorizontal_weight="90"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <de.joel.zoomhelper.InstantAutoComplete
-                android:id="@+id/TextMeetingName"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="22dp"
-                android:inputType="text"
-                app:layout_constraintBottom_toTopOf="@+id/textName"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_percent="0.9" />
-
-            <ImageView
-                android:id="@+id/image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="5dp"
-                android:src="@mipmap/baseline_arrow_drop_down_black_24"
-                app:layout_constraintStart_toEndOf="@+id/TextMeetingName"
-                app:layout_constraintTop_toTopOf="@+id/TextMeetingName" />
-
-
-            <TextView
-                android:id="@+id/textID"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/MeetingID"
-                app:layout_constraintBottom_toTopOf="@+id/textBoxID"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <EditText
-                android:id="@+id/textBoxID"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="22dp"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:inputType="text"
-                app:layout_constraintBottom_toTopOf="@+id/textPW"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_percent="0.9" />
-
-            <TextView
-                android:id="@+id/textPW"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="22dp"
-                android:text="@string/Password"
-                app:layout_constraintBottom_toTopOf="@+id/layoutPW"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/layoutPW"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="70dp"
-                android:background="@android:color/transparent"
-                app:boxBackgroundColor="@android:color/transparent"
-                app:layout_constraintBottom_toTopOf="@+id/textMeetingName"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_percent="0.9"
-                app:passwordToggleDrawable="@drawable/show_password_selector"
-                app:passwordToggleEnabled="true">
-
-                <EditText
-                    android:id="@+id/editTextTextPassword2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textPassword" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:id="@+id/textName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="22dp"
-                android:text="@string/DisplayName"
-                app:layout_constraintBottom_toTopOf="@+id/textBoxName"
-                app:layout_constraintStart_toStartOf="parent" />
-
-
-            <de.joel.zoomhelper.InstantAutoComplete
-                android:id="@+id/textBoxName"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="22dp"
-                android:inputType="text"
-                app:layout_constraintBottom_toTopOf="@+id/textAtt"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_percent="0.9" />
-
-            <ImageView
-                android:id="@+id/image2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="5dp"
-                android:src="@mipmap/baseline_arrow_drop_down_black_24"
-                app:layout_constraintStart_toEndOf="@+id/textBoxName"
-                app:layout_constraintTop_toTopOf="@+id/textBoxName" />
-
-            <TextView
-                android:id="@+id/textAtt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="22dp"
-                android:text="@string/AttendeesInput"
-                app:layout_constraintBottom_toTopOf="@+id/editAtt"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <EditText
-                android:id="@+id/editAtt"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-
-                android:layout_marginBottom="80dp"
-                android:inputType="number"
-                app:layout_constraintBottom_toTopOf="@+id/btnSave"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_percent="0.9" />
-
-
-            <Button
-                android:id="@+id/btnSave"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="80dp"
-                android:onClick="btnSave_onClick"
-                android:text="@string/Save"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <Button
-                android:id="@+id/btnJoin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:onClick="btnJoin_onClick"
-                android:text="@string/Join"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/btnSave" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <include layout="@layout/mainform" />
     </ScrollView>
-    <ImageView
-        android:id="@+id/imageAdd"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="22dp"
-        android:layout_marginEnd="15dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:focusable="true"
-        android:tooltipText="@string/addTooltip"
-        app:layout_constraintEnd_toStartOf="@+id/imageTrash"
-        app:layout_constraintTop_toBottomOf="@+id/scrollArea"
-        app:srcCompat="@drawable/iconfinder_pluscircle_7124019_32" />
 
-    <ImageView
-        android:id="@+id/imageTrash"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:focusable="true"
-        android:tooltipText="@string/deleteTooltip"
-        app:layout_constraintEnd_toStartOf="@+id/imageSave"
-        app:layout_constraintTop_toTopOf="@+id/imageAdd"
-        app:srcCompat="@drawable/iconfinder_trash_7124159_32" />
+    <include
+        layout="@layout/icons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
-    <ImageView
-        android:id="@+id/imageSave"
-        android:layout_width="wrap_content"
+    <include layout="@layout/buttons"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:focusable="true"
-        android:tooltipText="@string/saveTooltip"
-        app:layout_constraintEnd_toStartOf="@+id/imageShare"
-        app:layout_constraintTop_toTopOf="@+id/imageAdd"
-        app:srcCompat="@drawable/iconfinder_save_7124134_32" />
-
-    <ImageView
-        android:id="@+id/imageShare"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="15dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:focusable="true"
-        android:tooltipText="@string/shareTooltip"
-        app:layout_constraintEnd_toStartOf="@+id/imageAttend"
-        app:layout_constraintTop_toTopOf="@+id/imageAdd"
-        app:srcCompat="@drawable/iconfinder_share_7124186_32" />
-
-    <ImageView
-        android:id="@+id/imageAttend"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginEnd="15dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:focusable="true"
-        android:tooltipText="@string/joinTooltip"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/imageAdd"
-        app:srcCompat="@drawable/iconfinder_phone_7124181_32" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:layout_marginTop="22dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/buttons.xml b/app/src/main/res/layout/buttons.xml
new file mode 100644
index 0000000..c34617f
--- /dev/null
+++ b/app/src/main/res/layout/buttons.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <Button
+        android:id="@+id/btnSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:onClick="btnSave_onClick"
+        android:text="@string/Save"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageTrash" />
+
+    <Button
+        android:id="@+id/btnJoin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:onClick="btnJoin_onClick"
+        android:text="@string/Join"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/btnSave" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/icons.xml b/app/src/main/res/layout/icons.xml
new file mode 100644
index 0000000..1167112
--- /dev/null
+++ b/app/src/main/res/layout/icons.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/icons"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/imageAdd"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintEnd_toStartOf="@+id/imageTrash"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/iconfinder_pluscircle_7124019_32" />
+
+    <ImageView
+        android:id="@+id/imageTrash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintEnd_toStartOf="@+id/imageSave"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_trash_7124159_32" />
+
+    <ImageView
+        android:id="@+id/imageSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintEnd_toStartOf="@+id/imageShare"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_save_7124134_32" />
+
+    <ImageView
+        android:id="@+id/imageShare"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintEnd_toStartOf="@+id/imageAttend"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_share_7124186_32" />
+
+    <ImageView
+        android:id="@+id/imageAttend"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/imageAdd"
+        app:srcCompat="@drawable/iconfinder_phone_7124181_32" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mainform.xml b/app/src/main/res/layout/mainform.xml
new file mode 100644
index 0000000..435b3ae
--- /dev/null
+++ b/app/src/main/res/layout/mainform.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/mainForm"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/textMeetingName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/MeetingName"
+        app:layout_constraintBottom_toTopOf="@+id/TextMeetingName"
+        app:layout_constraintHorizontal_weight="90"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <de.joel.zoomhelper.InstantAutoComplete
+        android:id="@+id/TextMeetingName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="22dp"
+        android:inputType="text"
+        app:layout_constraintBottom_toTopOf="@+id/textName"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:padding="5dp"
+        android:src="@mipmap/baseline_arrow_drop_down_black_24"
+        app:layout_constraintStart_toEndOf="@+id/TextMeetingName"
+        app:layout_constraintTop_toTopOf="@+id/TextMeetingName" />
+
+
+    <TextView
+        android:id="@+id/textID"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/MeetingID"
+        app:layout_constraintBottom_toTopOf="@+id/textBoxID"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <EditText
+        android:id="@+id/textBoxID"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="22dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:inputType="text"
+        app:layout_constraintBottom_toTopOf="@+id/textPW"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
+    <TextView
+        android:id="@+id/textPW"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:text="@string/Password"
+        app:layout_constraintBottom_toTopOf="@+id/layoutPW"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/layoutPW"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="50dp"
+        android:background="@android:color/transparent"
+        app:boxBackgroundColor="@android:color/transparent"
+        app:layout_constraintBottom_toTopOf="@+id/textMeetingName"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.9"
+        app:passwordToggleDrawable="@drawable/show_password_selector"
+        app:passwordToggleEnabled="true">
+
+        <EditText
+            android:id="@+id/editTextTextPassword2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:id="@+id/textName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:text="@string/DisplayName"
+        app:layout_constraintBottom_toTopOf="@+id/textBoxName"
+        app:layout_constraintStart_toStartOf="parent" />
+
+
+    <de.joel.zoomhelper.InstantAutoComplete
+        android:id="@+id/textBoxName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="22dp"
+        android:inputType="text"
+        app:layout_constraintBottom_toTopOf="@+id/textAtt"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
+    <ImageView
+        android:id="@+id/image2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:padding="5dp"
+        android:src="@mipmap/baseline_arrow_drop_down_black_24"
+        app:layout_constraintStart_toEndOf="@+id/textBoxName"
+        app:layout_constraintTop_toTopOf="@+id/textBoxName" />
+
+    <TextView
+        android:id="@+id/textAtt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="22dp"
+        android:text="@string/AttendeesInput"
+        app:layout_constraintBottom_toTopOf="@+id/editAtt"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <EditText
+        android:id="@+id/editAtt"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:inputType="number"
+        android:layout_marginBottom="22dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.9" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file