From efa7379c6e44ca65fc05748c6c9f9913f12daf0a Mon Sep 17 00:00:00 2001
From: Joel <joel@baldaufwd.de>
Date: Sat, 13 Mar 2021 19:31:37 +0100
Subject: [PATCH] layout with hints for keyboard

---
 .../java/de/joel/zoomhelper/MainActivity.java |   9 +-
 .../main/res/layout-land/activity_main.xml    |   1 -
 app/src/main/res/layout-v26/icons.xml         |   5 +
 app/src/main/res/layout/activity_main.xml     |   1 -
 app/src/main/res/layout/icons.xml             |   5 +
 app/src/main/res/layout/mainform.xml          | 162 ++++++++++--------
 app/src/main/res/values/strings.xml           |   3 +
 7 files changed, 108 insertions(+), 78 deletions(-)

diff --git a/app/src/main/java/de/joel/zoomhelper/MainActivity.java b/app/src/main/java/de/joel/zoomhelper/MainActivity.java
index e5596eb..64094cf 100644
--- a/app/src/main/java/de/joel/zoomhelper/MainActivity.java
+++ b/app/src/main/java/de/joel/zoomhelper/MainActivity.java
@@ -1,8 +1,6 @@
 package de.joel.zoomhelper;
 
 import android.annotation.SuppressLint;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -31,7 +29,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Objects;
 
