aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael <betheg@bitcloner.org>2014-10-03 15:55:06 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-03 16:20:39 +0200
commit9a4b48d1ec964bdce2a3c5f8242a01c0fa4a70e0 (patch)
treea04a7f0ba2b3d0aa6f590eef73d4fd1b69482489 /res
parentd51b41590c6d6871632a9cf88de532c4038b8bcd (diff)
let's own otr-fingerprint copy to clipboard.
Diffstat (limited to '')
-rw-r--r--res/drawable-hdpi/ic_action_copy.pngbin0 -> 717 bytes
-rw-r--r--res/drawable-mdpi/ic_action_copy.pngbin0 -> 585 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_copy.pngbin0 -> 763 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_copy.pngbin0 -> 1040 bytes
-rw-r--r--res/layout/activity_edit_account.xml36
-rw-r--r--res/values-de/strings.xml1
-rw-r--r--res/values/strings.xml3
7 files changed, 32 insertions, 8 deletions
diff --git a/res/drawable-hdpi/ic_action_copy.png b/res/drawable-hdpi/ic_action_copy.png
new file mode 100644
index 00000000..b47bb69c
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_copy.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_copy.png b/res/drawable-mdpi/ic_action_copy.png
new file mode 100644
index 00000000..75788f1f
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_copy.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_copy.png b/res/drawable-xhdpi/ic_action_copy.png
new file mode 100644
index 00000000..a45423f6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_copy.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/res/drawable-xxhdpi/ic_action_copy.png
new file mode 100644
index 00000000..3a0e8449
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_copy.png
Binary files differ
diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml
index 04f63795..0f4bae97 100644
--- a/res/layout/activity_edit_account.xml
+++ b/res/layout/activity_edit_account.xml
@@ -180,13 +180,35 @@
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold" />
- <TextView
- android:id="@+id/otr_fingerprint"
+ <RelativeLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace" />
+ android:layout_height="match_parent"
+ android:layout_marginTop="8dp">
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@+id/action_copy_to_clipboard"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/otr_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/action_copy_to_clipboard"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="?android:selectableItemBackground"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:src="@drawable/ic_action_copy"
+ android:visibility="invisible" />
+ </RelativeLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
@@ -226,4 +248,4 @@
android:textColor="@color/secondarytext" />
</LinearLayout>
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0c230ec6..6f21a71f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -261,5 +261,6 @@
<string name="pref_expert_options_other">Sonstiges</string>
<string name="pref_conference_name">Konferenz-Name</string>
<string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Name verwenden</string>
+ <string name="toast_message_otr_fingerprint">OTR Fingerabdruck in die Zwischenablage kopiert!</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d976dce..b6e5e15c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,5 +261,6 @@
<string name="pref_expert_options_other">Other</string>
<string name="pref_conference_name">Conference name</string>
<string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
+ <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
-</resources> \ No newline at end of file
+</resources>