From d825d8b5e602f0fe6df6d08ea487ee5ff52d39e6 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Tue, 17 Feb 2015 06:27:59 +0100
Subject: [PATCH] allow plugin action for notes field, fixes view problem after
 update

---
 src/keepass2android/EntryActivity.cs          |  4 ++
 .../Resources/layout/entry_view_contents.xml  | 37 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android/EntryActivity.cs
index e5c4c72e..0bb50fef 100644
--- a/src/keepass2android/EntryActivity.cs
+++ b/src/keepass2android/EntryActivity.cs
@@ -353,6 +353,7 @@ namespace keepass2android
 			_appTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);
 
 			Entry = db.Entries[uuid];
+			Android.Util.Log.Debug("KP2A", "Notes: " + Entry.Strings.ReadSafe(PwDefs.NotesField));
 
 			// Refresh Menu contents in case onCreateMenuOptions was called before Entry was set
 			ActivityCompat.InvalidateOptionsMenu(this);
@@ -734,6 +735,9 @@ namespace keepass2android
 				PopulateText(Resource.Id.entry_expires, Resource.Id.entryfield_container_expires, null);
 			}
 			PopulateStandardText(Resource.Id.entry_comment, Resource.Id.entryfield_container_comment, PwDefs.NotesField);
+			RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.comment_container),
+							  FindViewById(Resource.Id.username_vdots), PwDefs.NotesField);
+
 			PopulateText(Resource.Id.entry_tags, Resource.Id.entryfield_container_tags, concatTags(Entry.Tags));
 			PopulateText(Resource.Id.entry_override_url, Resource.Id.entryfield_container_overrideurl, Entry.OverrideUrl);
 
diff --git a/src/keepass2android/Resources/layout/entry_view_contents.xml b/src/keepass2android/Resources/layout/entry_view_contents.xml
index 67356869..427424aa 100644
--- a/src/keepass2android/Resources/layout/entry_view_contents.xml
+++ b/src/keepass2android/Resources/layout/entry_view_contents.xml
@@ -143,25 +143,42 @@
                 style="@style/EntryItem" />
         </RelativeLayout>
     </LinearLayout>
-    <LinearLayout
+
+	<LinearLayout
         android:id="@+id/entryfield_container_comment"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="vertical">
-    <!-- Comment -->
-        <TextView
+		<TextView
             android:id="@+id/entry_comment_label"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/entry_comment"
+            android:text="@string/entry_user_name"
             style="@style/EntryFieldHeader" />
-        <TextView
-            android:id="@+id/entry_comment"
-            android:layout_width="fill_parent"
+		<!-- Comment -->
+		<RelativeLayout
+            android:id="@+id/comment_container"
             android:layout_height="wrap_content"
-            android:textIsSelectable="true"
-            style="@style/EntryItem" />
-    </LinearLayout>
+            android:layout_width="fill_parent"
+            android:orientation="horizontal"
+            android:clickable="true"
+            android:background="?android:attr/selectableItemBackground">
+			<ImageView
+                android:id="@+id/comment_vdots"
+                android:layout_width="wrap_content"
+                android:layout_height="15dp"
+                android:src="@drawable/vdots"
+                android:gravity="right|bottom"
+                android:layout_alignParentRight="true" />
+			<TextView
+                android:id="@+id/entry_comment"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@id/username_vdots"
+                style="@style/EntryItem" />
+		</RelativeLayout>
+	</LinearLayout>
+    
     <LinearLayout
         android:id="@+id/extra_strings"
         android:layout_width="fill_parent"