make copy omemo fp button a show qr code button

Daniel Gultsch created

Change summary

src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java |  4 
src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png        |  0 
src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png        |  0 
src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png       |  0 
src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png      |  0 
src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png     |  0 
src/main/res/drawable/ic_qr_code_black_24dp.xml                  | 40 ++
src/main/res/drawable/ic_qr_code_white_24dp.xml                  | 40 ++
src/main/res/layout/activity_edit_account.xml                    |  4 
src/main/res/values/attrs.xml                                    |  2 
src/main/res/values/themes.xml                                   |  4 
11 files changed, 87 insertions(+), 7 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java 🔗 

@@ -1162,8 +1162,8 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
                     this.binding.ownFingerprintDesc.setText(R.string.omemo_fingerprint);
                 }
                 this.binding.axolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2)));
-                this.binding.actionCopyAxolotlToClipboard.setVisibility(View.VISIBLE);
-                this.binding.actionCopyAxolotlToClipboard.setOnClickListener(v -> copyOmemoFingerprint(ownAxolotlFingerprint));
+                this.binding.showQrCodeButton.setVisibility(View.VISIBLE);
+                this.binding.showQrCodeButton.setOnClickListener(v -> showQrCode());
             } else {
                 this.binding.axolotlFingerprintBox.setVisibility(View.GONE);
             }

src/main/res/drawable/ic_qr_code_black_24dp.xml 🔗 

@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/black"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,19h2v2h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13,13h2v2h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,15h2v2h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13,17h2v2h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,19h2v2h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,17h2v2h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,13h2v2h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,15h2v2h-2z" />
+</vector>

src/main/res/drawable/ic_qr_code_white_24dp.xml 🔗 

@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,19h2v2h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13,13h2v2h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15,15h2v2h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13,17h2v2h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15,19h2v2h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,17h2v2h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,13h2v2h-2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,15h2v2h-2z"/>
+</vector>

src/main/res/layout/activity_edit_account.xml 🔗 

@@ -613,14 +613,14 @@
                                 android:orientation="vertical">
 
                                 <ImageButton
-                                    android:id="@+id/action_copy_axolotl_to_clipboard"
+                                    android:id="@+id/show_qr_code_button"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:alpha="?attr/icon_alpha"
                                     android:background="?attr/selectableItemBackgroundBorderless"
                                     android:contentDescription="@string/copy_omemo_clipboard_description"
                                     android:padding="@dimen/image_button_padding"
-                                    android:src="?attr/icon_copy"
+                                    android:src="?attr/icon_qr_code"
                                     android:visibility="visible" />
 
                                 <ImageButton

src/main/res/values/attrs.xml 🔗 

@@ -81,7 +81,7 @@
     <attr name="icon_add_group" format="reference" />
     <attr name="icon_add_person" format="reference" />
     <attr name="icon_cancel" format="reference" />
-    <attr name="icon_copy" format="reference" />
+    <attr name="icon_qr_code" format="reference" />
     <attr name="icon_discard" format="reference" />
     <attr name="icon_download" format="reference" />
     <attr name="icon_edit" format="reference" />

src/main/res/values/themes.xml 🔗 

@@ -98,7 +98,7 @@
         <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
         <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
         <item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item>
-        <item name="icon_copy" type="reference">@drawable/ic_content_copy_black_24dp</item>
+        <item name="icon_qr_code" type="reference">@drawable/ic_qr_code_black_24dp</item>
         <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item>
         <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
         <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>
@@ -255,7 +255,7 @@
         <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
         <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
         <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item>
-        <item name="icon_copy" type="reference">@drawable/ic_content_copy_white_24dp</item>
+        <item name="icon_qr_code" type="reference">@drawable/ic_qr_code_white_24dp</item>
         <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item>
         <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
         <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>