From 9fc5d337b8dfecb2821225f006b1bf616d678159 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Sun, 28 Jun 2020 01:45:39 +0530
Subject: UI fixups (#892)

---
 app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt | 5 ++++-
 app/src/main/res/layout/password_row_layout.xml          | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
index 8cf09b39..33a08fa4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
@@ -9,6 +9,7 @@ import android.app.Activity
 import android.content.Intent
 import android.view.LayoutInflater
 import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.google.android.material.checkbox.MaterialCheckBox
@@ -35,6 +36,7 @@ import org.eclipse.jgit.transport.URIish
 import java.io.File
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
+import com.google.android.material.R as materialR
 
 
 private class GitOperationCredentialFinder(val callingActivity: Activity, val connectionMode: ConnectionMode) : InteractivePasswordFinder() {
@@ -77,7 +79,8 @@ private class GitOperationCredentialFinder(val callingActivity: Activity, val co
             val rememberCredential = dialogView.findViewById<MaterialCheckBox>(R.id.git_auth_remember_credential)
             rememberCredential.setText(rememberRes)
             if (isRetry)
-                editCredential.error = callingActivity.resources.getString(errorRes)
+                editCredential.setError(callingActivity.resources.getString(errorRes),
+                    ContextCompat.getDrawable(callingActivity, materialR.drawable.mtrl_ic_error))
             MaterialAlertDialogBuilder(callingActivity).run {
                 setTitle(R.string.passphrase_dialog_title)
                 setMessage(messageRes)
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 30d9c40f..93da710e 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -26,12 +26,13 @@
 
     <TextView
         android:id="@+id/label"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/type_image"
+        app:layout_constraintEnd_toStartOf="@id/child_count"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="FILE_NAME" />
 
-- 
cgit v1.2.3