From 18bacb8b324d69010bfa6020453a1a22869a940c Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 12 Feb 2020 08:44:17 -0600
Subject: [PATCH] Set single line limit in settings pages

---
 .../activity_caldav_account_settings.xml      | 20 ++++++-------------
 .../activity_caldav_calendar_settings.xml     |  4 +---
 .../activity_etesync_encryption_settings.xml  |  8 ++------
 .../activity_google_task_list_settings.xml    |  4 +---
 .../main/res/layout/activity_tag_settings.xml |  5 +----
 app/src/main/res/values/styles.xml            |  8 ++++++++
 6 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/activity_caldav_account_settings.xml b/app/src/main/res/layout/activity_caldav_account_settings.xml
index 3b4e11cf1..8e63cbe65 100644
--- a/app/src/main/res/layout/activity_caldav_account_settings.xml
+++ b/app/src/main/res/layout/activity_caldav_account_settings.xml
@@ -45,10 +45,8 @@
 
           <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TagSettingsEditText"
             android:hint="@string/display_name"
-            android:imeOptions="flagNoExtractUi"
             android:inputType="textCapSentences|textAutoCorrect" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -59,10 +57,8 @@
 
           <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/user"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/user"
-            android:imeOptions="flagNoExtractUi" />
+            style="@style/TagSettingsEditText"
+            android:hint="@string/user" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -73,10 +69,8 @@
 
           <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TagSettingsEditText"
             android:hint="@string/password"
-            android:imeOptions="flagNoExtractUi"
             android:inputType="textPassword" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -93,10 +87,8 @@
 
           <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/url"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/url"
-            android:imeOptions="flagNoExtractUi" />
+            style="@style/TagSettingsEditText"
+            android:hint="@string/url" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/activity_caldav_calendar_settings.xml b/app/src/main/res/layout/activity_caldav_calendar_settings.xml
index 0bc1236d5..51c3aa863 100644
--- a/app/src/main/res/layout/activity_caldav_calendar_settings.xml
+++ b/app/src/main/res/layout/activity_caldav_calendar_settings.xml
@@ -26,10 +26,8 @@
 
         <com.google.android.material.textfield.TextInputEditText
           android:id="@+id/name"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
+          style="@style/TagSettingsEditText"
           android:hint="@string/display_name"
-          android:imeOptions="flagNoExtractUi"
           android:inputType="textCapSentences|textAutoCorrect"/>
 
       </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/activity_etesync_encryption_settings.xml b/app/src/main/res/layout/activity_etesync_encryption_settings.xml
index 71eda04ea..33d7f35e4 100644
--- a/app/src/main/res/layout/activity_etesync_encryption_settings.xml
+++ b/app/src/main/res/layout/activity_etesync_encryption_settings.xml
@@ -46,10 +46,8 @@
 
           <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/encryption_password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TagSettingsEditText"
             android:hint="@string/encryption_password"
-            android:imeOptions="flagNoExtractUi"
             android:inputType="textPassword" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -62,10 +60,8 @@
 
           <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/repeat_encryption_password"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            style="@style/TagSettingsEditText"
             android:hint="@string/reenter_encryption_password"
-            android:imeOptions="flagNoExtractUi"
             android:inputType="textPassword" />
 
         </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/activity_google_task_list_settings.xml b/app/src/main/res/layout/activity_google_task_list_settings.xml
index 468b86650..9ace497e8 100644
--- a/app/src/main/res/layout/activity_google_task_list_settings.xml
+++ b/app/src/main/res/layout/activity_google_task_list_settings.xml
@@ -23,10 +23,8 @@
 
         <com.google.android.material.textfield.TextInputEditText
           android:id="@+id/name"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
+          style="@style/TagSettingsEditText"
           android:hint="@string/display_name"
-          android:imeOptions="flagNoExtractUi"
           android:inputType="textCapSentences|textFilter"
           android:maxLines="1"/>
       </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/activity_tag_settings.xml b/app/src/main/res/layout/activity_tag_settings.xml
index 8f5a93acd..3eb77383e 100644
--- a/app/src/main/res/layout/activity_tag_settings.xml
+++ b/app/src/main/res/layout/activity_tag_settings.xml
@@ -23,15 +23,12 @@
 
         <com.google.android.material.textfield.TextInputEditText
           android:id="@+id/name"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
+          style="@style/TagSettingsEditText"
           android:hint="@string/display_name"
-          android:imeOptions="flagNoExtractUi"
           android:inputType="textCapSentences|textFilter"
           android:maxLines="1"/>
       </com.google.android.material.textfield.TextInputLayout>
 
-
       <include layout="@layout/list_settings_color"/>
 
       <include layout="@layout/list_settings_icon"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d1a6ea29a..8e6faf96f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -67,6 +67,14 @@
     <item name="android:layout_height">wrap_content</item>
   </style>
 
+  <style name="TagSettingsEditText">
+    <item name="android:maxLines">1</item>
+    <item name="android:inputType">textNoSuggestions</item>
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:imeOptions">flagNoExtractUi</item>
+  </style>
+
   <!--================================================== General == -->
 
   <style name="TextAppearance" parent="android:TextAppearance">