Rename text selection method. Clean up padding on item detail card view.

mozilla-lockwise · Nov 21, 2019 · 88297cf · 88297cf
1 parent 24c4a24
commit 88297cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/app/src/main/java/mozilla/lockbox/presenter/EditItemPresenter.kt b/app/src/main/java/mozilla/lockbox/presenter/EditItemPresenter.kt
@@ -44,7 +44,7 @@ interface EditItemDetailView {
     fun displayUsernameError(@StringRes errorMessage: Int? = null)
     fun displayPasswordError(@StringRes errorMessage: Int? = null)
     fun setSaveEnabled(enabled: Boolean)
-    fun setTextSelectionOnPasswordToggle()
+    fun setTextSelectionToEndOfLine()
 }
 
 @ExperimentalCoroutinesApi
@@ -133,13 +133,13 @@ class EditItemPresenter(
                 dispatcher.dispatch(
                     ItemDetailAction.SetPasswordVisibility(view.isPasswordVisible.not())
                 )
-                view.setTextSelectionOnPasswordToggle()
+                view.setTextSelectionToEndOfLine()
             }
             .addTo(compositeDisposable)
 
         view.usernameFieldClicks
             .subscribe {
-                view.setTextSelectionOnPasswordToggle()
+                view.setTextSelectionToEndOfLine()
             }
             .addTo(compositeDisposable)
 

diff --git a/app/src/main/java/mozilla/lockbox/view/EditItemFragment.kt b/app/src/main/java/mozilla/lockbox/view/EditItemFragment.kt
@@ -176,7 +176,10 @@ class EditItemFragment : BackableFragment(), EditItemDetailView {
         }
     }
 
-    override fun setTextSelectionOnPasswordToggle() {
+    /**
+     *  Ensure that the text selector is at the end of the line when password visibility is toggled.
+     */
+    override fun setTextSelectionToEndOfLine() {
         view?.inputPassword?.setSelection(view?.inputPassword?.length() ?: 0)
     }
 

diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml
@@ -88,7 +88,7 @@
                 android:layout_height="wrap_content"
                 android:paddingTop="26dp"
                 android:paddingEnd="14dp"
-                android:paddingBottom="26dp"
+                android:paddingBottom="36dp"
                 tools:ignore="RtlSymmetry">
 
             <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/test/java/mozilla/lockbox/presenter/EditItemPresenterTest.kt b/app/src/test/java/mozilla/lockbox/presenter/EditItemPresenterTest.kt
@@ -103,8 +103,9 @@ class EditItemPresenterTest {
             _saveEnabled = enabled
         }
 
-        override fun setTextSelectionOnPasswordToggle() {
+        override fun setTextSelectionToEndOfLine() {
             // make sure the text selector is at the end of the line when password is toggled
+            // or a field is selected
             // NOOP
         }
     }