Work fork of an Android Jabber client for bridge users
git.sr.ht/~singpolyma/cheogram-android
sopranica
sgx
xmpp
jabber
make copy omemo fp button a show qr code button
Daniel Gultsch
(Oct 30, 2023, 2:26 PM +0100)
dfd7410b
71b6492d
+87
-7
+2
-2
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+2
-2
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
···
1162
1162
this.binding.ownFingerprintDesc.setText(R.string.omemo_fingerprint);
1163
1163
}
1164
1164
this.binding.axolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2)));
1165
-
this.binding.actionCopyAxolotlToClipboard.setVisibility(View.VISIBLE);
1166
-
this.binding.actionCopyAxolotlToClipboard.setOnClickListener(v -> copyOmemoFingerprint(ownAxolotlFingerprint));
1165
+
this.binding.showQrCodeButton.setVisibility(View.VISIBLE);
1166
+
this.binding.showQrCodeButton.setOnClickListener(v -> showQrCode());
1167
1167
} else {
1168
1168
this.binding.axolotlFingerprintBox.setVisibility(View.GONE);
1169
1169
}
src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
This is a binary file and will not be displayed.
src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
This is a binary file and will not be displayed.
src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
This is a binary file and will not be displayed.
src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
This is a binary file and will not be displayed.
src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
This is a binary file and will not be displayed.
+40
src/main/res/drawable/ic_qr_code_black_24dp.xml
+40
src/main/res/drawable/ic_qr_code_black_24dp.xml
···
1
+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
+
android:width="24dp"
3
+
android:height="24dp"
4
+
android:tint="@color/black"
5
+
android:viewportWidth="24"
6
+
android:viewportHeight="24">
7
+
<path
8
+
android:fillColor="@android:color/white"
9
+
android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z" />
10
+
<path
11
+
android:fillColor="@android:color/white"
12
+
android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z" />
13
+
<path
14
+
android:fillColor="@android:color/white"
15
+
android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z" />
16
+
<path
17
+
android:fillColor="@android:color/white"
18
+
android:pathData="M19,19h2v2h-2z" />
19
+
<path
20
+
android:fillColor="@android:color/white"
21
+
android:pathData="M13,13h2v2h-2z" />
22
+
<path
23
+
android:fillColor="@android:color/white"
24
+
android:pathData="M15,15h2v2h-2z" />
25
+
<path
26
+
android:fillColor="@android:color/white"
27
+
android:pathData="M13,17h2v2h-2z" />
28
+
<path
29
+
android:fillColor="@android:color/white"
30
+
android:pathData="M15,19h2v2h-2z" />
31
+
<path
32
+
android:fillColor="@android:color/white"
33
+
android:pathData="M17,17h2v2h-2z" />
34
+
<path
35
+
android:fillColor="@android:color/white"
36
+
android:pathData="M17,13h2v2h-2z" />
37
+
<path
38
+
android:fillColor="@android:color/white"
39
+
android:pathData="M19,15h2v2h-2z" />
40
+
</vector>
+40
src/main/res/drawable/ic_qr_code_white_24dp.xml
+40
src/main/res/drawable/ic_qr_code_white_24dp.xml
···
1
+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
+
android:width="24dp"
3
+
android:height="24dp"
4
+
android:viewportWidth="24"
5
+
android:viewportHeight="24"
6
+
android:tint="@color/white">
7
+
<path
8
+
android:fillColor="@android:color/white"
9
+
android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z"/>
10
+
<path
11
+
android:fillColor="@android:color/white"
12
+
android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z"/>
13
+
<path
14
+
android:fillColor="@android:color/white"
15
+
android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z"/>
16
+
<path
17
+
android:fillColor="@android:color/white"
18
+
android:pathData="M19,19h2v2h-2z"/>
19
+
<path
20
+
android:fillColor="@android:color/white"
21
+
android:pathData="M13,13h2v2h-2z"/>
22
+
<path
23
+
android:fillColor="@android:color/white"
24
+
android:pathData="M15,15h2v2h-2z"/>
25
+
<path
26
+
android:fillColor="@android:color/white"
27
+
android:pathData="M13,17h2v2h-2z"/>
28
+
<path
29
+
android:fillColor="@android:color/white"
30
+
android:pathData="M15,19h2v2h-2z"/>
31
+
<path
32
+
android:fillColor="@android:color/white"
33
+
android:pathData="M17,17h2v2h-2z"/>
34
+
<path
35
+
android:fillColor="@android:color/white"
36
+
android:pathData="M17,13h2v2h-2z"/>
37
+
<path
38
+
android:fillColor="@android:color/white"
39
+
android:pathData="M19,15h2v2h-2z"/>
40
+
</vector>
+2
-2
src/main/res/layout/activity_edit_account.xml
+2
-2
src/main/res/layout/activity_edit_account.xml
···
613
613
android:orientation="vertical">
614
614
615
615
<ImageButton
616
-
android:id="@+id/action_copy_axolotl_to_clipboard"
616
+
android:id="@+id/show_qr_code_button"
617
617
android:layout_width="wrap_content"
618
618
android:layout_height="wrap_content"
619
619
android:alpha="?attr/icon_alpha"
620
620
android:background="?attr/selectableItemBackgroundBorderless"
621
621
android:contentDescription="@string/copy_omemo_clipboard_description"
622
622
android:padding="@dimen/image_button_padding"
623
-
android:src="?attr/icon_copy"
623
+
android:src="?attr/icon_qr_code"
624
624
android:visibility="visible" />
625
625
626
626
<ImageButton
+1
-1
src/main/res/values/attrs.xml
+1
-1
src/main/res/values/attrs.xml
···
81
81
<attr name="icon_add_group" format="reference" />
82
82
<attr name="icon_add_person" format="reference" />
83
83
<attr name="icon_cancel" format="reference" />
84
-
<attr name="icon_copy" format="reference" />
84
+
<attr name="icon_qr_code" format="reference" />
85
85
<attr name="icon_discard" format="reference" />
86
86
<attr name="icon_download" format="reference" />
87
87
<attr name="icon_edit" format="reference" />
+2
-2
src/main/res/values/themes.xml
+2
-2
src/main/res/values/themes.xml
···
98
98
<item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
99
99
<item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
100
100
<item name="icon_cancel" type="reference">@drawable/ic_cancel_black_24dp</item>
101
-
<item name="icon_copy" type="reference">@drawable/ic_content_copy_black_24dp</item>
101
+
<item name="icon_qr_code" type="reference">@drawable/ic_qr_code_black_24dp</item>
102
102
<item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item>
103
103
<item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
104
104
<item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>
···
255
255
<item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item>
256
256
<item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item>
257
257
<item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item>
258
-
<item name="icon_copy" type="reference">@drawable/ic_content_copy_white_24dp</item>
258
+
<item name="icon_qr_code" type="reference">@drawable/ic_qr_code_white_24dp</item>
259
259
<item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item>
260
260
<item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item>
261
261
<item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item>