From 8054450e20fefcb5612b51fe14ded1a73cb89ab0 Mon Sep 17 00:00:00 2001 From: 4f77616973 <0x4f@tuta.io> Date: Thu, 12 Jan 2023 19:46:41 +0530 Subject: [PATCH 1/4] defaulted to username on login item if available --- app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt b/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt index 942c084..122aa7f 100644 --- a/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt +++ b/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt @@ -1086,7 +1086,9 @@ class Dashboard : AppCompatActivity(), NavigationView.OnNavigationItemSelectedLi if (!login.loginData?.email.isNullOrEmpty()) { loginCard.usernameText.text = login.loginData!!.email loginCard.usernameText.setCompoundDrawablesRelativeWithIntrinsicBounds (emailIcon, null, null, null) - } else if (!login.loginData?.username.isNullOrEmpty()) { + } else loginCard.usernameText.visibility = View.GONE + + if (!login.loginData?.username.isNullOrEmpty()) { loginCard.usernameText.text = login.loginData!!.username loginCard.usernameText.setCompoundDrawablesRelativeWithIntrinsicBounds (loginIcon, null, null, null) } else loginCard.usernameText.visibility = View.GONE From 720a37366c4961ad946afc4171b2f1eaaabe940b Mon Sep 17 00:00:00 2001 From: 4f77616973 <0x4f@tuta.io> Date: Thu, 12 Jan 2023 19:51:04 +0530 Subject: [PATCH 2/4] added username clearing to AddLogin.kt --- app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt b/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt index 6e1dba2..6dd0303 100644 --- a/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt +++ b/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt @@ -984,7 +984,7 @@ class AddLogin : AppCompatActivity() { favorite = favorite, tagId = tagPicker.getSelectedTagId() ?: tagId, loginData = IOUtilities.LoginData( - username = userNameInput.text.toString(), + username = if (!emailAsUsername.isChecked) userNameInput.text.toString() else null, password = passwordInput.text.toString(), passwordHistory = if (passwordHistoryData.size > 0) passwordHistoryData else null, email = emailInput.text.toString(), From 29f950394c00f173941dc6d7c81f38bc1f9a9266 Mon Sep 17 00:00:00 2001 From: 4f77616973 <0x4f@tuta.io> Date: Thu, 12 Jan 2023 19:53:21 +0530 Subject: [PATCH 3/4] added username clearing support logic to Dashboard --- app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt b/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt index 122aa7f..7d3625b 100644 --- a/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt +++ b/app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt @@ -1086,12 +1086,14 @@ class Dashboard : AppCompatActivity(), NavigationView.OnNavigationItemSelectedLi if (!login.loginData?.email.isNullOrEmpty()) { loginCard.usernameText.text = login.loginData!!.email loginCard.usernameText.setCompoundDrawablesRelativeWithIntrinsicBounds (emailIcon, null, null, null) - } else loginCard.usernameText.visibility = View.GONE + } if (!login.loginData?.username.isNullOrEmpty()) { loginCard.usernameText.text = login.loginData!!.username loginCard.usernameText.setCompoundDrawablesRelativeWithIntrinsicBounds (loginIcon, null, null, null) - } else loginCard.usernameText.visibility = View.GONE + } + + if (login.loginData?.username.isNullOrEmpty() && login.loginData?.email.isNullOrEmpty()) loginCard.usernameText.visibility = View.GONE loginCard.miscText.visibility = View.GONE From 9bb915ff3293ef6d599adb5d8530affd8de4c31a Mon Sep 17 00:00:00 2001 From: 4f77616973 <0x4f@tuta.io> Date: Thu, 19 Jan 2023 22:30:17 +0530 Subject: [PATCH 4/4] removed email/username switch --- .../kotlin/cloud/keyspace/android/AddLogin.kt | 16 +--------------- app/src/main/res/layout/edit_login.xml | 9 --------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt b/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt index 6dd0303..0dc1929 100644 --- a/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt +++ b/app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt @@ -74,8 +74,6 @@ class AddLogin : AppCompatActivity() { lateinit var emailInputLayout: TextInputLayout lateinit var emailInput: TextInputEditText - lateinit var emailAsUsername: MaterialSwitch - lateinit var passwordInputLayout: TextInputLayout lateinit var passwordInput: TextInputEditText lateinit var clearButton: ImageView @@ -290,14 +288,6 @@ class AddLogin : AppCompatActivity() { userNameInput = findViewById (R.id.userNameInput) userNameInput.imeOptions = IME_FLAG_NO_PERSONALIZED_LEARNING userNameInputLayout = findViewById (R.id.userNameInputLayout) - userNameInputLayout.visibility = View.GONE - - emailAsUsername = findViewById (R.id.emailAsUsername) - emailAsUsername.isChecked = true - emailAsUsername.setOnCheckedChangeListener { _, isChecked -> - if (isChecked) userNameInputLayout.visibility = View.GONE - else userNameInputLayout.visibility = View.VISIBLE - } emailInput = findViewById (R.id.emailInput) emailInput.imeOptions = IME_FLAG_NO_PERSONALIZED_LEARNING @@ -784,10 +774,6 @@ class AddLogin : AppCompatActivity() { if (!login.loginData!!.username.isNullOrBlank()) { userNameInput.setText(login.loginData.username) - emailAsUsername.isChecked = false - } else { - userNameInputLayout.visibility = View.GONE - emailAsUsername.isChecked = true } if (!login.loginData.password.isNullOrEmpty()) { @@ -984,7 +970,7 @@ class AddLogin : AppCompatActivity() { favorite = favorite, tagId = tagPicker.getSelectedTagId() ?: tagId, loginData = IOUtilities.LoginData( - username = if (!emailAsUsername.isChecked) userNameInput.text.toString() else null, + username = userNameInput.text.toString(), password = passwordInput.text.toString(), passwordHistory = if (passwordHistoryData.size > 0) passwordHistoryData else null, email = emailInput.text.toString(), diff --git a/app/src/main/res/layout/edit_login.xml b/app/src/main/res/layout/edit_login.xml index a0f2ae8..5b0ee09 100644 --- a/app/src/main/res/layout/edit_login.xml +++ b/app/src/main/res/layout/edit_login.xml @@ -216,15 +216,6 @@ android:inputType="textFilter" /> - -