From a8df724d27d6b0040fe5ec000b2c21c547044f5d Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 7 Mar 2018 18:25:26 +0100
Subject: [PATCH] Properly show password visibility toggle
---
.../ui/setup/accounts/AccountEditActivity.kt | 12 ++++++------
.../setup/accounts/AccountSetupConnectionSlide.kt | 6 +++---
.../ui/setup/accounts/AccountSetupNameSlide.kt | 4 ++--
.../ui/setup/accounts/AccountSetupUserSlide.kt | 6 +++---
.../main/res/layout/setup_account_connection.xml | 4 ++--
app/src/main/res/layout/setup_account_edit.xml | 13 +++++++------
app/src/main/res/layout/setup_account_name.xml | 2 +-
app/src/main/res/layout/setup_account_user.xml | 7 ++++---
8 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
index 43880debd..e564e80a5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
@@ -3,13 +3,13 @@ package de.kuschku.quasseldroid_ng.ui.setup.accounts
import android.app.Activity
import android.content.Context
import android.os.Bundle
-import android.support.design.widget.TextInputEditText
import android.support.design.widget.TextInputLayout
import android.support.v7.app.AlertDialog
import android.support.v7.app.AppCompatActivity
import android.text.Editable
import android.view.Menu
import android.view.MenuItem
+import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.quasseldroid_ng.Keys
@@ -24,27 +24,27 @@ class AccountEditActivity : AppCompatActivity() {
@BindView(R.id.nameWrapper)
lateinit var nameWrapper: TextInputLayout
@BindView(R.id.name)
- lateinit var name: TextInputEditText
+ lateinit var name: EditText
@BindView(R.id.hostWrapper)
lateinit var hostWrapper: TextInputLayout
@BindView(R.id.host)
- lateinit var host: TextInputEditText
+ lateinit var host: EditText
@BindView(R.id.portWrapper)
lateinit var portWrapper: TextInputLayout
@BindView(R.id.port)
- lateinit var port: TextInputEditText
+ lateinit var port: EditText
@BindView(R.id.userWrapper)
lateinit var userWrapper: TextInputLayout
@BindView(R.id.user)
- lateinit var user: TextInputEditText
+ lateinit var user: EditText
@BindView(R.id.passWrapper)
lateinit var passWrapper: TextInputLayout
@BindView(R.id.pass)
- lateinit var pass: TextInputEditText
+ lateinit var pass: EditText
private var accountId: Long = -1
private var account: AccountDatabase.Account? = null
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
index 28d100c6b..e9fdc5a9b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
@@ -1,12 +1,12 @@
package de.kuschku.quasseldroid_ng.ui.setup.accounts
import android.os.Bundle
-import android.support.design.widget.TextInputEditText
import android.support.design.widget.TextInputLayout
import android.text.Editable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.quasseldroid_ng.R
@@ -18,13 +18,13 @@ class AccountSetupConnectionSlide : SlideFragment() {
@BindView(R.id.hostWrapper)
lateinit var hostWrapper: TextInputLayout
@BindView(R.id.host)
- lateinit var hostField: TextInputEditText
+ lateinit var hostField: EditText
@BindView(R.id.portWrapper)
lateinit var portWrapper: TextInputLayout
@BindView(R.id.port)
- lateinit var portField: TextInputEditText
+ lateinit var portField: EditText
override fun isValid(): Boolean {
return hostValidator.isValid && portValidator.isValid
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
index 33d68251b..2e0f8c429 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
@@ -1,12 +1,12 @@
package de.kuschku.quasseldroid_ng.ui.setup.accounts
import android.os.Bundle
-import android.support.design.widget.TextInputEditText
import android.support.design.widget.TextInputLayout
import android.text.Editable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.quasseldroid_ng.R
@@ -17,7 +17,7 @@ class AccountSetupNameSlide : SlideFragment() {
@BindView(R.id.nameWrapper)
lateinit var nameWrapper: TextInputLayout
@BindView(R.id.name)
- lateinit var nameField: TextInputEditText
+ lateinit var nameField: EditText
override fun isValid(): Boolean {
return nameValidator.isValid
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
index 8e10124b9..f995d230f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
@@ -1,12 +1,12 @@
package de.kuschku.quasseldroid_ng.ui.setup.accounts
import android.os.Bundle
-import android.support.design.widget.TextInputEditText
import android.support.design.widget.TextInputLayout
import android.text.Editable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.quasseldroid_ng.R
@@ -17,12 +17,12 @@ class AccountSetupUserSlide : SlideFragment() {
@BindView(R.id.userWrapper)
lateinit var userWrapper: TextInputLayout
@BindView(R.id.user)
- lateinit var userField: TextInputEditText
+ lateinit var userField: EditText
@BindView(R.id.passWrapper)
lateinit var passWrapper: TextInputLayout
@BindView(R.id.pass)
- lateinit var passField: TextInputEditText
+ lateinit var passField: EditText
override fun isValid(): Boolean {
return true
diff --git a/app/src/main/res/layout/setup_account_connection.xml b/app/src/main/res/layout/setup_account_connection.xml
index 499b64e16..f217339ab 100644
--- a/app/src/main/res/layout/setup_account_connection.xml
+++ b/app/src/main/res/layout/setup_account_connection.xml
@@ -14,7 +14,7 @@
android:hint="@string/labelConnectionHost"
app:errorEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
android:hint="@string/labelConnectionPort"
app:errorEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_account_edit.xml b/app/src/main/res/layout/setup_account_edit.xml
index 715e30623..439799416 100644
--- a/app/src/main/res/layout/setup_account_edit.xml
+++ b/app/src/main/res/layout/setup_account_edit.xml
@@ -39,7 +39,7 @@
android:hint="@string/labelAccountName"
app:errorEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
android:hint="@string/labelConnectionHost"
app:errorEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
android:hint="@string/labelConnectionPort"
app:errorEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -145,7 +145,7 @@
android:layout_height="wrap_content"
android:hint="@string/labelAccountUser">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -157,9 +157,10 @@
android:id="@+id/passWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/labelAccountPass">
+ android:hint="@string/labelAccountPass"
+ app:passwordToggleEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/pass"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_account_name.xml b/app/src/main/res/layout/setup_account_name.xml
index 591099361..4de486fd0 100644
--- a/app/src/main/res/layout/setup_account_name.xml
+++ b/app/src/main/res/layout/setup_account_name.xml
@@ -12,7 +12,7 @@
android:hint="@string/labelAccountName"
app:errorEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_account_user.xml b/app/src/main/res/layout/setup_account_user.xml
index 4468f2c97..2dda6f384 100644
--- a/app/src/main/res/layout/setup_account_user.xml
+++ b/app/src/main/res/layout/setup_account_user.xml
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:hint="@string/labelAccountUser">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -23,9 +23,10 @@
android:id="@+id/passWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/labelAccountPass">
+ android:hint="@string/labelAccountPass"
+ app:passwordToggleEnabled="true">
- <android.support.design.widget.TextInputEditText
+ <EditText
android:id="@+id/pass"
android:layout_width="match_parent"
android:layout_height="wrap_content"
--
GitLab