From a6da17417eed1412dfbd9c06d03d85f100d35608 Mon Sep 17 00:00:00 2001
From: Daniël van den Berg <danielvandenberg95@gmail.com>
Date: Fri, 9 Sep 2016 11:47:49 +0200
Subject: Added the ability to move passwords around. (#210)

* Added the ability to move passwords around.
* Generified the PasswordRecyclerAdapter and the FolderRecyclerAdapter into EntryRecyclerAdapter
---
 app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png   | Bin 0 -> 135 bytes
 app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png   | Bin 0 -> 122 bytes
 app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png  | Bin 0 -> 181 bytes
 app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png | Bin 0 -> 245 bytes
 .../main/res/drawable-xxxhdpi/ic_folder_white_24dp.png    | Bin 0 -> 325 bytes
 app/src/main/res/layout/select_folder_layout.xml          |  11 +++++++++++
 app/src/main/res/menu/context_pass.xml                    |  11 ++++++++---
 app/src/main/res/menu/pgp_handler_select_folder.xml       |  11 +++++++++++
 8 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
 create mode 100644 app/src/main/res/layout/select_folder_layout.xml
 create mode 100644 app/src/main/res/menu/pgp_handler_select_folder.xml

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

diff --git a/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
new file mode 100644
index 00000000..02ea533a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
new file mode 100644
index 00000000..831d723b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
new file mode 100644
index 00000000..71a5a137
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
new file mode 100644
index 00000000..b93d5a1e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
new file mode 100644
index 00000000..a1afbe9d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png differ
diff --git a/app/src/main/res/layout/select_folder_layout.xml b/app/src/main/res/layout/select_folder_layout.xml
new file mode 100644
index 00000000..142093ec
--- /dev/null
+++ b/app/src/main/res/layout/select_folder_layout.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/pgp_handler_linearlayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/context_pass.xml b/app/src/main/res/menu/context_pass.xml
index ac0d88ab..bcdb383c 100644
--- a/app/src/main/res/menu/context_pass.xml
+++ b/app/src/main/res/menu/context_pass.xml
@@ -3,10 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".pwdstore">
 
+    <item android:id="@+id/menu_move_password"
+        android:icon="@drawable/ic_folder_white_24dp"
+        app:showAsAction="ifRoom"
+        android:title="Move"/>
+
     <item android:id="@+id/menu_edit_password"
-          android:icon="@drawable/ic_edit_white_24dp"
-          app:showAsAction="ifRoom"
-          android:title="Edit"/>
+        android:icon="@drawable/ic_edit_white_24dp"
+        app:showAsAction="ifRoom"
+        android:title="Edit"/>
 
     <item android:id="@+id/menu_delete_password"
         android:icon="@drawable/ic_delete_white_24dp"
diff --git a/app/src/main/res/menu/pgp_handler_select_folder.xml b/app/src/main/res/menu/pgp_handler_select_folder.xml
new file mode 100644
index 00000000..9bfba01b
--- /dev/null
+++ b/app/src/main/res/menu/pgp_handler_select_folder.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:pwstore="http://schemas.android.com/apk/res-auto"
+    tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
+    <item android:title="Select"
+        android:icon="@drawable/ic_done_white_24dp"
+        pwstore:showAsAction="ifRoom"
+        android:id="@+id/crypto_select"
+        />
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3