-class InstantAutoComplete extends androidx.appcompat.widget.AppCompatAutoCompleteTextView {
+class InstantAutoComplete extends com.google.android.material.textfield.MaterialAutoCompleteTextView {
 
     public InstantAutoComplete(Context context) {
         super(context);
@@ -50,6 +48,7 @@ class InstantAutoComplete extends androidx.appcompat.widget.AppCompatAutoComplet
 
 }
 
+
 public class MainActivity extends AppCompatActivity {
 
     @Override
@@ -201,7 +200,7 @@ public class MainActivity extends AppCompatActivity {
         }
 
         AutoCompleteTextView textMeetingName = findViewById(R.id.TextMeetingName);
-        ImageView dropdown = findViewById(R.id.image);
+        ImageView dropdown = findViewById(R.id.iconDropdownMeetingName);
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, meetingNames);
         textMeetingName.setAdapter(adapter);
 
@@ -229,7 +228,7 @@ public class MainActivity extends AppCompatActivity {
         }
 
         AutoCompleteTextView textName = findViewById(R.id.textBoxName);
-        ImageView dropdown = findViewById(R.id.image2);
+        ImageView dropdown = findViewById(R.id.iconDropdownAttName);
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, attNames);
         textName.setAdapter(adapter);
 
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index c3f5173..f8ffcf1 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -1,7 +1,6 @@
 <?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"
diff --git a/app/src/main/res/layout-v26/icons.xml b/app/src/main/res/layout-v26/icons.xml
index 06673d5..debc38d 100644
--- a/app/src/main/res/layout-v26/icons.xml
+++ b/app/src/main/res/layout-v26/icons.xml
@@ -13,6 +13,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/addTooltip"
         android:focusable="true"
         android:tooltipText="@string/addTooltip"
         app:layout_constraintEnd_toStartOf="@+id/imageTrash"
@@ -26,6 +27,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/deleteTooltip"
         android:focusable="true"
         android:tooltipText="@string/deleteTooltip"
         app:layout_constraintEnd_toStartOf="@+id/imageSave"
@@ -39,6 +41,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/saveTooltip"
         android:focusable="true"
         android:tooltipText="@string/saveTooltip"
         app:layout_constraintEnd_toStartOf="@+id/imageShare"
@@ -52,6 +55,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/shareTooltip"
         android:focusable="true"
         android:tooltipText="@string/shareTooltip"
         app:layout_constraintEnd_toStartOf="@+id/imageAttend"
@@ -66,6 +70,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/joinTooltip"
         android:focusable="true"
         android:tooltipText="@string/joinTooltip"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b185818..54c0773 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,6 @@
 <?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"
diff --git a/app/src/main/res/layout/icons.xml b/app/src/main/res/layout/icons.xml
index 1167112..57a9340 100644
--- a/app/src/main/res/layout/icons.xml
+++ b/app/src/main/res/layout/icons.xml
@@ -13,6 +13,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/addTooltip"
         android:focusable="true"
         app:layout_constraintEnd_toStartOf="@+id/imageTrash"
         app:layout_constraintTop_toTopOf="parent"
@@ -25,6 +26,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/deleteTooltip"
         android:focusable="true"
         app:layout_constraintEnd_toStartOf="@+id/imageSave"
         app:layout_constraintTop_toTopOf="@+id/imageAdd"
@@ -37,6 +39,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/saveTooltip"
         android:focusable="true"
         app:layout_constraintEnd_toStartOf="@+id/imageShare"
         app:layout_constraintTop_toTopOf="@+id/imageAdd"
@@ -49,6 +52,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/shareTooltip"
         android:focusable="true"
         app:layout_constraintEnd_toStartOf="@+id/imageAttend"
         app:layout_constraintTop_toTopOf="@+id/imageAdd"
@@ -62,6 +66,7 @@
         android:layout_marginEnd="15dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/joinTooltip"
         android:focusable="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/imageAdd"
diff --git a/app/src/main/res/layout/mainform.xml b/app/src/main/res/layout/mainform.xml
index 435b3ae..058afe7 100644
--- a/app/src/main/res/layout/mainform.xml
+++ b/app/src/main/res/layout/mainform.xml
@@ -6,137 +6,157 @@
     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"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/layoutMeetingName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="22dp"
-        android:inputType="text"
-        app:layout_constraintBottom_toTopOf="@+id/textName"
+        android:background="@android:color/transparent"
+        android:hint="@string/MeetingName"
+        app:boxBackgroundColor="@android:color/transparent"
+        app:layout_constraintBottom_toTopOf="@+id/layoutName"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintWidth_percent="0.9" />
+        app:layout_constraintWidth_percent="0.9">
+
+        <de.joel.zoomhelper.InstantAutoComplete
+            android:id="@+id/TextMeetingName"
+            style="@style/Widget.MaterialComponents.AutoCompleteTextView.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:imeOptions="actionNext"
+            android:inputType="text"
+            android:nextFocusForward="@+id/textBoxName" />
+    </com.google.android.material.textfield.TextInputLayout>
 
     <ImageView
-        android:id="@+id/image"
+        android:id="@+id/iconDropdownMeetingName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/dropdownBtn"
         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" />
+        app:layout_constraintStart_toEndOf="@+id/layoutMeetingName"
+        app:layout_constraintTop_toTopOf="@+id/layoutMeetingName"
+        app:layout_constraintBottom_toBottomOf="@+id/layoutMeetingName"/>
 
 
-    <TextView
+    <com.google.android.material.textfield.TextInputLayout
         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"
+        android:background="@android:color/transparent"
+        android:hint="@string/MeetingID"
+        app:boxBackgroundColor="@android:color/transparent"
         app:layout_constraintBottom_toTopOf="@+id/textPW"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintWidth_percent="0.9" />
+        app:layout_constraintWidth_percent="0.9">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/textBoxID"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="@string/idHint"
+            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" />
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <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:id="@+id/textPW"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="50dp"
         android:background="@android:color/transparent"
+        android:hint="@string/Password"
         app:boxBackgroundColor="@android:color/transparent"
-        app:layout_constraintBottom_toTopOf="@+id/textMeetingName"
+        app:layout_constraintBottom_toTopOf="@+id/layoutMeetingName"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintWidth_percent="0.9"
         app:passwordToggleDrawable="@drawable/show_password_selector"
         app:passwordToggleEnabled="true">
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/editTextTextPassword2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:autofillHints="@string/pwdHint"
             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"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/layoutName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="22dp"
-        android:inputType="text"
-        app:layout_constraintBottom_toTopOf="@+id/textAtt"
+        android:background="@android:color/transparent"
+        android:hint="@string/DisplayName"
+        app:boxBackgroundColor="@android:color/transparent"
+        app:layout_constraintBottom_toTopOf="@+id/layoutAtt"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintWidth_percent="0.9" />
+        app:layout_constraintWidth_percent="0.9">
+
+        <de.joel.zoomhelper.InstantAutoComplete
+            android:id="@+id/textBoxName"
+            style="@style/Widget.MaterialComponents.AutoCompleteTextView.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:imeOptions="actionNext"
+            android:inputType="text"
+            android:nextFocusForward="@+id/editAtt"
+            app:layout_constraintBottom_toTopOf="@+id/editAtt"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.9" />
+    </com.google.android.material.textfield.TextInputLayout>
 
     <ImageView
-        android:id="@+id/image2"
+        android:id="@+id/iconDropdownAttName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/dropdownBtn"
         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" />
+        app:layout_constraintStart_toEndOf="@+id/layoutName"
+        app:layout_constraintTop_toTopOf="@+id/layoutName"
+        app:layout_constraintBottom_toBottomOf="@+id/layoutName"/>
 
-    <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"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/layoutAtt"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:inputType="number"
         android:layout_marginBottom="22dp"
+        android:background="@android:color/transparent"
+        android:hint="@string/AttendeesInput"
+        app:boxBackgroundColor="@android:color/transparent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintWidth_percent="0.9" />
+        app:layout_constraintWidth_percent="0.9">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/editAtt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:imeOptions="actionDone"
+            android:importantForAutofill="no"
+            android:inputType="number"/>
+    </com.google.android.material.textfield.TextInputLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ccbb687..3e9c3c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,5 +17,8 @@
     <string name="suretoremove">Willst du das Meeting %1$s löschen?</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
+    <string name="dropdownBtn">aufklappen</string>
+    <string name="pwdHint">Kenncode</string>
+    <string name="idHint">Meeting ID</string>
 
 </resources>
\ No newline at end of file