mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

improve contact details

Browse source
This commit is contained in:
Arne 2023-11-04 18:20:52 +01:00
parent aae39c21e9
commit d421f4dcfe
11 changed files with 149 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
git/release/output-metadata.json
View file

@ -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"

2
src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
View file

@ -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);

BIN
src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 311 B

BIN
src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 191 B

BIN
src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 322 B

BIN
src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 554 B

BIN
src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 609 B

13
src/main/res/drawable/ic_verified_fingerprint_16dp.xml Normal file
View file

@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<group>
<clip-path
android:pathData="M0,0h16v16h-16z"/>
<path
android:pathData="M7.3,10.367L11.066,6.6L10.116,5.65L7.3,8.467L5.9,7.067L4.95,8.017L7.3,10.367ZM8,14.667C6.455,14.278 5.18,13.392 4.175,12.009C3.169,10.625 2.667,9.089 2.667,7.4V3.333L8,1.334L13.333,3.333V7.4C13.333,9.089 12.83,10.625 11.825,12.009C10.819,13.392 9.544,14.278 8,14.667Z"
android:fillColor="#388E3C"/>
</group>
</vector>

86
src/main/res/layout/activity_contact_details.xml
View file

@ -242,9 +242,45 @@
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_height="0.05dp"
android:background="?attr/text_Color_Main" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/title_activity_about"
android:textStyle="bold"
style="@style/TextAppearance.Conversations.Subhead" />
<androidx.cardview.widget.CardView
android:id="@+id/profile"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ListView
android:id="@+id/profile_items"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="false"
android:divider="@android:color/transparent"
android:dividerHeight="0dp" />
</androidx.cardview.widget.CardView>
<View
android:layout_width="match_parent"
android:layout_height="0.05dp"
android:background="?attr/text_Color_Main" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/media"
android:textStyle="bold"
style="@style/TextAppearance.Conversations.Subhead" />
<androidx.cardview.widget.CardView
android:id="@+id/media_wrapper"
android:layout_width="match_parent"
@ -291,27 +327,16 @@
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_height="0.05dp"
android:background="?attr/text_Color_Main" />
<androidx.cardview.widget.CardView
android:id="@+id/profile"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ListView
android:id="@+id/profile_items"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="false"
android:divider="@android:color/transparent"
android:dividerHeight="0dp" />
</androidx.cardview.widget.CardView>
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:background="?attr/text_Color_Main" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dp"
android:text="@string/security"
android:textStyle="bold"
style="@style/TextAppearance.Conversations.Subhead" />
<androidx.cardview.widget.CardView
android:id="@+id/keys_wrapper"
@ -336,39 +361,48 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/card_padding_list">
<TextView
android:layout_marginHorizontal="@dimen/list_padding"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"
android:text="@string/contact_uses_unverified_keys"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<Button
android:id="@+id/scan_button"
style="@style/Widget.Conversations.Button.Borderless"
style="@style/Widget.Conversations.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:drawableLeft="@drawable/ic_qrcode_scan_white_24dp"
android:minWidth="0dp"
android:padding="2dp"
android:paddingStart="16dp"
android:paddingLeft="16dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:text="@string/scan_qr_code"
android:textColor="?attr/colorAccent" />
android:textColor="@color/white" />
<Button
android:id="@+id/show_inactive_devices"
style="@style/Widget.Conversations.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/scan_button"
android:minWidth="0dp"
android:paddingStart="16dp"
android:paddingLeft="16dp"
@ -376,7 +410,7 @@
android:paddingRight="16dp"
android:text="@string/show_inactive_devices"
android:textColor="?attr/colorAccent" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>

57
src/main/res/layout/contact_key.xml
View file

@ -25,14 +25,50 @@
android:clickable="true"
android:longClickable="true"
android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:longClickable="true"
android:textAppearance="@style/TextAppearance.Conversations.Caption" />
<TextView
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:clickable="true"
android:longClickable="true"
android:textAppearance="@style/TextAppearance.Conversations.Caption" />
<TextView
android:id="@+id/key_automatically_accepted"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/key_type"
android:text="@string/key_automatically_accepted"
android:textAppearance="@style/TextAppearance.Conversations.Caption"
android:visibility="gone"/>
<TextView
android:id="@+id/verified_fingerprint_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/key_type"
android:text="@string/verified_with_qr_code"
android:textColor="@color/green500"
android:textAppearance="@style/TextAppearance.Conversations.Caption"
android:visibility="gone"/>
<ImageView
android:id="@+id/verified_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginTop="2dp"
android:layout_toRightOf="@+id/verified_fingerprint_text"
android:src="@drawable/ic_verified_fingerprint_16dp"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
@ -65,13 +101,6 @@
android:src="?attr/icon_enable_undecided_device"
android:visibility="gone" />
<ImageView
android:id="@+id/verified_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_verified_fingerprint"
android:visibility="gone" />
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/tgl_trust"
android:layout_width="wrap_content"

4
src/main/res/values/strings.xml
View file

@ -1354,4 +1354,8 @@
<string name="unknown">Unknown</string>
<string name="contact_uses_unverified_keys">Your contact uses unverified devices. Scan their 2D barcode to perform verification and impede active MITM attacks.</string>
<string name="unverified_devices">You are using unverified devices. Scan the 2D barcode on your other devices to perform verification and impede active MITM attacks.</string>
<string name="media">Media</string>
<string name="security">Security</string>
<string name="verified_with_qr_code">&#160;- verified with QR-code</string>
<string name="key_automatically_accepted">&#160;- key not verified</string>
</resources>