mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed text file colors in outgoing messages while in dark mode, fixed disabled in-call button color issue

Browse source
This commit is contained in:
Sylvain Berfini 2024-12-20 14:32:26 +01:00
parent 83f249b1d9
commit d0dc42c67b
13 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/color/in_call_button_tint_color.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/gray_500" />
<item android:state_enabled="false" android:color="@color/gray_400" />
<item android:state_pressed="true" android:color="@color/bc_white" />
<item android:color="@color/bc_white"/>
</selector>

2
app/src/main/res/drawable/shape_squircle_main2_200_5dp.xml → app/src/main/res/drawable/shape_squircle_file_background_5dp.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="5dp" />
<solid android:color="?attr/color_main2_200" />
<solid android:color="?attr/color_chat_bubble_file" />
</shape>

2
app/src/main/res/drawable/shape_squircle_main2_200_left.xml → app/src/main/res/drawable/shape_squircle_file_background_left.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:topLeftRadius="10dp" android:bottomLeftRadius="10dp" />
<solid android:color="?attr/color_main2_200" />
<solid android:color="?attr/color_chat_bubble_file" />
</shape>

12
app/src/main/res/layout/call_ended_actions.xml
View file

@ -40,7 +40,7 @@
android:src="@drawable/phone_disconnect"
android:contentDescription="@null"
android:background="@drawable/shape_squircle_red_disabled_background"
app:tint="@color/gray_400"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
@ -51,12 +51,12 @@
android:layout_height="@dimen/call_button_size"
android:layout_marginEnd="16dp"
android:padding="@dimen/call_button_icon_padding"
android:enabled="false"
android:src="@drawable/video_camera_slash"
android:contentDescription="@null"
android:enabled="@{false}"
android:background="@drawable/shape_round_in_call_disabled_button_background"
android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
app:tint="@color/gray_400"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
@ -72,8 +72,9 @@
android:padding="@dimen/call_button_icon_padding"
android:src="@drawable/microphone_slash"
android:contentDescription="@null"
android:enabled="@{false}"
android:background="@drawable/shape_round_in_call_disabled_button_background"
app:tint="@color/gray_400"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/toggle_video"
@ -87,8 +88,9 @@
android:padding="@dimen/call_button_icon_padding"
android:src="@drawable/speaker_slash"
android:contentDescription="@null"
android:enabled="@{false}"
android:background="@drawable/shape_round_in_call_disabled_button_background"
app:tint="@color/gray_400"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"

5
app/src/main/res/layout/call_outgoing_actions.xml
View file

@ -23,7 +23,7 @@
android:src="@drawable/animated_caret_to_handle"
android:enabled="false"
android:contentDescription="@string/content_description_toggle_bottom_sheet"
app:tint="@color/gray_400"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -54,9 +54,10 @@
android:padding="@dimen/call_button_icon_padding"
android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
android:contentDescription="@null"
android:enabled="@{false}"
android:src="@{viewModel.isVideoEnabled ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
android:background="@drawable/shape_round_in_call_disabled_button_background"
app:tint="@color/gray_400"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"

4
app/src/main/res/layout/chat_bubble_content_grid_cell.xml
View file

@ -41,7 +41,7 @@
android:layout_height="@dimen/chat_bubble_grid_image_size"
android:adjustViewBounds="true"
android:padding="18dp"
android:background="@drawable/shape_squircle_main2_200_5dp"
android:background="@drawable/shape_squircle_file_background_5dp"
android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"
@ -95,7 +95,7 @@
android:id="@+id/left_background"
android:layout_width="@dimen/chat_bubble_grid_image_size"
android:layout_height="@dimen/chat_bubble_grid_image_size"
android:background="@drawable/shape_squircle_main2_200_left"
android:background="@drawable/shape_squircle_file_background_left"
android:visibility="@{model.isImage || model.isVideoPreview ? View.INVISIBLE : View.VISIBLE}"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/chat_bubble_single_media_content.xml
View file

@ -29,7 +29,7 @@
android:layout_height="@dimen/chat_bubble_grid_image_size"
android:adjustViewBounds="true"
android:padding="18dp"
android:background="@drawable/shape_squircle_main2_200_5dp"
android:background="@drawable/shape_squircle_file_background_5dp"
android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"

2
app/src/main/res/layout/chat_conversation_attachments_area_cell.xml
View file

@ -25,7 +25,7 @@
android:layout_height="@dimen/chat_bubble_grid_image_size"
android:adjustViewBounds="true"
android:padding="18dp"
android:background="@drawable/shape_squircle_main2_200_5dp"
android:background="@drawable/shape_squircle_file_background_5dp"
android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"

2
app/src/main/res/layout/chat_document_content_list_cell.xml
View file

@ -27,7 +27,7 @@
android:padding="18dp"
android:contentDescription="@string/content_description_chat_bubble_file"
android:src="@{model.isWaitingToBeDownloaded ? @drawable/download_simple : model.isPdf ? @drawable/file_pdf : model.isAudio ? @drawable/file_audio : @drawable/file, default=@drawable/file_pdf}"
android:background="@drawable/shape_squircle_main2_200_left"
android:background="@drawable/shape_squircle_file_background_left"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/chat_media_content_grid_cell.xml
View file

@ -21,7 +21,7 @@
android:layout_margin="1dp"
android:adjustViewBounds="true"
android:padding="18dp"
android:background="@drawable/shape_squircle_main2_200_5dp"
android:background="@drawable/shape_squircle_file_background_5dp"
android:visibility="@{model.mediaPreviewAvailable ? View.GONE : View.VISIBLE, default=gone}"
android:contentDescription="@{model.isVideoPreview ? @string/content_description_chat_bubble_video : @string/content_description_chat_bubble_image}"
android:src="@{model.isVideoPreview ? @drawable/file_video : @drawable/file_image, default=@drawable/file_video}"

1
app/src/main/res/values-night/themes.xml
View file

@ -64,6 +64,7 @@
<item name="color_chat_bubble_incoming">@color/background_color_alt_dark_mode</item>
<item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
<item name="color_chat_bubble_reply">@color/gray_500</item>
<item name="color_chat_bubble_file">@color/gray_main2_800</item>
<item name="color_message_text_field_background">@color/gray_500</item>
<item name="color_conversation_send_area_background">@color/background_color_alt_dark_mode</item>

1
app/src/main/res/values/attrs.xml
View file

@ -62,6 +62,7 @@
<attr name="color_chat_bubble_incoming" format="color"/>
<attr name="color_chat_bubble_outgoing" format="color"/>
<attr name="color_chat_bubble_reply" format="color"/>
<attr name="color_chat_bubble_file" format="color"/>
<attr name="color_message_text_field_background" format="color"/>
<attr name="color_conversation_send_area_background" format="color"/>

1
app/src/main/res/values/themes.xml
View file

@ -65,6 +65,7 @@
<item name="color_chat_bubble_incoming">@color/gray_main2_100</item>
<item name="color_chat_bubble_outgoing">@color/orange_main_100</item>
<item name="color_chat_bubble_reply">@color/gray_200</item>
<item name="color_chat_bubble_file">@color/gray_main2_200</item>
<item name="color_message_text_field_background">@color/bc_white</item>
<item name="color_conversation_send_area_background">@color/gray_100</item>