offer verification directly from the trust keys screen

14 files changed, 18 insertions, 0 deletions

diff --git a/src/main/res/drawable-hdpi/ic_action_camera.png b/src/main/res/drawable-hdpi/ic_action_camera.png
new file mode 100644
index 00000000..60f9f100
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_camera.png
diff --git a/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png
new file mode 100644
index 00000000..497c88ca
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_camera_alt_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_action_camera.png b/src/main/res/drawable-mdpi/ic_action_camera.png
new file mode 100644
index 00000000..75d6b8c2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_camera.png
diff --git a/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png
new file mode 100644
index 00000000..e8305220
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_camera_alt_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_camera.png b/src/main/res/drawable-xhdpi/ic_action_camera.png
new file mode 100644
index 00000000..31b4b221
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_camera.png
diff --git a/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png
new file mode 100644
index 00000000..be9fb226
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_camera_alt_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_camera.png b/src/main/res/drawable-xxhdpi/ic_action_camera.png
new file mode 100644
index 00000000..e7b99102
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_camera.png
diff --git a/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
new file mode 100644
index 00000000..c8e69dce
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_camera_alt_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
new file mode 100644
index 00000000..777658e9
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_camera_alt_white_24dp.png
diff --git a/src/main/res/menu/trust_keys.xml b/src/main/res/menu/trust_keys.xml
new file mode 100644
index 00000000..90304767
--- /dev/null
+++ b/src/main/res/menu/trust_keys.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/action_scan_qr_code"
+		android:title="@string/scan_qr_code"
+		android:showAsAction="always"
+		android:icon="?attr/icon_scan_qr_code"/>
+</menu>
\ No newline at end of file
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index d6612552..aa5e825b 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -60,6 +60,7 @@
         <item name="attr/icon_settings">@drawable/ic_settings_black_24dp</item>
         <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
         <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
+        <item name="attr/icon_scan_qr_code">@drawable/ic_camera_alt_white_24dp</item>
 
         <item name="attr/icon_notifications">@drawable/ic_notifications_black54_24dp</item>
         <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
@@ -126,6 +127,7 @@
         <item name="attr/icon_settings">@drawable/ic_settings_white_24dp</item>
         <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
         <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
+        <item name="attr/icon_scan_qr_code">@drawable/ic_camera_alt_white_24dp</item>
 
         <item name="attr/icon_notifications">@drawable/ic_notifications_white_24dp</item>
         <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_white_24dp</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 82f9db89..7b7d2c5a 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -47,6 +47,7 @@
     <attr name="icon_settings" format="reference"/>
     <attr name="icon_share" format="reference"/>
     <attr name="icon_import_export" format="reference"/>
+    <attr name="icon_scan_qr_code" format="reference"/>
 
     <attr name="icon_notifications" format="reference"/>
     <attr name="icon_notifications_off" format="reference"/>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 416ee252..591d3dbc 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -703,4 +703,8 @@
 	<string name="this_device_has_been_verified">This device has been verified</string>
 	<string name="copy_fingerprint">Copy fingerprint</string>
 	<string name="all_omemo_keys_have_been_verified">All OMEMO keys have been verified</string>
+	<string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barcode does not contain fingerprints for this conversation.</string>
+	<string name="verified_fingerprints">Verified fingerprints</string>
+	<string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts barcode</string>
+	<string name="please_wait_for_keys_to_be_fetched">Please wait for keys to be fetched</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index f15822c9..69d4d39f 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -57,6 +57,7 @@
         <item name="attr/icon_settings">@drawable/ic_action_settings</item>
         <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
         <item name="attr/icon_share">@drawable/ic_action_share</item>
+        <item name="attr/icon_scan_qr_code">@drawable/ic_action_camera</item>
 
         <item name="attr/icon_notifications">@drawable/ic_notifications_black54_24dp</item>
         <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
@@ -120,6 +121,7 @@
         <item name="attr/icon_settings">@drawable/ic_action_settings_white</item>
         <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
         <item name="attr/icon_share">@drawable/ic_action_share</item>
+        <item name="attr/icon_scan_qr_code">@drawable/ic_action_camera</item>
 
         <item name="attr/icon_notifications">@drawable/ic_notifications_white80</item>
         <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_white80</item>