aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_action_remove.pngbin0 -> 448 bytes
-rw-r--r--res/drawable-mdpi/ic_action_remove.pngbin0 -> 282 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_remove.pngbin0 -> 513 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_remove.pngbin0 -> 681 bytes
-rw-r--r--res/layout/contact_key.xml46
-rw-r--r--res/values/strings.xml2
6 files changed, 34 insertions, 14 deletions
diff --git a/res/drawable-hdpi/ic_action_remove.png b/res/drawable-hdpi/ic_action_remove.png
new file mode 100644
index 00000000..58a56e45
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_remove.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_remove.png b/res/drawable-mdpi/ic_action_remove.png
new file mode 100644
index 00000000..342a79de
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_remove.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_remove.png b/res/drawable-xhdpi/ic_action_remove.png
new file mode 100644
index 00000000..58e2e3b4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_remove.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_remove.png b/res/drawable-xxhdpi/ic_action_remove.png
new file mode 100644
index 00000000..331c545b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_remove.png
Binary files differ
diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml
index 0c457c25..fdd1ddba 100644
--- a/res/layout/contact_key.xml
+++ b/res/layout/contact_key.xml
@@ -1,22 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@+id/button_remove"
android:orientation="vertical"
android:padding="8dp" >
- <TextView
- android:id="@+id/key"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="18sp"
- android:textColor="@color/primarytext"
- android:typeface="monospace"
- />
- <TextView
- android:id="@+id/key_type"
+ <TextView
+ android:id="@+id/key"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/primarytext"
+ android:textSize="18sp"
+ android:typeface="monospace" />
+
+ <TextView
+ android:id="@+id/key_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/secondarytext" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/button_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/secondarytext"
- />
- </LinearLayout> \ No newline at end of file
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:padding="8dp"
+ android:background="?android:selectableItemBackground"
+ android:src="@drawable/ic_action_remove"
+ android:visibility="invisible"/>
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b14e74b..1486b9bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -241,5 +241,7 @@
<string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string>
<string name="request_now">Request now</string>
<string name="unable_to_decrypt_otr_message">Unable to decrypt OTR message</string>
+ <string name="delete_fingerprint">Delete Fingerprint</string>
+ <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string>
</resources> \ No newline at end of file