From ecfce99be16fa66b3ec1149ee1a90facfabadc2a Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <wismna@protonmail.com>
Date: Fri, 22 Dec 2023 23:12:19 +0100
Subject: [PATCH] Fix some layout issues

---
 .../main/res/layout-v21/content_task_form.xml |  7 +++-
 .../main/res/layout-w600dp/fragment_main.xml  | 38 +++++++++++--------
 app/src/main/res/layout/activity_history.xml  |  2 +-
 app/src/main/res/layout/activity_main.xml     |  5 ++-
 app/src/main/res/layout/activity_today.xml    |  5 ++-
 app/src/main/res/layout/content_task_form.xml |  7 +++-
 app/src/main/res/layout/content_tasklists.xml |  8 ++--
 .../main/res/layout/content_today_form.xml    |  3 +-
 app/src/main/res/layout/fragment_tasklist.xml |  3 +-
 app/src/main/res/layout/fragment_tasks.xml    | 11 +++---
 10 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/app/src/main/res/layout-v21/content_task_form.xml b/app/src/main/res/layout-v21/content_task_form.xml
index c793aa9..4acf2e0 100644
--- a/app/src/main/res/layout-v21/content_task_form.xml
+++ b/app/src/main/res/layout-v21/content_task_form.xml
@@ -22,7 +22,8 @@
             android:textSize="30sp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:imeOptions="flagNoFullscreen"/>
+            android:imeOptions="flagNoFullscreen"
+            android:autofillHints="@string/new_task_name_hint" />
         <EditText
             android:id="@+id/new_task_description"
             android:hint="@string/new_task_description_hint"
@@ -32,7 +33,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/new_task_name"
-            android:imeOptions="flagNoFullscreen" />
+            android:imeOptions="flagNoFullscreen"
+            android:autofillHints="@string/new_task_description_hint"
+            android:inputType="textMultiLine" />
         <TextView
             android:id="@+id/new_task_priority_label"
             android:text="@string/new_task_priority"
diff --git a/app/src/main/res/layout-w600dp/fragment_main.xml b/app/src/main/res/layout-w600dp/fragment_main.xml
index 0e771b6..cd05c51 100644
--- a/app/src/main/res/layout-w600dp/fragment_main.xml
+++ b/app/src/main/res/layout-w600dp/fragment_main.xml
@@ -15,46 +15,52 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="?attr/actionBarSize">
+
         <androidx.constraintlayout.widget.Guideline
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/left_guideline"
-            app:layout_constraintGuide_percent="0"
-            android:orientation="vertical"/>
-        <androidx.constraintlayout.widget.Guideline
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0" />
+
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/center_guideline"
-            app:layout_constraintGuide_percent=".20"
-            android:orientation="vertical"/>
-        <androidx.constraintlayout.widget.Guideline
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent=".20" />
+
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/right_guideline"
-            app:layout_constraintGuide_percent="1"
-            android:orientation="vertical"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="1" />
+
         <android.widget.ListView
             android:id="@+id/list"
-            android:layout_height="wrap_content"
             android:layout_width="0dp"
+            android:layout_height="wrap_content"
             android:choiceMode="singleChoice"
             android:listSelector="@drawable/tasklist_select"
             app:layout_constraintLeft_toRightOf="@+id/left_guideline"
-            app:layout_constraintRight_toLeftOf="@+id/center_guideline" />
+            app:layout_constraintRight_toLeftOf="@+id/center_guideline"
+            app:layout_constraintTop_toTopOf="@+id/container" />
+
         <com.wismna.geoffroy.donext.widgets.NonSwipeableViewPager
             android:id="@+id/container"
-            android:layout_height="match_parent"
             android:layout_width="0dp"
+            android:layout_height="0dp"
             android:layout_toEndOf="@id/list"
             android:background="@android:color/background_light"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@+id/center_guideline"
-            app:layout_constraintRight_toLeftOf="@+id/right_guideline" />
+            app:layout_constraintRight_toLeftOf="@+id/right_guideline"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index 52f2630..484ce52 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:id="@+id/main_content"
     tools:context="com.wismna.geoffroy.donext.activities.HistoryActivity">
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 61309b7..0d642d4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:fitsSystemWindows="true"
     tools:context=".activities.MainActivity">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -21,6 +21,7 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="16dp"
         android:onClick="onNewTaskClick"
