From 4404093c8391c7e6a839eec6a2da511afa8e3ad4 Mon Sep 17 00:00:00 2001
From: Joel <joel@baldaufwd.de>
Date: Sat, 13 Mar 2021 19:50:11 +0100
Subject: [PATCH] layout with better land support

---
 .../main/java/de/joel/zoomhelper/MainActivity.java    | 11 ++++++++---
 app/src/main/res/layout-land/activity_main.xml        |  4 ++--
 app/src/main/res/layout-v26/icons.xml                 |  1 +
 app/src/main/res/layout/activity_main.xml             |  1 +
 app/src/main/res/layout/mainform.xml                  |  1 -
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/de/joel/zoomhelper/MainActivity.java b/app/src/main/java/de/joel/zoomhelper/MainActivity.java
index 64094cf..02f047c 100644
--- a/app/src/main/java/de/joel/zoomhelper/MainActivity.java
+++ b/app/src/main/java/de/joel/zoomhelper/MainActivity.java
@@ -29,6 +29,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Objects;
 
+
 class InstantAutoComplete extends com.google.android.material.textfield.MaterialAutoCompleteTextView {
 
     public InstantAutoComplete(Context context) {
@@ -55,13 +56,13 @@ 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()));
+        final ScrollView scrollview = findViewById(R.id.scrollArea);
         watchMeetingNameBox();
         fillDropdownMeetingName();
         if (getLastMeeting() != -1) {
             try {
                 fillMeeting(getLastMeeting());
+                scrollview.post(() -> scrollview.scrollTo(0, scrollview.getChildAt(0).getHeight()));
             }
             catch (IndexOutOfBoundsException e) {
                AlertDialog.Builder dialog=new AlertDialog.Builder(this);
@@ -97,7 +98,11 @@ public class MainActivity extends AppCompatActivity {
 
     private void watchNewIcon() {
         ImageView AddIcon = findViewById(R.id.imageAdd);
-        AddIcon.setOnClickListener(v -> fillBlank());
+        EditText meetingID = findViewById(R.id.textBoxID);
+        AddIcon.setOnClickListener(v -> {
+            fillBlank();
+            meetingID.requestFocus();
+        });
     }
 
     private void watchAttIcon() {
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index f8ffcf1..f003a33 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -6,9 +6,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginStart="30dp"
-    android:layout_marginTop="30dp"
+    android:layout_marginTop="10dp"
     android:layout_marginEnd="30dp"
-    android:layout_marginBottom="30dp"
+    android:layout_marginBottom="10dp"
     android:orientation="vertical"
     tools:context=".MainActivity">
 
diff --git a/app/src/main/res/layout-v26/icons.xml b/app/src/main/res/layout-v26/icons.xml
index debc38d..3c2cdb0 100644
--- a/app/src/main/res/layout-v26/icons.xml
+++ b/app/src/main/res/layout-v26/icons.xml
@@ -10,6 +10,7 @@
         android:id="@+id/imageAdd"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 54c0773..a108a8f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -28,6 +28,7 @@
 
     <include
         layout="@layout/icons"
+        android:layout_marginTop="20dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/mainform.xml b/app/src/main/res/layout/mainform.xml
index 058afe7..9f456e4 100644
--- a/app/src/main/res/layout/mainform.xml
+++ b/app/src/main/res/layout/mainform.xml
@@ -140,7 +140,6 @@
         android:id="@+id/layoutAtt"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="22dp"
         android:background="@android:color/transparent"
         android:hint="@string/AttendeesInput"
         app:boxBackgroundColor="@android:color/transparent"