diff options
| author | Diogenes Molinares <amolinares19@gmail.com> | 2020-06-18 14:07:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 14:07:26 +0200 |
| commit | 23b488a8eb69c99d5337538cc17690d2b637b9be (patch) | |
| tree | dea8de23cb6f9e4e9134e75a8ee917080b3d38aa /app/src/main/res | |
| parent | 33b3f54921bba7549933c6f889fbe7ab63b61b7c (diff) | |
Add support for category renaming (#854)
* rename category
* changed CHANGELOG
* IDE Refactor
* Address review comments
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* change Stack to List and fix bug when empty category name
* create intermediate folders
* little fixes and KDoc added
* Reuse existing move code
* change button Cancel => Skip
* use canonicalPath to confirm destination inside repository
* change error message
* update KDoc
* show different error to user
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
Co-authored-by: Harsh Shandilya <msfjarvis@gmail.com>
Co-authored-by: Fabian Henneke <fabian@henneke.me>
Co-authored-by: Fabian Henneke <FabianHenneke@users.noreply.github.com>
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/folder_dialog_fragment.xml (renamed from app/src/main/res/layout/folder_creation_dialog_fragment.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/menu/context_pass.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/app/src/main/res/layout/folder_creation_dialog_fragment.xml b/app/src/main/res/layout/folder_dialog_fragment.xml index bc078e64..bc078e64 100644 --- a/app/src/main/res/layout/folder_creation_dialog_fragment.xml +++ b/app/src/main/res/layout/folder_dialog_fragment.xml diff --git a/app/src/main/res/menu/context_pass.xml b/app/src/main/res/menu/context_pass.xml index 41a1f705..9c76fca8 100644 --- a/app/src/main/res/menu/context_pass.xml +++ b/app/src/main/res/menu/context_pass.xml @@ -20,4 +20,9 @@ android:title="@string/delete" app:showAsAction="ifRoom" /> + <item + android:id="@+id/menu_edit_password" + android:icon="@drawable/ic_edit_white_24dp" + android:title="@string/edit" + app:showAsAction="ifRoom" /> </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b65d84f2..58126392 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -222,6 +222,7 @@ <string name="dialog_positive">Go to Settings</string> <string name="dialog_negative">Go back</string> <string name="dialog_cancel">Cancel</string> + <string name="dialog_skip">Skip</string> <string name="git_sync">Synchronize repository</string> <string name="git_pull">Pull from remote</string> <string name="git_push">Push to remote</string> @@ -323,6 +324,11 @@ <string name="pref_show_hidden_title">Show hidden folders</string> <string name="pref_show_hidden_summary">Include hidden directories in the password list</string> <string name="title_create_folder">Create folder</string> + <string name="title_rename_folder">Rename folder</string> + <string name="message_category_error_empty_field">Category name can\'t be empty</string> + <string name="message_category_error_category_exists">Category name already exists</string> + <string name="message_category_error_destination_outside_repo">Destination must be within the repository</string> + <string name="message_rename_folder">Enter destination for %1$s</string> <string name="button_create">Create</string> <string name="pref_search_on_start">Open search on start</string> <string name="pref_search_on_start_hint">Open search bar when app is launched</string> |