From 23b488a8eb69c99d5337538cc17690d2b637b9be Mon Sep 17 00:00:00 2001
From: Diogenes Molinares <amolinares19@gmail.com>
Date: Thu, 18 Jun 2020 14:07:26 +0200
Subject: 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>
---
 .../res/layout/folder_creation_dialog_fragment.xml | 25 ----------------------
 app/src/main/res/layout/folder_dialog_fragment.xml | 25 ++++++++++++++++++++++
 app/src/main/res/menu/context_pass.xml             |  5 +++++
 app/src/main/res/values/strings.xml                |  6 ++++++
 4 files changed, 36 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/layout/folder_creation_dialog_fragment.xml
 create mode 100644 app/src/main/res/layout/folder_dialog_fragment.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/folder_creation_dialog_fragment.xml b/app/src/main/res/layout/folder_creation_dialog_fragment.xml
deleted file mode 100644
index bc078e64..00000000
--- a/app/src/main/res/layout/folder_creation_dialog_fragment.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <com.google.android.material.textfield.TextInputLayout
-        style="@style/TextInputLayoutBase"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/crypto_name_hint">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/folder_name_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textNoSuggestions|textVisiblePassword" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout/folder_dialog_fragment.xml b/app/src/main/res/layout/folder_dialog_fragment.xml
new file mode 100644
index 00000000..bc078e64
--- /dev/null
+++ b/app/src/main/res/layout/folder_dialog_fragment.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/TextInputLayoutBase"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/crypto_name_hint">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/folder_name_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textNoSuggestions|textVisiblePassword" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>
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>
-- 
cgit v1.2.3