Add activity to edit user ids only

3 files changed, 116 insertions, 21 deletions

diff --git a/OpenKeychain/src/main/res/layout/edit_identities_activity.xml b/OpenKeychain/src/main/res/layout/edit_identities_activity.xml
new file mode 100644
index 000000000..c8b0e3afc
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/edit_identities_activity.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/edit_key_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_identities_fragment.xml b/OpenKeychain/src/main/res/layout/edit_identities_fragment.xml
new file mode 100644
index 000000000..7d8b9548f
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/edit_identities_fragment.xml
@@ -0,0 +1,77 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingBottom="16dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="16dp">
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/view_key_card_user_ids"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            card_view:cardBackgroundColor="?attr/colorCardViewBackground"
+            card_view:cardCornerRadius="4dp"
+            card_view:cardElevation="2dp"
+            card_view:cardUseCompatPadding="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/CardViewHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/section_linked_identities" />
+
+                <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                    android:id="@+id/edit_key_user_ids"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
+                <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                    android:id="@+id/edit_key_user_ids_added"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
+                <TextView
+                    android:id="@+id/edit_key_action_add_user_id"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clickable="true"
+                    android:drawablePadding="8dp"
+                    android:drawableRight="@drawable/ic_person_add_grey_24dp"
+                    android:gravity="center_vertical"
+                    android:minHeight="?android:attr/listPreferredItemHeight"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:text="@string/edit_key_action_add_identity"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index a3de4efed..cf519d117 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -3,49 +3,42 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/menu_key_view_edit"
-        android:icon="@drawable/ic_mode_edit_white_24dp"
-        android:visible="false"
-        app:showAsAction="always"
-        android:title="@string/key_view_action_edit_ids" />
-
-    <item
         android:id="@+id/menu_key_view_refresh"
         android:icon="@drawable/ic_refresh_white_24dp"
-        app:showAsAction="always"
-        android:title="@string/key_view_action_update" />
+        android:title="@string/key_view_action_update"
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/menu_key_view_backup"
-        app:showAsAction="never"
-        android:title="@string/menu_export_key" />
+        android:title="@string/menu_export_key"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_view_delete"
         android:icon="@drawable/ic_delete_grey_24dp"
-        app:showAsAction="never"
-        android:title="@string/menu_delete_key" />
+        android:title="@string/menu_delete_key"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_view_advanced"
-        app:showAsAction="never"
-        android:title="@string/menu_advanced" />
+        android:title="@string/menu_advanced"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_view_certify_fingerprint"
-        app:showAsAction="never"
+        android:title="@string/menu_certify_fingerprint"
         android:visible="false"
-        android:title="@string/menu_certify_fingerprint" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_view_certify_fingerprint_word"
-        app:showAsAction="never"
+        android:title="@string/menu_certify_fingerprint_phrases"
         android:visible="false"
-        android:title="@string/menu_certify_fingerprint_phrases" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_view_add_linked_identity"
-        app:showAsAction="never"
-        android:title="@string/menu_linked_add_identity" />
+        android:title="@string/menu_linked_add_identity"
+        app:showAsAction="never" />
 
 </menu>