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 9a9e5706f..000000000 Binary files a/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png and /dev/null differ 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 c94cc28f1..000000000 Binary files a/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png and /dev/null differ 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 1cf76a960..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png and /dev/null differ 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 074ea8807..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png and /dev/null differ 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 1f6af72d0..000000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png and /dev/null differ 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 @@ + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + 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"> - + 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 @@ @drawable/ic_group_add_white_24dp @drawable/ic_person_add_white_24dp @drawable/ic_cancel_black_24dp - @drawable/ic_content_copy_black_24dp + @drawable/ic_qr_code_black_24dp @drawable/ic_delete_white_24dp @drawable/ic_file_download_white_24dp @drawable/ic_edit_white_24dp @@ -255,7 +255,7 @@ @drawable/ic_group_add_white_24dp @drawable/ic_person_add_white_24dp @drawable/ic_cancel_white_24dp - @drawable/ic_content_copy_white_24dp + @drawable/ic_qr_code_white_24dp @drawable/ic_delete_white_24dp @drawable/ic_file_download_white_24dp @drawable/ic_edit_white_24dp