Skip to content
This repository was archived by the owner on Jan 25, 2025. It is now read-only.

Username and email display behavior #46

Merged
rohan-chaturvedi merged 4 commits into from
Feb 1, 2023
Merged

Username and email display behavior #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8054450
defaulted to username on login item if available
Jan 12, 2023
720a373
added username clearing to AddLogin.kt
Jan 12, 2023
29f9503
added username clearing support logic to Dashboard
Jan 12, 2023
9bb915f
removed email/username switch
Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions app/src/main/kotlin/cloud/keyspace/android/AddLogin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()) {
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/kotlin/cloud/keyspace/android/Dashboard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,10 +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 if (!login.loginData?.username.isNullOrEmpty()) {
}

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

Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/layout/edit_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,6 @@
android:inputType="textFilter" />
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/emailAsUsername"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:checked="false"
android:text="Use email as username"
app:thumbTint="@color/cardBorderColor" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
Expand Down