1
0
Fork 1

fix vcard view height

This commit is contained in:
Arne 2023-10-29 15:02:09 +01:00
parent 2f1ec07c41
commit 9fbcfc1436
3 changed files with 37 additions and 3 deletions
src/main
java/eu/siacs/conversations/ui
res

View file

@ -162,13 +162,17 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
private void checkContactPermissionAndShowAddDialog() {
if (hasContactsPermission()) {
showAddToPhoneBookDialog();
} else {
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS);
}
}
private boolean hasContactsPermission() {
return checkSelfPermission(Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
return checkSelfPermission(Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED;
} else {
return true;
}
}
private void showAddToPhoneBookDialog() {
@ -1036,7 +1040,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
if (uri != null && uri.getScheme() != null) {
if (uri.getScheme().equals("xmpp")) {
binding.command.setText(uri.getSchemeSpecificPart());
binding.command.setCompoundDrawablesRelativeWithIntrinsicBounds(getResources().getDrawable(R.drawable.intro_xmpp_icon), null, null, null);
binding.command.setCompoundDrawablesRelativeWithIntrinsicBounds(getResources().getDrawable(R.drawable.xmpp_logo), null, null, null);
binding.command.setCompoundDrawablePadding(20);
} else if (uri.getScheme().equals("tel")) {
binding.command.setText(uri.getSchemeSpecificPart());
@ -1052,6 +1056,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
binding.command.setCompoundDrawablePadding(20);
} else {
binding.command.setText(uri.toString());
binding.command.setPadding(0,0 ,0, 20);
}
} else {
final String text = item.findChildContent("text", Namespace.VCARD4);

View file

@ -0,0 +1,28 @@
<vector android:height="24dp" android:viewportHeight="200"
android:viewportWidth="200" android:width="24dp"
xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="m151.81,51.56c0.08,1.31 -1.79,0.97 -1.79,2.29 0,38.55 -46.56,97.37 -91.69,108.73v1.64C118.28,158.7 186.89,96.42 188.4,37.37l-36.6,14.19z">
<aapt:attr name="android:fillColor">
<gradient android:endX="123.4" android:endY="37.37"
android:startX="123.4" android:startY="164.22" android:type="linear">
<item android:color="#FF1B3967" android:offset="0.01"/>
<item android:color="#FF13B5EA" android:offset="0.47"/>
<item android:color="#FF002B5C" android:offset="0.99"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#e96d1f" android:pathData="m133.67,56.3c0.08,1.31 0.12,2.63 0.12,3.96 0,38.55 -30.7,90.5 -75.83,101.86v1.64c59.04,-2.79 105.81,-63.02 105.81,-109.2 0,-2.38 -0.13,-4.73 -0.37,-7.06l-29.73,8.8z"/>
<path android:fillColor="#d9541e" android:pathData="m163.69,46.95 l-7.62,2.72c0.04,0.96 0.07,2.25 0.07,3.22 0,41.22 -37.27,98.2 -87.27,107.12 -3.25,1.09 -7.54,2.08 -10.93,2.93v1.64C123.19,159.03 169.04,92.72 163.7,46.95Z"/>
<path android:pathData="m50.01,51.56c-0.08,1.31 1.79,0.97 1.79,2.29 0,38.55 46.56,97.37 91.69,108.73v1.64C83.53,158.7 14.93,96.42 13.42,37.37l36.6,14.19z">
<aapt:attr name="android:fillColor">
<gradient android:endX="78.41" android:endY="37.37"
android:startX="78.41" android:startY="164.22" android:type="linear">
<item android:color="#FF1B3967" android:offset="0.01"/>
<item android:color="#FF13B5EA" android:offset="0.47"/>
<item android:color="#FF002B5C" android:offset="0.99"/>
</gradient>
</aapt:attr>
</path>
<path android:fillColor="#a0ce67" android:pathData="m68.14,56.3c-0.08,1.31 -0.12,2.63 -0.12,3.96 0,38.55 30.7,90.5 75.83,101.86v1.64C84.81,160.97 38.04,100.73 38.04,54.56c0,-2.38 0.13,-4.73 0.37,-7.06l29.73,8.8z"/>
<path android:fillColor="#439639" android:pathData="m38.13,46.95 l7.62,2.72c-0.04,0.96 -0.07,2.25 -0.07,3.22 0,41.22 37.27,98.2 87.27,107.12 3.24,1.09 7.54,2.08 10.93,2.93v1.64C78.63,159.03 32.78,92.72 38.12,46.95Z"/>
</vector>

View file

@ -303,6 +303,7 @@
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>