mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-27 07:24:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	src/main/res/drawable/business_black.xml
#	src/main/res/drawable/business_white.xml
#	src/main/res/drawable/email_black.xml
#	src/main/res/drawable/email_white.xml
#	src/main/res/drawable/ic_call_white70_24dp.xml
#	src/main/res/drawable/open_pdf_black.xml
#	src/main/res/drawable/open_pdf_white.xml
This commit is contained in:
12aw 2024-02-18 10:19:57 +01:00
commit 54c4480f7b
5 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1076,7 +1076,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
binding.command.setCompoundDrawablePadding(20);
} else if (uri.getScheme().equals("tel")) {
binding.command.setText(uri.getSchemeSpecificPart());
binding.command.setCompoundDrawablesRelativeWithIntrinsicBounds(getDrawable(R.attr.ic_make_audio_call), null, null, null);
binding.command.setCompoundDrawablesRelativeWithIntrinsicBounds(getDrawable(R.attr.icon_call), null, null, null);
binding.command.setCompoundDrawablePadding(20);
} else if (uri.getScheme().equals("mailto")) {
binding.command.setText(uri.getSchemeSpecificPart());

4
src/main/res/drawable/ic_videocam_white70_24dp.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/ic_videocam_white_24dp"
android:tint="@color/white70" />

4
src/main/res/menu/contact_details.xml
View file

@ -17,11 +17,11 @@
<menu>
<item
android:id="@+id/action_audio_call"
android:icon="?attr/ic_make_audio_call"
android:icon="?attr/icon_call"
android:title="@string/audio_call" />
<item
android:id="@+id/action_video_call"
android:icon="?attr/ic_make_video_call"
android:icon="?attr/take_video"
android:title="@string/video_call" />
</menu>
</item>

2
src/main/res/values/attrs.xml
View file

@ -54,8 +54,6 @@
<attr name="ic_keyboard_button" format="reference" />
<attr name="icon_gps_fixed" format="reference" />
<attr name="icon_gps_not_fixed" format="reference" />
<attr name="ic_make_audio_call" format="reference"/>
<attr name="ic_make_video_call" format="reference"/>
<attr name="ic_dialpad_24dp" format="reference"/>
<attr name="conversations_overview_background" format="reference|color" />

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

@ -153,8 +153,6 @@
<item name="icon_quote" type="reference">@drawable/ic_reply_black</item>
<item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_black_24dp</item>
<item name="icon_not_secure" type="reference">@drawable/ic_lock_open_black_24dp</item>
<item name="ic_make_audio_call" type="reference">@drawable/ic_call_black54_24dp</item>
<item name="ic_make_video_call" type="reference">@drawable/ic_videocam_black54_24dp</item>
<item name="icon_call" type="reference">@drawable/ic_call_black_24dp</item>
<item name="icon_ongoing_call" type="reference">@drawable/ic_phone_in_talk_black_24dp</item>
<item name="ic_ongoing_call_hint" type="reference">@drawable/ic_phone_in_talk_black_18dp
@ -380,8 +378,6 @@
<item name="icon_refresh" type="reference">@drawable/ic_refresh_white_24dp</item>
<item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_white_24dp</item>
<item name="icon_not_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
<item name="ic_make_audio_call" type="reference">@drawable/ic_call_white70_24dp</item>
<item name="ic_make_video_call" type="reference">@drawable/ic_videocam_white70_24dp</item>
<item name="icon_call" type="reference">@drawable/ic_call_white_24dp</item>
<item name="icon_ongoing_call" type="reference">@drawable/ic_phone_in_talk_white_24dp</item>
<item name="ic_ongoing_call_hint" type="reference">@drawable/ic_phone_in_talk_white_18dp