-        android:src="@drawable/ic_add" />
+        android:src="@drawable/ic_add"
+        android:contentDescription="@string/action_new_task" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_today.xml b/app/src/main/res/layout/activity_today.xml
index cb78dc8..31e3498 100644
--- a/app/src/main/res/layout/activity_today.xml
+++ b/app/src/main/res/layout/activity_today.xml
@@ -22,7 +22,7 @@
             android:textSize="24sp"/>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:name="com.wismna.geoffroy.donext.fragments.TasksFragment"
         android:id="@+id/fragment_task_list"
         android:layout_width="match_parent"
@@ -37,6 +37,7 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_margin"
         android:onClick="onNewTaskClick"
-        android:src="@drawable/ic_add" />
+        android:src="@drawable/ic_add"
+        android:contentDescription="@string/action_new_task" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_task_form.xml b/app/src/main/res/layout/content_task_form.xml
index 9931369..c5c8bb6 100644
--- a/app/src/main/res/layout/content_task_form.xml
+++ b/app/src/main/res/layout/content_task_form.xml
@@ -22,7 +22,8 @@
             android:textSize="30sp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:imeOptions="flagNoFullscreen"/>
+            android:imeOptions="flagNoFullscreen"
+            android:autofillHints="@string/new_task_name_hint" />
         <EditText
             android:id="@+id/new_task_description"
             android:hint="@string/new_task_description_hint"
@@ -32,7 +33,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/new_task_name"
-            android:imeOptions="flagNoFullscreen" />
+            android:imeOptions="flagNoFullscreen"
+            android:autofillHints="@string/new_task_description_hint"
+            android:inputType="textMultiLine" />
         <TextView
             android:id="@+id/new_task_priority_label"
             android:text="@string/new_task_priority"
diff --git a/app/src/main/res/layout/content_tasklists.xml b/app/src/main/res/layout/content_tasklists.xml
index ca3293f..b5d3fb1 100644
--- a/app/src/main/res/layout/content_tasklists.xml
+++ b/app/src/main/res/layout/content_tasklists.xml
@@ -24,7 +24,8 @@
             android:layout_weight="2"
             android:hint="@string/task_list_new_list_hint"
             android:maxLines="1"
-            android:inputType="text" />
+            android:inputType="text"
+            android:autofillHints="@string/task_list_new_list_hint" />
         <Button
             android:id="@+id/new_task_list_button"
             android:layout_width="80dp"
@@ -32,10 +33,7 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:text="@string/task_list_new_list_create"/>
     </LinearLayout>
-    <androidx.recyclerview.widget.RecyclerView
-        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"
+    <androidx.recyclerview.widget.RecyclerView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/task_lists_view"
         android:name="com.wismna.geoffroy.donext.fragments.TaskListFragment"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_today_form.xml b/app/src/main/res/layout/content_today_form.xml
index 20a581b..5b2e321 100644
--- a/app/src/main/res/layout/content_today_form.xml
+++ b/app/src/main/res/layout/content_today_form.xml
@@ -14,7 +14,8 @@
         android:textSize="30sp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:imeOptions="flagNoFullscreen" />
+        android:imeOptions="flagNoFullscreen"
+        android:autofillHints="@string/today_search_hint" />
     <ListView
         android:id="@+id/today_tasks"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_tasklist.xml b/app/src/main/res/layout/fragment_tasklist.xml
index 1b27656..8c9372a 100644
--- a/app/src/main/res/layout/fragment_tasklist.xml
+++ b/app/src/main/res/layout/fragment_tasklist.xml
@@ -24,7 +24,8 @@
         android:layout_weight="2"
         android:inputType="text"
         android:hint="@string/task_list_edit_list_hint"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:autofillHints="@string/task_list_edit_list_hint" />
     <Button
         android:id="@+id/task_list_delete"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tasks.xml b/app/src/main/res/layout/fragment_tasks.xml
index a023f80..f84abba 100644
--- a/app/src/main/res/layout/fragment_tasks.xml
+++ b/app/src/main/res/layout/fragment_tasks.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/task_select" >
+    android:background="@drawable/task_select">
     <TextView
         android:id="@+id/no_more_tasks"
         android:text="@string/task_no_tasks"
@@ -25,10 +24,10 @@
         android:layout_height="wrap_content"
         android:layout_gravity="start|bottom"
         android:layout_marginBottom="40dp"
-        android:drawableEnd="@drawable/ic_arrow_right_light"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        app:drawableEndCompat="@drawable/ic_arrow_right_light" />
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/task_list_view"
         android:layout_width="match_parent"
@@ -75,7 +74,7 @@
         android:layout_marginBottom="40dp"
         android:layout_gravity="bottom"
         android:background="@color/colorPrimaryLight"/>
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_gravity="bottom"