diff options
author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-07-14 11:56:47 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-14 11:56:47 +0530 |
commit | 4250cd499cb20b314e8abea2c16b6c4419557d58 (patch) | |
tree | bfe996d4f478474717837a98fbbd17a346a3343a /app/src/main/res | |
parent | 7f3aceaf11ce69a121ea0d9bd62e38953184e40c (diff) |
Properly guard against invalid renaming (#929)
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/password_creation_activity.xml | 27 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 20 insertions, 9 deletions
diff --git a/app/src/main/res/layout/password_creation_activity.xml b/app/src/main/res/layout/password_creation_activity.xml index 80e79604..9440d128 100644 --- a/app/src/main/res/layout/password_creation_activity.xml +++ b/app/src/main/res/layout/password_creation_activity.xml @@ -12,17 +12,26 @@ android:padding="@dimen/activity_horizontal_margin" tools:context="com.zeapo.pwdstore.crypto.PasswordCreationActivity"> - <androidx.appcompat.widget.AppCompatEditText - android:id="@+id/category" - android:layout_width="wrap_content" + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/directory_input_layout" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_gravity="center_vertical" + android:layout_margin="8dp" android:enabled="false" - android:textColor="?android:attr/textColor" - android:textSize="18sp" + android:hint="@string/directory_hint" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="CATEGORY HERE" /> + app:layout_constraintTop_toTopOf="parent"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/directory" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:inputType="textNoSuggestions" + android:nextFocusForward="@id/password" + tools:text="CATEGORY HERE" /> + </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputLayout android:id="@+id/name_input_layout" @@ -32,7 +41,7 @@ android:layout_margin="8dp" android:hint="@string/crypto_name_hint" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/category"> + app:layout_constraintTop_toBottomOf="@id/directory_input_layout"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/filename" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 625cf440..0834b96e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -401,4 +401,6 @@ <string name="oreo_autofill_chrome_compat_fix_preference_title">Improve reliability in Chrome</string> <string name="oreo_autofill_chrome_compat_fix_preference_summary">Requires activating an accessibility service and may affect overall Chrome performance</string> <string name="exporting_passwords">Exporting passwords…</string> + <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string> + <string name="directory_hint">Directory</string> </resources> |