diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-08-10 19:19:01 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 19:19:01 +0530 |
| commit | 5715b59ed424a8aee963aa7f4857bba118d20ede (patch) | |
| tree | 3b13ef20651c4f2b5989a516950786c0bc298c23 /app/src/main/res | |
| parent | e0350043d0cb95999335ac746154c2c3f3129616 (diff) | |
Replicate key selection flow for directory creation (#999)
* Replicate key selection flow
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Review fixes
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Set --user 0 in adb options to prevent automatically installing to work profile
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Fix committing regression
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Update changelog
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/folder_dialog_fragment.xml | 18 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 5 |
2 files changed, 20 insertions, 3 deletions
diff --git a/app/src/main/res/layout/folder_dialog_fragment.xml b/app/src/main/res/layout/folder_dialog_fragment.xml index 338d62fb..e426af53 100644 --- a/app/src/main/res/layout/folder_dialog_fragment.xml +++ b/app/src/main/res/layout/folder_dialog_fragment.xml @@ -3,17 +3,21 @@ ~ SPDX-License-Identifier: GPL-3.0-only --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" android:padding="16dp"> <com.google.android.material.textfield.TextInputLayout + android:id="@+id/folder_name_container" style="@style/AppTheme.TextInputLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/crypto_name_hint"> + android:hint="@string/crypto_name_hint" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/folder_name_text" @@ -22,4 +26,12 @@ android:inputType="textNoSuggestions|textVisiblePassword" /> </com.google.android.material.textfield.TextInputLayout> -</LinearLayout> + + <com.google.android.material.checkbox.MaterialCheckBox + android:id="@+id/set_gpg_key" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + android:text="@string/new_folder_set_gpg_key" + app:layout_constraintTop_toBottomOf="@id/folder_name_container" /> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8303e18d..9251d91e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -367,6 +367,7 @@ <string name="short_key_ids_unsupported">A key ID in .gpg-id is too short, please use either long key IDs (16 characters) or fingerprints (40 characters)</string> <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string> <string name="directory_hint">Directory</string> + <string name="new_folder_set_gpg_key">Set GPG key for directory</string> <!-- GitException messages --> <string name="git_unknown_error">Unknown error</string> @@ -383,4 +384,8 @@ <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> <string name="openkeychain_not_installed_fdroid">F-Droid</string> <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string> + + <!-- GPG key selection in folder creation --> + <string name="folder_creation_err_file_exists">A file by that name already exists</string> + <string name="folder_creation_err_folder_exists">A folder by that name already exists</string> </resources> |