From 5ed878095e356c5b6f967f1edb78cf77deb6ccdd Mon Sep 17 00:00:00 2001 From: Arne Date: Sat, 4 Nov 2023 18:20:52 +0100 Subject: [PATCH] improve contact details --- git/release/output-metadata.json | 54 +++++------ .../siacs/conversations/ui/OmemoActivity.java | 2 + .../ic_notifications_black_24dp.png | Bin 311 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 191 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 322 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 554 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 609 -> 0 bytes .../drawable/ic_verified_fingerprint_16dp.xml | 13 +++ .../res/layout/activity_contact_details.xml | 86 ++++++++++++------ src/main/res/layout/contact_key.xml | 57 +++++++++--- src/main/res/values/strings.xml | 4 + 11 files changed, 149 insertions(+), 67 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png create mode 100644 src/main/res/drawable/ic_verified_fingerprint_16dp.xml diff --git a/git/release/output-metadata.json b/git/release/output-metadata.json index b9fc12709..5176eeabc 100644 --- a/git/release/output-metadata.json +++ b/git/release/output-metadata.json @@ -11,36 +11,10 @@ "type": "UNIVERSAL", "filters": [], "attributes": [], - "versionCode": 17273, + "versionCode": 17275, "versionName": "1.7.7", "outputFile": "monocles chat-1.7.7-git-universal-release.apk" }, - { - "type": "ONE_OF_MANY", - "filters": [ - { - "filterType": "ABI", - "value": "x86" - } - ], - "attributes": [], - "versionCode": 14502, - "versionName": "1.7.7", - "outputFile": "monocles chat-1.7.7-git-x86-release.apk" - }, - { - "type": "ONE_OF_MANY", - "filters": [ - { - "filterType": "ABI", - "value": "x86_64" - } - ], - "attributes": [], - "versionCode": 14503, - "versionName": "1.7.7", - "outputFile": "monocles chat-1.7.7-git-x86_64-release.apk" - }, { "type": "ONE_OF_MANY", "filters": [ @@ -66,6 +40,32 @@ "versionCode": 14504, "versionName": "1.7.7", "outputFile": "monocles chat-1.7.7-git-arm64-v8a-release.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "x86_64" + } + ], + "attributes": [], + "versionCode": 14503, + "versionName": "1.7.7", + "outputFile": "monocles chat-1.7.7-git-x86_64-release.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "x86" + } + ], + "attributes": [], + "versionCode": 14502, + "versionName": "1.7.7", + "outputFile": "monocles chat-1.7.7-git-x86-release.apk" } ], "elementType": "File" diff --git a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java index b5714144e..e70df9f62 100644 --- a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java @@ -134,6 +134,7 @@ public abstract class OmemoActivity extends XmppActivity { binding.key.setTextAppearance(this, R.style.TextAppearance_Conversations_Fingerprint); binding.keyType.setTextAppearance(this, R.style.TextAppearance_Conversations_Caption); if (status.isVerified()) { + binding.verifiedFingerprintText.setVisibility(View.VISIBLE); binding.verifiedFingerprint.setVisibility(View.VISIBLE); binding.verifiedFingerprint.setAlpha(1.0f); binding.tglTrust.setVisibility(View.GONE); @@ -142,6 +143,7 @@ public abstract class OmemoActivity extends XmppActivity { } else { binding.verifiedFingerprint.setVisibility(View.GONE); binding.tglTrust.setVisibility(View.VISIBLE); + binding.keyAutomaticallyAccepted.setVisibility(View.VISIBLE); binding.tglTrust.setOnCheckedChangeListener(onCheckedChangeListener); if (status.getTrust() == FingerprintStatus.Trust.UNDECIDED && undecidedNeedEnablement) { binding.buttonEnableDevice.setVisibility(View.VISIBLE); diff --git a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png deleted file mode 100644 index e44a57d872e8b352c5380903827220cd7fca180d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmV-70m%M|P)dNh9qb!ExTyZ^@g&9+e5=P|k+TUhG+5Ghc6`+9EY`(Yk zaj7$vRbWIJ-{ZCknNZ#b#JfD+3!Ndgd^y11R_s|(10=|#PSm3YDCfN<5>)(h?lmzv z?{$!%Lj#QHhy;ZIP>2Lw0H6p7N&%o03Cck!kOC=C=Rs3y4FvhrtSKf2f^JPvXpAUk zl(cgLJ5PSg^<$#8|7QF;TPi7G68=ou7}SQJO2imLy?^P|JOLUTjY;E2z~=w}002ov JPDHLkV1m$hfs+6L diff --git a/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png deleted file mode 100644 index 520cf1bfe2c66c875033c801b0f62f30946169f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjZJsWUAr-fh6C^wvI6EFMoY5&J z*1+?R|LDgnW^;r)o-0Ng@N2n=PT)9_KY^$Hp?QF1mjkC*^Tk5Woo(4nAM=%T7*<|X zINqe`BEfe!_{7EsY@A|ufc*C=5g+EtaQ~a!;jSx@BxW)p(UDn~SN-Iq|00hLa>ps{ n{G_U@^PyepkI*SOMFs}x_Ki#ePoyG&E@JR>^>bP0l+XkK)d4|m diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png deleted file mode 100644 index 22f9315c9cf5dc34cb07a1d2c75f2056860f3941..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmV-I0lof-P)3XRoSq8?Ie40xhZN8*1hgRqOe=cNQJ81~5_*kyoQ0KU_}q%F@q(*x z_+q?rplh9y{xE!Q>T3K&I2s5T=`2L^{?{GEk{6X zVZ1Wt2q-KD6dVDy#ekY4ps^Uxa0K)g1A3R=G);*B1Rwwb2tWV=*2owFvXIAHi{Kn@ zJi^6zqY;y15dcD?)7%bS2mz%gpbQ~E{_g);82^ks`cL4Kh>~uZjvk-z?gGF(ZwRr( U0xARHjsO4v07*qoM6N<$g4MBr+NhqKPE>BH*sN4 zm*j;-3~#q=+4_KC5${wnlaeY%6P1MIJzYT&6HhQ|cy77w~TD z{pSC?_latYY}tv^JUL9SD_aDdI28Y%5;}8uQ-#8L!3}(`H}KmZ*=Mu;*woLWNkU0? zzfPSp{i=|dhDF(nq6M3BR&H=OxUqOTbLjrgJxRq=fo)z~<=TPm9mc^2fB;1SE?U{4C%Ikw@-+zU^LY?P2 zH|qo=ejnCIjJr``II~T?K)`uHZFu*l%LDw+{Ue`t`DP~&@u9EeJ0q%hd(t8_gTpRD1vdz+%+$hn34ZWDoV*fo% zlx@|)RNcZhF6O4*(QLU;4F9qp{$?W;4rQ6l5qx(%F) zod##~f9~sUj0$GS+9|Q(h3oEvsXEDXmAT*Vng2dA_f&-X&8Z%bCrrIO#ZdEn;-*cl pQJ)guoPNCMw01i%T4v7mxBXzzdHTH8O<)>e@O1TaS?83{1OUo2@&5n- diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png deleted file mode 100644 index ccfff7d64e02d39793fedd253cc23c6071c2f254..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 609 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VAAk(aSW-r^>&7>zH^{VyY|5t z?Lf7enK?0FV~NY;ce^4pm#*FaWDZN*uNe z)b-8J|7=scbLUPOpur%p<7~$ojn$`brImiZ!BMp-)vHYPHUEvJIYPcSYd_Ub`ftc| zzlBHRpX0t*!Pu9<{Q?X6)_uuz=eXb&{_Be}AIF0BnG%d?7pC=OMtYWMzdp)w!T9*J zGua2_XHJzpKILCcSuEvu74JZP2WiTvW6B zdvRWi-u_SgkM^$2W76nWG#99oxQ0OpkS$P@mV=I7M0J->2d$rspM{!?*qC3@vWGY?wXk_>Z&f c;P`xA$^4E-KzQFRH%<`W)78&qol`;+0PCCvR{#J2 diff --git a/src/main/res/drawable/ic_verified_fingerprint_16dp.xml b/src/main/res/drawable/ic_verified_fingerprint_16dp.xml new file mode 100644 index 000000000..32d75bb5e --- /dev/null +++ b/src/main/res/drawable/ic_verified_fingerprint_16dp.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 73fdd6633..e6cc63626 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -242,9 +242,45 @@ + + + + + + + + + + + + - - - - - - + + + -