From dfd7410b1abb2a2f1c9fa2d8f8a514443c25f91c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 30 Oct 2023 14:26:28 +0100
Subject: [PATCH] make copy omemo fp button a show qr code button

---
 .../conversations/ui/EditAccountActivity.java |   4 +-
 .../ic_content_copy_black_24dp.png            | Bin 195 -> 0 bytes
 .../ic_content_copy_black_24dp.png            | Bin 130 -> 0 bytes
 .../ic_content_copy_black_24dp.png            | Bin 180 -> 0 bytes
 .../ic_content_copy_black_24dp.png            | Bin 258 -> 0 bytes
 .../ic_content_copy_black_24dp.png            | Bin 319 -> 0 bytes
 .../res/drawable/ic_qr_code_black_24dp.xml    |  40 ++++++++++++++++++
 .../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(-)
 delete mode 100644 src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
 delete mode 100644 src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
 delete mode 100644 src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
 delete mode 100644 src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
 delete mode 100644 src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
 create mode 100644 src/main/res/drawable/ic_qr_code_black_24dp.xml
 create mode 100644 src/main/res/drawable/ic_qr_code_white_24dp.xml

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 42335048a..741cbcce5 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/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);
             }
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
deleted file mode 100644
index 9a9e5706fe8da95eef4231d4f1abe1d210c2eb81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8m#2$kNCo5DsTVm9If$@4|8>D{
zOLK;Hn841uKO0!JcVzv!DjIZP(;;Vpyl3?a+b6i&R_lFn;CG*=ap|yw=|XWQ(fP~H
zGM#e%*%W@xME;ccp35;A3vNv2Y~{8SNHSgc;i0wD7kmD*7kJJF+}GjAJ#*o`^ZWI6
u|JoXp#Ch6(INZyKC_8vEE;8fFXU2sJ6+B+{NislJF?hQAxvX<aXaWG=@=LV<

diff --git a/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
deleted file mode 100644
index c94cc28f136e98ffc0119a71ba0d59e49881a06b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Pfr)ekP60R1%4KzJt;r>nUk0m
zo~mRzcqA~r%2aqTJ)GxXh7`xIr>e8qBzkZ2I!7K}!NwwCCKdP4^Pc{O%n#`moxwZx
cnJXC>be}Hge!kHE2GCFjPgg&ebxsLQ0Ikg^A^-pY

diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
deleted file mode 100644
index 1cf76a960302404d6bb4cbd0c3e96aea8245a68f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DYEKu(kP61P*B!ZzDhM<`{BLsf
z_VsTG{YiJv?{?zZp?Px6VfIrEpH`Y!HAl%<_O=_j`7Qs(lx(aZ(lf(>p<Z9j+?V;!
z-ii#V3!24xyb@*~vJTu@$~~8Xk%@&vK%wC(Cy?dy=lJ?5x7p6^mH#ZyzT(Ky-4zz<
c?DD7Oe~8a96iS$43Umg8r>mdKI;Vst0IVH8wEzGB

diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
deleted file mode 100644
index 074ea8807923a7b1f35a5c778d6ff4a6b17da54e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawPI|gHhEy=Vy=lLy#X!XEW3cP>
z4=K|mM9N><r%k!psZcia(myrvFCXWw=ijfig!9!;RwZWZl^2Y%e@y7oTb=OyM}yMK
zxCIaM7W~ay@Td6=r^*BeQ(JCz&1!XH*-*I`N2iCBNcYNy#LsDp<_rt)FN(}&)%9C&
zlFMqYL%ZmdbwBO(m_T|E#5Wcp4~0e^TUnUszj*GpH1!J|8_#iy7=~@MEV##V#&pe5
q%leeii$;YaJ5MQ3Jn-M+FT;2C`|+L(uWNyxV(@hJb6Mw<&;$T|QetKR

diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
deleted file mode 100644
index 1f6af72d0576c9740aa95fa7994f6cc90920f4c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 319
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{uw5;uuoF`1Y1#7L%iZ+r#a_
z{K9PKS0(8`({U`~aP@zbvuu;NlbLC($)4}>2|pGDN=X_2UaZ_J&b{%Y*~<eyCAZjQ
ze<-@KojG!%LD|r3K`&oLFJFWk`;p_Tgac+VFfy@BxhpO<FJ`6?!_x1qQ;*pR1{B0|
z<h?0oG`?7Q-RHo>7yG7a@?Yp^iv7f}Ug&@_|Ar|H_bMBHMEsRs1=7tSpy1GegK^?t
zABxNs`x@UDkxV-#U)#!3ptQDg>w}+v#XGmYYcO8<cBi21_p^MPID5BVerUNld9s?G
mO-25X!<Em!+`nnQIlksiq59q(zomfz!{F)a=d#Wzp$P!+k9I%+

diff --git a/src/main/res/drawable/ic_qr_code_black_24dp.xml b/src/main/res/drawable/ic_qr_code_black_24dp.xml
new file mode 100644
index 000000000..e33c1a622
--- /dev/null
+++ b/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>
diff --git a/src/main/res/drawable/ic_qr_code_white_24dp.xml b/src/main/res/drawable/ic_qr_code_white_24dp.xml
new file mode 100644
index 000000000..d345816e0
--- /dev/null
+++ b/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>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index d95627d15..7e5a92969 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/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
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index f66437bf4..89d64f98d 100644
--- a/src/main/res/values/attrs.xml
+++ b/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" />
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 75fd896af..d73f1c8de 100644
--- a/src/main/res/values/themes.xml
+++ b/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>