aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt6
-rw-r--r--app/src/main/res/layout/activity_git_clone.xml5
-rw-r--r--app/src/main/res/layout/git_credential_layout.xml1
3 files changed, 7 insertions, 5 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
index 1f5494fd..7a3978ba 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
@@ -84,7 +84,11 @@ class GitServerConfigActivity : BaseGitActivity() {
}
binding.serverUser.apply {
- setText(serverUser)
+ if (serverUser.isEmpty()) {
+ requestFocus()
+ } else {
+ setText(serverUser)
+ }
doOnTextChanged { text, _, _, _ ->
serverUser = text.toString().trim()
}
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 6fe19f19..8026fa4a 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -79,10 +79,7 @@
android:layout_height="wrap_content"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
- android:nextFocusForward="@id/server_url">
-
- <requestFocus />
- </com.google.android.material.textfield.TextInputEditText>
+ android:nextFocusForward="@id/server_url" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/git_credential_layout.xml b/app/src/main/res/layout/git_credential_layout.xml
index 511a9f8f..757658e6 100644
--- a/app/src/main/res/layout/git_credential_layout.xml
+++ b/app/src/main/res/layout/git_credential_layout.xml
@@ -13,6 +13,7 @@
android:id="@+id/git_auth_passphrase_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ app:endIconMode="password_toggle"
app:hintEnabled="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"