diff --git a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt index f2c8b97a0..58bdefba4 100644 --- a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt +++ b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt @@ -27,6 +27,7 @@ import android.graphics.Rect import android.graphics.RectF import android.graphics.drawable.BitmapDrawable import android.text.TextPaint +import android.util.TypedValue import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.graphics.drawable.IconCompat @@ -38,8 +39,19 @@ class AvatarGenerator(private val context: Context) { private var textColor: Int = ContextCompat.getColor(context, R.color.gray_main2_600) private var avatarSize: Int = AppUtils.getDimension(R.dimen.avatar_list_cell_size).toInt() private var initials = " " + private var transparentColor: Int = ContextCompat.getColor(context, R.color.transparent_color) private var backgroundColor: Int = ContextCompat.getColor(context, R.color.gray_main2_200) + init { + val textTypedValue = TypedValue() + context.theme.resolveAttribute(R.attr.color_avatar_text, textTypedValue, true) + textColor = textTypedValue.data + + val backgroundTypedValue = TypedValue() + context.theme.resolveAttribute(R.attr.color_avatar_background, backgroundTypedValue, true) + backgroundColor = backgroundTypedValue.data + } + fun setTextSize(size: Float) = apply { textSize = size } @@ -52,9 +64,9 @@ class AvatarGenerator(private val context: Context) { initials = label } - fun buildBitmap(): Bitmap { + fun buildBitmap(useTransparentBackground: Boolean): Bitmap { val textPainter = getTextPainter() - val painter = getPainter() + val painter = if (useTransparentBackground) getTransparentPainter() else getBackgroundPainter() val bitmap = Bitmap.createBitmap(avatarSize, avatarSize, Bitmap.Config.ARGB_8888) val canvas = Canvas(bitmap) @@ -73,11 +85,11 @@ class AvatarGenerator(private val context: Context) { } fun buildDrawable(): BitmapDrawable { - return BitmapDrawable(context.resources, buildBitmap()) + return BitmapDrawable(context.resources, buildBitmap(true)) } fun buildIcon(): IconCompat { - return IconCompat.createWithAdaptiveBitmap(buildBitmap()) + return IconCompat.createWithAdaptiveBitmap(buildBitmap(false)) } private fun getTextPainter(): TextPaint { @@ -89,7 +101,14 @@ class AvatarGenerator(private val context: Context) { return textPainter } - private fun getPainter(): Paint { + private fun getTransparentPainter(): Paint { + val painter = Paint() + painter.isAntiAlias = true + painter.color = transparentColor + return painter + } + + private fun getBackgroundPainter(): Paint { val painter = Paint() painter.isAntiAlias = true painter.color = backgroundColor diff --git a/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt b/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt index 011e1e8ab..bdc53b6ec 100644 --- a/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt +++ b/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt @@ -71,7 +71,7 @@ class AAScreen(context: CarContext) : Screen(context) { coreContext.context ).setInitials( AppUtils.getInitials(friend.name.orEmpty()) - ).buildBitmap() + ).buildBitmap(useTransparentBackground = false) builder.setImage( CarIcon.Builder(IconCompat.createWithBitmap(bitmap)) .build(), diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt index 296f6a85d..410ceb933 100644 --- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt @@ -636,10 +636,9 @@ class ContactViewModel } if (devicesList.isNotEmpty()) { - trustedDevicesPercentage.postValue(trustedDevicesCount * 100 / devicesCount) - trustedDevicesPercentageFloat.postValue( - trustedDevicesCount / devicesCount.toFloat() / 2 - ) + val percentage = trustedDevicesCount * 100 / devicesCount + trustedDevicesPercentage.postValue(percentage) + trustedDevicesPercentageFloat.postValue(percentage / 100f / 2) } } diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt index d58f1b2cd..2a9fa6951 100644 --- a/app/src/main/java/org/linphone/utils/DialogUtils.kt +++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt @@ -499,7 +499,7 @@ class DialogUtils { setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) val d: Drawable = ColorDrawable( - context.getColor(R.color.black) + context.getColor(R.color.bc_black) ) d.alpha = 153 // 60% opacity setBackgroundDrawable(d) diff --git a/app/src/main/res/color/in_call_button_color.xml b/app/src/main/res/color/in_call_button_color.xml index cfea5c512..4fa2d9bb3 100644 --- a/app/src/main/res/color/in_call_button_color.xml +++ b/app/src/main/res/color/in_call_button_color.xml @@ -1,7 +1,7 @@ + android:color="@color/bc_white" /> diff --git a/app/src/main/res/color/in_call_button_tint_color.xml b/app/src/main/res/color/in_call_button_tint_color.xml index 1eda9d9d7..5ec8a6a42 100644 --- a/app/src/main/res/color/in_call_button_tint_color.xml +++ b/app/src/main/res/color/in_call_button_tint_color.xml @@ -1,6 +1,6 @@ - - + + diff --git a/app/src/main/res/color/in_call_label_color.xml b/app/src/main/res/color/in_call_label_color.xml index 2d77faa20..b2220b38e 100644 --- a/app/src/main/res/color/in_call_label_color.xml +++ b/app/src/main/res/color/in_call_label_color.xml @@ -3,5 +3,5 @@ + android:color="@color/bc_white"/> diff --git a/app/src/main/res/drawable/color_black.xml b/app/src/main/res/drawable/color_black.xml index 582fd4384..c2415188a 100644 --- a/app/src/main/res/drawable/color_black.xml +++ b/app/src/main/res/drawable/color_black.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml index 5a2c08770..93734d0f5 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_first.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml index ab50757f6..3fe01469c 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_first_with_border.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml index 6a04a3d9f..a7c055f1c 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_full.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml index 8f2abde86..360b808ec 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_full_with_border.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_incoming_reactions_background.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_reactions_background.xml index e4cda3f2f..ecec783f8 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_incoming_reactions_background.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_incoming_reactions_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml index 722fe4b27..73b71ecc6 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml index 2a1722898..f91180d6d 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_full_with_border.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml index f68d24a70..60ee4c34d 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml index 12440db03..0808b00a4 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_last_with_border.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chat_bubble_outgoing_reactions_background.xml b/app/src/main/res/drawable/shape_chat_bubble_outgoing_reactions_background.xml index 368570b54..f46d8dc54 100644 --- a/app/src/main/res/drawable/shape_chat_bubble_outgoing_reactions_background.xml +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_reactions_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_contact_avatar_background.xml b/app/src/main/res/drawable/shape_circle_contact_avatar_background.xml index 32f3e19db..857e74c21 100644 --- a/app/src/main/res/drawable/shape_circle_contact_avatar_background.xml +++ b/app/src/main/res/drawable/shape_circle_contact_avatar_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_white_call_background.xml b/app/src/main/res/drawable/shape_circle_white_call_background.xml index 07f066002..e532b2557 100644 --- a/app/src/main/res/drawable/shape_circle_white_call_background.xml +++ b/app/src/main/res/drawable/shape_circle_white_call_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_edit_text_background.xml b/app/src/main/res/drawable/shape_edit_text_background.xml index b0b4215c1..0af426c25 100644 --- a/app/src/main/res/drawable/shape_edit_text_background.xml +++ b/app/src/main/res/drawable/shape_edit_text_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_gradient.xml b/app/src/main/res/drawable/shape_gradient.xml index 577f52ad8..c433304a1 100644 --- a/app/src/main/res/drawable/shape_gradient.xml +++ b/app/src/main/res/drawable/shape_gradient.xml @@ -3,6 +3,6 @@ + android:startColor="?attr/color_gradient_start" + android:endColor="?attr/color_gradient_end" /> diff --git a/app/src/main/res/drawable/shape_rectangle_white_background.xml b/app/src/main/res/drawable/shape_rectangle_white_background.xml index e16478067..5c2f66348 100644 --- a/app/src/main/res/drawable/shape_rectangle_white_background.xml +++ b/app/src/main/res/drawable/shape_rectangle_white_background.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_popup_menu_background.xml b/app/src/main/res/drawable/shape_round_popup_menu_background.xml index c5dcef1ac..835ee8658 100644 --- a/app/src/main/res/drawable/shape_round_popup_menu_background.xml +++ b/app/src/main/res/drawable/shape_round_popup_menu_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_contact_trust_r50_background.xml b/app/src/main/res/drawable/shape_squircle_contact_trust_r50_background.xml new file mode 100644 index 000000000..d61d1c266 --- /dev/null +++ b/app/src/main/res/drawable/shape_squircle_contact_trust_r50_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_background.xml b/app/src/main/res/drawable/shape_squircle_white_background.xml index 3251f7fd6..2eb316e8c 100644 --- a/app/src/main/res/drawable/shape_squircle_white_background.xml +++ b/app/src/main/res/drawable/shape_squircle_white_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_background_bottom.xml b/app/src/main/res/drawable/shape_squircle_white_background_bottom.xml index 98c38f43b..d7b6bb5a4 100644 --- a/app/src/main/res/drawable/shape_squircle_white_background_bottom.xml +++ b/app/src/main/res/drawable/shape_squircle_white_background_bottom.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_background_top.xml b/app/src/main/res/drawable/shape_squircle_white_background_top.xml index 78cc98640..364ecb570 100644 --- a/app/src/main/res/drawable/shape_squircle_white_background_top.xml +++ b/app/src/main/res/drawable/shape_squircle_white_background_top.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_r10_background.xml b/app/src/main/res/drawable/shape_squircle_white_r10_background.xml index 72d82c99f..c36cad7ab 100644 --- a/app/src/main/res/drawable/shape_squircle_white_r10_background.xml +++ b/app/src/main/res/drawable/shape_squircle_white_r10_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_white_r15_background.xml b/app/src/main/res/drawable/shape_squircle_white_r15_background.xml index 2f11b332e..1711b6d29 100644 --- a/app/src/main/res/drawable/shape_squircle_white_r15_background.xml +++ b/app/src/main/res/drawable/shape_squircle_white_r15_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_tertiary_button_background.xml b/app/src/main/res/drawable/shape_tertiary_button_background.xml index 49c2f23dc..a265a2d62 100644 --- a/app/src/main/res/drawable/shape_tertiary_button_background.xml +++ b/app/src/main/res/drawable/shape_tertiary_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_white_round.xml b/app/src/main/res/drawable/shape_white_round.xml index f7b6a85f1..267849450 100644 --- a/app/src/main/res/drawable/shape_white_round.xml +++ b/app/src/main/res/drawable/shape_white_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_zrtp_dialog_background.xml b/app/src/main/res/drawable/shape_zrtp_dialog_background.xml index 03b497e33..168583973 100644 --- a/app/src/main/res/drawable/shape_zrtp_dialog_background.xml +++ b/app/src/main/res/drawable/shape_zrtp_dialog_background.xml @@ -12,7 +12,7 @@ + android:color="@color/bc_white" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_zrtp_dialog_error_background.xml b/app/src/main/res/drawable/shape_zrtp_dialog_error_background.xml index e5bf1ba07..a6c18545c 100644 --- a/app/src/main/res/drawable/shape_zrtp_dialog_error_background.xml +++ b/app/src/main/res/drawable/shape_zrtp_dialog_error_background.xml @@ -12,7 +12,7 @@ + android:color="@color/bc_white" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_zrtp_dialog_warning_background.xml b/app/src/main/res/drawable/shape_zrtp_dialog_warning_background.xml index 271867917..e550c4cf7 100644 --- a/app/src/main/res/drawable/shape_zrtp_dialog_warning_background.xml +++ b/app/src/main/res/drawable/shape_zrtp_dialog_warning_background.xml @@ -12,7 +12,7 @@ + android:color="@color/bc_white" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/user_circle.xml b/app/src/main/res/drawable/user_circle.xml index 1fe63783f..4458ad8a3 100644 --- a/app/src/main/res/drawable/user_circle.xml +++ b/app/src/main/res/drawable/user_circle.xml @@ -5,5 +5,5 @@ android:viewportHeight="256"> + android:fillColor="?attr/color_avatar_text"/> diff --git a/app/src/main/res/drawable/users_three.xml b/app/src/main/res/drawable/users_three.xml index d3b0f5d96..91ebe1cec 100644 --- a/app/src/main/res/drawable/users_three.xml +++ b/app/src/main/res/drawable/users_three.xml @@ -5,5 +5,5 @@ android:viewportHeight="256"> + android:fillColor="?attr/color_avatar_text"/> diff --git a/app/src/main/res/drawable/video_conference.xml b/app/src/main/res/drawable/video_conference.xml index 22d115f50..1c14bcc5d 100644 --- a/app/src/main/res/drawable/video_conference.xml +++ b/app/src/main/res/drawable/video_conference.xml @@ -5,5 +5,5 @@ android:viewportHeight="256"> + android:fillColor="?attr/color_avatar_text"/> diff --git a/app/src/main/res/layout-land/bottom_nav_bar.xml b/app/src/main/res/layout-land/bottom_nav_bar.xml index ea5f241ca..727ac6e96 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/app/src/main/res/layout-land/bottom_nav_bar.xml @@ -15,7 +15,7 @@ android:id="@+id/bottom_nav_bar" android:layout_width="@dimen/landscape_nav_bar_width" android:layout_height="match_parent" - android:background="?attr/color_main2_000"> + android:background="?attr/color_background_contrast_in_dark_mode"> @@ -137,7 +137,7 @@ android:contentDescription="@string/content_description_go_back_icon" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/hinge_top" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -231,7 +231,7 @@ android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}" android:contentDescription="@string/content_description_show_call_statistics" android:visibility="@{!viewModel.fullScreenMode && !viewModel.pipMode && !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}" - android:tint="@{viewModel.qualityValue >= 2 ? @color/white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/white}" + android:tint="@{viewModel.qualityValue >= 2 ? @color/bc_white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/bc_white}" app:layout_constraintTop_toTopOf="@id/back" app:layout_constraintBottom_toBottomOf="@id/back" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml b/app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml index 574332858..04edd4d66 100644 --- a/app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml +++ b/app/src/main/res/layout-land/call_conference_active_speaker_fragment.xml @@ -54,7 +54,7 @@ android:layout_height="@dimen/big_icon_size" android:indeterminate="true" android:visibility="@{conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}" - app:indicatorColor="@color/white" + app:indicatorColor="@color/bc_white" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout" app:layout_constraintStart_toStartOf="parent" @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/conference_participant_joining_text" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="16sp" android:visibility="@{conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/joining" @@ -82,7 +82,7 @@ android:contentDescription="@null" android:src="@drawable/pause" android:visibility="@{!conferenceViewModel.activeSpeaker.isInConference && !conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintEnd_toStartOf="@id/active_speaker_miniatures_vertical_layout" app:layout_constraintStart_toStartOf="parent" @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/conference_participant_paused_text" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="16sp" android:visibility="@{!conferenceViewModel.activeSpeaker.isInConference && !conferenceViewModel.activeSpeaker.isJoining ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/paused" @@ -111,7 +111,7 @@ android:layout_marginStart="10dp" android:layout_marginBottom="10dp" android:text="@{conferenceViewModel.activeSpeaker.name, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -123,7 +123,7 @@ android:layout_height="wrap_content" android:layout_marginStart="5dp" android:text="@string/conference_active_speaker_is_screen_sharing" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="20sp" android:visibility="@{conferenceViewModel.isScreenSharing ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintBottom_toBottomOf="@id/active_speaker_name" diff --git a/app/src/main/res/layout-land/call_ended_fragment.xml b/app/src/main/res/layout-land/call_ended_fragment.xml index a96c2a90c..a3229a2eb 100644 --- a/app/src/main/res/layout-land/call_ended_fragment.xml +++ b/app/src/main/res/layout-land/call_ended_fragment.xml @@ -25,7 +25,7 @@ android:contentDescription="@string/content_description_go_back_icon" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> diff --git a/app/src/main/res/layout-land/call_incoming_fragment.xml b/app/src/main/res/layout-land/call_incoming_fragment.xml index 33b45dfe6..3a98572aa 100644 --- a/app/src/main/res/layout-land/call_incoming_fragment.xml +++ b/app/src/main/res/layout-land/call_incoming_fragment.xml @@ -26,7 +26,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="invisible" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -106,7 +106,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" - app:indicatorColor="@color/white" + app:indicatorColor="@color/bc_white" app:indicatorSize="28dp" app:layout_constraintStart_toEndOf="@id/name_address" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml index bf7e73ef8..e82584286 100644 --- a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -52,7 +52,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_media_encryption_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" app:layout_columnSpan="2"/> @@ -64,7 +64,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.mediaEncryption, default=`Media Encryption: Post Quantum ZRTP`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" app:layout_columnWeight="1" /> @@ -76,7 +76,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpCipher, default=@string/call_stats_zrtp_cipher_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" app:layout_columnWeight="1"/> @@ -89,7 +89,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpKeyAgreement, default=@string/call_stats_zrtp_key_agreement_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" app:layout_columnWeight="1" /> @@ -102,7 +102,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpHash, default=@string/call_stats_zrtp_hash_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" app:layout_columnWeight="1" /> @@ -115,7 +115,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpAuthTag, default=@string/call_stats_zrtp_auth_tag_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" app:layout_columnWeight="1" /> @@ -128,7 +128,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpAuthSas, default=@string/call_stats_zrtp_sas_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" app:layout_columnWeight="1" /> diff --git a/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml b/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml index d2d769ded..0e1459119 100644 --- a/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_numpad_bottom_sheet.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="30sp" android:text="@{model.digits, default=`0123456789`}" android:background="@color/transparent_color" @@ -67,7 +67,7 @@ android:contentDescription="@string/content_description_erase_last_input" android:padding="20dp" android:elevation="3dp" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintStart_toEndOf="@id/digits_history" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout-land/call_outgoing_fragment.xml b/app/src/main/res/layout-land/call_outgoing_fragment.xml index 1711e5539..ccd8e5202 100644 --- a/app/src/main/res/layout-land/call_outgoing_fragment.xml +++ b/app/src/main/res/layout-land/call_outgoing_fragment.xml @@ -26,7 +26,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="invisible" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true" - app:indicatorColor="@color/white" + app:indicatorColor="@color/bc_white" app:indicatorSize="28dp" app:layout_constraintStart_toEndOf="@id/name_address" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-land/call_stats_bottom_sheet.xml b/app/src/main/res/layout-land/call_stats_bottom_sheet.xml index a954444b2..70a078608 100644 --- a/app/src/main/res/layout-land/call_stats_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_stats_bottom_sheet.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -56,7 +56,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_audio_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" /> @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.audioBandwidth, default=@string/call_stats_bandwidth_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.lossRate, default=@string/call_stats_loss_rate_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -99,7 +99,7 @@ android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="@{model.jitterBuffer, default=@string/call_stats_jitter_buffer_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -129,7 +129,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_video_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" /> @@ -149,7 +149,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.videoBandwidth, default=@string/call_stats_bandwidth_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -160,7 +160,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.videoLossRate, default=@string/call_stats_loss_rate_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.videoResolution, default=@string/call_stats_resolution_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -183,7 +183,7 @@ android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="@{model.videoFps, default=@string/call_stats_fps_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -214,7 +214,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_fec_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" /> @@ -234,7 +234,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.repairedPackets, default=@string/call_stats_fec_repaired_packets_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -245,7 +245,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.fecBandwidth, default=@string/call_stats_fec_lost_bandwidth_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> diff --git a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml index d98c8846c..b517e027e 100644 --- a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml +++ b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml @@ -22,7 +22,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> @@ -65,7 +65,7 @@ android:paddingStart="20dp" android:text="@string/call_zrtp_sas_validation_skip" android:textSize="13sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> diff --git a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml index d8cece405..c8ba7cf0a 100644 --- a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml +++ b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml @@ -38,7 +38,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -124,7 +124,7 @@ android:background="@drawable/shape_red_button_background" android:text="@string/call_action_hang_up" android:textSize="18sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" app:layout_constraintWidth_max="@dimen/button_max_width" diff --git a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml index 5460fdd16..f00ec2703 100644 --- a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml +++ b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml @@ -46,7 +46,7 @@ android:layout_marginStart="10dp" android:layout_marginEnd="10dp" android:text="@{viewModel.subject, default=`Meeting with John Doe`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" app:layout_constraintTop_toTopOf="@id/back" @@ -61,7 +61,7 @@ android:layout_marginEnd="10dp" android:text="@{viewModel.dateTime, default=`Wed. 25 Oct. 14:00 - 15:00`}" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/back" app:layout_constraintTop_toBottomOf="@id/title" @@ -109,7 +109,7 @@ android:layout_marginStart="12dp" android:layout_marginBottom="8dp" android:text="@{viewModel.selfAvatar.name, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="20sp" app:layout_constraintBottom_toBottomOf="@id/no_video_background" app:layout_constraintStart_toStartOf="@id/no_video_background" /> @@ -124,7 +124,7 @@ android:visibility="@{viewModel.isVideoAvailable && viewModel.isVideoEnabled && viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}" android:src="@drawable/camera_rotate" android:contentDescription="@string/content_description_change_camera" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="@id/video_preview" app:layout_constraintEnd_toEndOf="@id/video_preview" /> @@ -213,7 +213,7 @@ android:layout_height="wrap_content" android:text="@string/meeting_waiting_room_joining_title" android:textSize="22sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" @@ -229,7 +229,7 @@ android:layout_marginTop="20dp" android:text="@string/meeting_waiting_room_joining_subtitle" android:textSize="14sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml index c2aeabf7c..c37a87ee4 100644 --- a/app/src/main/res/layout/account_list_cell.xml +++ b/app/src/main/res/layout/account_list_cell.xml @@ -144,7 +144,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 5c00f4957..91697acda 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -40,7 +40,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="@color/bc_black"> diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml index 9e304224a..0de55daeb 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="16dp" - android:background="?attr/color_main2_000"> + android:background="?attr/color_background_contrast_in_dark_mode"> @@ -40,7 +40,7 @@ android:src="@drawable/phone_disconnect" android:contentDescription="@string/content_description_hang_up_call" android:background="@drawable/squircle_red_button_background" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"/> diff --git a/app/src/main/res/layout/call_active_conference_fragment.xml b/app/src/main/res/layout/call_active_conference_fragment.xml index 111bc9419..6db1e84d0 100644 --- a/app/src/main/res/layout/call_active_conference_fragment.xml +++ b/app/src/main/res/layout/call_active_conference_fragment.xml @@ -81,7 +81,7 @@ android:contentDescription="@string/content_description_go_back_icon" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/hinge_top" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -172,7 +172,7 @@ android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}" android:contentDescription="@string/content_description_show_call_statistics" android:visibility="@{!viewModel.fullScreenMode && !viewModel.pipMode && !conferenceViewModel.isPaused ? View.VISIBLE : View.GONE}" - android:tint="@{viewModel.qualityValue >= 2 ? @color/white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/white}" + android:tint="@{viewModel.qualityValue >= 2 ? @color/bc_white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/bc_white}" app:layout_constraintTop_toTopOf="@id/back" app:layout_constraintBottom_toBottomOf="@id/back" app:layout_constraintEnd_toEndOf="parent" @@ -197,7 +197,7 @@ android:layout_marginStart="5dp" android:layout_marginEnd="5dp" android:text="@string/conference_call_empty" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="22sp" android:gravity="center" android:visibility="@{conferenceViewModel.participantDevices.size() > 1 ? View.GONE : View.VISIBLE}" diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml index 815441794..1d88bb538 100644 --- a/app/src/main/res/layout/call_active_fragment.xml +++ b/app/src/main/res/layout/call_active_fragment.xml @@ -82,7 +82,7 @@ android:layout_marginTop="15dp" android:text="@{viewModel.displayedName, default=`John Doe`}" android:textSize="22sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:visibility="@{viewModel.pipMode || viewModel.halfOpenedFolded ? View.GONE : View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -96,7 +96,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="5dp" android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="14sp" android:visibility="@{viewModel.pipMode || viewModel.halfOpenedFolded ? View.GONE : View.VISIBLE}" app:layout_constraintTop_toBottomOf="@id/display_name" @@ -135,7 +135,7 @@ android:contentDescription="@string/content_description_go_back_icon" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/hinge_top" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -229,7 +229,7 @@ android:src="@{viewModel.qualityIcon, default=@drawable/cell_signal_full}" android:contentDescription="@string/content_description_show_call_statistics" android:visibility="@{!viewModel.fullScreenMode && !viewModel.pipMode && !(viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE}" - android:tint="@{viewModel.qualityValue >= 2 ? @color/white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/white}" + android:tint="@{viewModel.qualityValue >= 2 ? @color/bc_white : viewModel.qualityValue >= 1 ? @color/orange_warning_600 : @color/red_danger_500, default=@color/bc_white}" app:layout_constraintTop_toTopOf="@id/back" app:layout_constraintBottom_toBottomOf="@id/back" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_activity_other_calls_top_bar.xml b/app/src/main/res/layout/call_activity_other_calls_top_bar.xml index 62fbdfb5b..c4cded125 100644 --- a/app/src/main/res/layout/call_activity_other_calls_top_bar.xml +++ b/app/src/main/res/layout/call_activity_other_calls_top_bar.xml @@ -28,7 +28,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/call_display_name" app:layout_constraintBottom_toBottomOf="@id/call_display_name" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_marginStart="5dp" android:text="@string/conference_active_speaker_is_screen_sharing" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="20sp" android:visibility="@{conferenceViewModel.isScreenSharing ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintBottom_toBottomOf="@id/active_speaker_name" diff --git a/app/src/main/res/layout/call_conference_audio_only_cell.xml b/app/src/main/res/layout/call_conference_audio_only_cell.xml index f472c3573..4a656870f 100644 --- a/app/src/main/res/layout/call_conference_audio_only_cell.xml +++ b/app/src/main/res/layout/call_conference_audio_only_cell.xml @@ -59,7 +59,7 @@ android:layout_marginEnd="10dp" android:indeterminate="true" android:visibility="@{model.isJoining ? View.VISIBLE : View.GONE, default=gone}" - app:indicatorColor="@color/white" + app:indicatorColor="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@id/paused" app:layout_constraintBottom_toBottomOf="parent" /> @@ -72,7 +72,7 @@ android:contentDescription="@null" android:src="@drawable/pause" android:visibility="@{!model.isInConference && !model.isJoining ? View.VISIBLE : View.GONE, default=gone}" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> @@ -87,7 +87,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="@{model.name, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" diff --git a/app/src/main/res/layout/call_conference_grid_cell.xml b/app/src/main/res/layout/call_conference_grid_cell.xml index d0b865a98..ad95d0711 100644 --- a/app/src/main/res/layout/call_conference_grid_cell.xml +++ b/app/src/main/res/layout/call_conference_grid_cell.xml @@ -55,7 +55,7 @@ android:layout_height="@dimen/big_icon_size" android:indeterminate="true" android:visibility="@{model.isJoining ? View.VISIBLE : View.GONE, default=gone}" - app:indicatorColor="@color/white" + app:indicatorColor="@color/bc_white" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/conference_participant_joining_text" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="16sp" android:visibility="@{model.isJoining ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/joining" @@ -83,7 +83,7 @@ android:contentDescription="@null" android:src="@drawable/pause" android:visibility="@{!model.isInConference && !model.isJoining ? View.VISIBLE : View.GONE, default=gone}" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -96,7 +96,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/conference_participant_paused_text" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="16sp" android:visibility="@{!model.isInConference && !model.isJoining ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintTop_toBottomOf="@id/paused" @@ -127,7 +127,7 @@ android:layout_marginEnd="12dp" android:layout_marginBottom="8dp" android:text="@{model.name, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="20sp" android:maxLines="1" android:ellipsize="end" diff --git a/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml b/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml index fd5f6afdd..337e428a1 100644 --- a/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml +++ b/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml @@ -51,14 +51,14 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@string/conference_layout_active_speaker" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center_vertical" android:layout_marginBottom="1dp" android:drawableEnd="@drawable/picture_in_picture" - android:drawableTint="@color/white" + android:drawableTint="@color/bc_white" android:checked="@{viewModel.conferenceLayout == ConferenceViewModel.ACTIVE_SPEAKER_LAYOUT}" app:useMaterialThemeColors="false" - app:buttonTint="@color/white"/> + app:buttonTint="@color/bc_white"/> + app:buttonTint="@color/bc_white"/> diff --git a/app/src/main/res/layout/call_conference_participant_list_cell.xml b/app/src/main/res/layout/call_conference_participant_list_cell.xml index cee4bf129..76cb28823 100644 --- a/app/src/main/res/layout/call_conference_participant_list_cell.xml +++ b/app/src/main/res/layout/call_conference_participant_list_cell.xml @@ -112,7 +112,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_ended_actions.xml b/app/src/main/res/layout/call_ended_actions.xml index ff06036ec..30446f71e 100644 --- a/app/src/main/res/layout/call_ended_actions.xml +++ b/app/src/main/res/layout/call_ended_actions.xml @@ -23,7 +23,7 @@ android:src="@drawable/animated_caret_to_handle" android:visibility="invisible" android:contentDescription="@string/content_description_toggle_bottom_sheet" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml index 2f959c0fe..3b1aa3bcf 100644 --- a/app/src/main/res/layout/call_ended_fragment.xml +++ b/app/src/main/res/layout/call_ended_fragment.xml @@ -25,7 +25,7 @@ android:contentDescription="@string/content_description_go_back_icon" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> + app:tint="@color/bc_white" /> + app:tint="@color/bc_white" /> + app:tint="@color/bc_white" /> diff --git a/app/src/main/res/layout/call_incoming_fragment.xml b/app/src/main/res/layout/call_incoming_fragment.xml index 6fdf8e7ad..4c2fc269c 100644 --- a/app/src/main/res/layout/call_incoming_fragment.xml +++ b/app/src/main/res/layout/call_incoming_fragment.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="5dp" android:indeterminate="true" - app:indicatorColor="@color/white" + app:indicatorColor="@color/bc_white" app:indicatorSize="28dp" app:layout_constraintStart_toStartOf="@id/avatar" app:layout_constraintEnd_toEndOf="@id/avatar" @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="@{viewModel.displayedName, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="22sp" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintBottom_toBottomOf="@id/address" @@ -84,7 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="14sp" android:visibility="@{viewModel.conferenceModel.isCurrentCallInConference ? View.GONE : View.VISIBLE}" app:layout_constraintTop_toBottomOf="@id/name" diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml index 220703d9f..944de127e 100644 --- a/app/src/main/res/layout/call_list_cell.xml +++ b/app/src/main/res/layout/call_list_cell.xml @@ -82,7 +82,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_media_encryption_info.xml b/app/src/main/res/layout/call_media_encryption_info.xml index fe8664683..c011d486c 100644 --- a/app/src/main/res/layout/call_media_encryption_info.xml +++ b/app/src/main/res/layout/call_media_encryption_info.xml @@ -52,7 +52,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/wait_for_encryption_info_label" app:layout_constraintBottom_toBottomOf="@id/wait_for_encryption_info_label" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> + app:tint="@color/bc_white" /> @@ -52,7 +52,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_media_encryption_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" /> @@ -86,7 +86,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpKeyAgreement, default=@string/call_stats_zrtp_key_agreement_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" /> @@ -98,7 +98,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpHash, default=@string/call_stats_zrtp_hash_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" /> @@ -110,7 +110,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpAuthTag, default=@string/call_stats_zrtp_auth_tag_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" /> @@ -122,7 +122,7 @@ android:layout_marginEnd="16dp" android:layout_marginTop="10dp" android:text="@{model.zrtpAuthSas, default=@string/call_stats_zrtp_sas_algo}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}" /> diff --git a/app/src/main/res/layout/call_numpad_bottom_sheet.xml b/app/src/main/res/layout/call_numpad_bottom_sheet.xml index 4b79e9cea..5d7ef6086 100644 --- a/app/src/main/res/layout/call_numpad_bottom_sheet.xml +++ b/app/src/main/res/layout/call_numpad_bottom_sheet.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -42,7 +42,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="30sp" android:text="@{model.digits, default=`0123456789`}" android:background="@color/transparent_color" @@ -67,7 +67,7 @@ android:contentDescription="@string/content_description_erase_last_input" android:padding="20dp" android:elevation="3dp" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toBottomOf="@id/numpad_handle" app:layout_constraintStart_toEndOf="@id/digits_history" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/call_outgoing_actions.xml b/app/src/main/res/layout/call_outgoing_actions.xml index 6893b6c84..6fade97cb 100644 --- a/app/src/main/res/layout/call_outgoing_actions.xml +++ b/app/src/main/res/layout/call_outgoing_actions.xml @@ -41,7 +41,7 @@ android:src="@drawable/phone_disconnect" android:contentDescription="@string/content_description_hang_up_call" android:background="@drawable/squircle_red_button_background" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toBottomOf="@id/call_actions_handle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"/> diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml index f8f864b3d..d61257dee 100644 --- a/app/src/main/res/layout/call_outgoing_fragment.xml +++ b/app/src/main/res/layout/call_outgoing_fragment.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="5dp" android:indeterminate="true" - app:indicatorColor="@color/white" + app:indicatorColor="@color/bc_white" app:indicatorSize="28dp" app:layout_constraintStart_toStartOf="@id/avatar" app:layout_constraintEnd_toEndOf="@id/avatar" @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="@{viewModel.displayedName, default=`John Doe`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="22sp" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintBottom_toTopOf="@id/address" @@ -84,7 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/name" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/call_stats_bottom_sheet.xml b/app/src/main/res/layout/call_stats_bottom_sheet.xml index 17ec80ebf..1be759c1b 100644 --- a/app/src/main/res/layout/call_stats_bottom_sheet.xml +++ b/app/src/main/res/layout/call_stats_bottom_sheet.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -54,7 +54,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_audio_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" /> @@ -74,7 +74,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.audioBandwidth, default=@string/call_stats_bandwidth_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -85,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.lossRate, default=@string/call_stats_loss_rate_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -97,7 +97,7 @@ android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="@{model.jitterBuffer, default=@string/call_stats_jitter_buffer_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -126,7 +126,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_video_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" /> @@ -146,7 +146,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.videoBandwidth, default=@string/call_stats_bandwidth_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -157,7 +157,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.videoLossRate, default=@string/call_stats_loss_rate_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.videoResolution, default=@string/call_stats_resolution_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -180,7 +180,7 @@ android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:text="@{model.videoFps, default=@string/call_stats_fps_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -209,7 +209,7 @@ android:layout_marginTop="10dp" android:text="@string/call_stats_fec_title" android:textSize="12sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" /> @@ -229,7 +229,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.repairedPackets, default=@string/call_stats_fec_repaired_packets_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> @@ -240,7 +240,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{model.fecBandwidth, default=@string/call_stats_fec_lost_bandwidth_label}" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" android:gravity="center" /> diff --git a/app/src/main/res/layout/call_transfer_fragment.xml b/app/src/main/res/layout/call_transfer_fragment.xml index 2f148db08..b642fa1e3 100644 --- a/app/src/main/res/layout/call_transfer_fragment.xml +++ b/app/src/main/res/layout/call_transfer_fragment.xml @@ -29,7 +29,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="?attr/color_background_contrast_in_dark_mode"> + + + android:background="?attr/color_separator"> + app:tint="@color/bc_white" /> + android:background="?attr/color_separator"/> + android:background="?attr/color_separator"/> + android:background="?attr/color_separator"/> + app:tint="@color/bc_white" /> + app:tint="@color/bc_white" /> + android:background="?attr/color_background_contrast_in_dark_mode"> + + + android:background="?attr/color_conversation_send_area_background"> + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="?attr/color_background_contrast_in_dark_mode"> @@ -523,7 +523,7 @@ android:layout_height="1dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="?attr/color_main2_200" + android:background="@color/gray_main2_200" android:visibility="@{!viewModel.isGroup && !viewModel.friendAvailable ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintEnd_toEndOf="@id/action_add_to_contacts" app:layout_constraintStart_toStartOf="@id/action_add_to_contacts" @@ -534,7 +534,7 @@ android:layout_height="1dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="?attr/color_main2_200" + android:background="@color/gray_main2_200" android:visibility="@{!viewModel.isGroup && viewModel.friendAvailable ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintEnd_toEndOf="@id/action_see_contact" app:layout_constraintStart_toStartOf="@id/action_see_contact" @@ -545,7 +545,7 @@ android:layout_height="1dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="?attr/color_main2_200" + android:background="@color/gray_main2_200" android:visibility="@{viewModel.isEndToEndEncrypted && !viewModel.isReadOnly ? View.VISIBLE : View.GONE}" app:layout_constraintEnd_toEndOf="@id/action_ephemeral_messages" app:layout_constraintStart_toStartOf="@id/action_ephemeral_messages" @@ -556,7 +556,7 @@ android:layout_height="1dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="?attr/color_main2_200" + android:background="@color/gray_main2_200" android:visibility="@{viewModel.isGroup && !viewModel.isReadOnly ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintEnd_toEndOf="@id/action_leave_group" app:layout_constraintStart_toStartOf="@id/action_leave_group" diff --git a/app/src/main/res/layout/chat_long_press_menu.xml b/app/src/main/res/layout/chat_long_press_menu.xml index 80ea14df5..77491e404 100644 --- a/app/src/main/res/layout/chat_long_press_menu.xml +++ b/app/src/main/res/layout/chat_long_press_menu.xml @@ -36,7 +36,7 @@ + android:background="?attr/color_separator"> + app:tint="@color/bc_white" /> diff --git a/app/src/main/res/layout/chat_media_fragment.xml b/app/src/main/res/layout/chat_media_fragment.xml index dfdb3a55e..e77b4e939 100644 --- a/app/src/main/res/layout/chat_media_fragment.xml +++ b/app/src/main/res/layout/chat_media_fragment.xml @@ -15,7 +15,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="?attr/color_background_contrast_in_dark_mode"> diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index 2e1d75760..e34c6ccde 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -66,7 +66,7 @@ android:src="@drawable/pencil_simple" android:contentDescription="@string/content_description_contact_edit" android:visibility="@{viewModel.isStored ? View.VISIBLE : View.GONE}" - app:tint="?attr/color_main1_500" + app:tint="?attr/color_main2_500" app:layout_constraintBottom_toBottomOf="@id/invisible_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/invisible_title" /> @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="trusted_devices_count, trusted_devices_progress, devices, trusted_devices_progress_label" - android:visibility="@{viewModel.showContactTrustAndDevices ? (viewModel.expandDevicesTrust && viewModel.devices.size() > 0 ? View.VISIBLE : View.GONE) : View.GONE, default=gone}" /> + android:visibility="@{viewModel.showContactTrustAndDevices ? (viewModel.expandDevicesTrust && viewModel.devices.size() > 0 ? View.VISIBLE : View.GONE) : View.GONE}" /> - + app:layout_constraintTop_toBottomOf="@id/trusted_devices_count" /> + + @@ -86,7 +87,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml index f4cd0e168..24f148d56 100644 --- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml +++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml @@ -22,7 +22,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="?attr/color_separator"> + android:background="?attr/color_separator"> @@ -62,7 +62,7 @@ android:paddingStart="20dp" android:text="@string/call_zrtp_sas_validation_skip" android:textSize="13sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> diff --git a/app/src/main/res/layout/dialog_zrtp_security_alert.xml b/app/src/main/res/layout/dialog_zrtp_security_alert.xml index 5fa3f1643..6f2e30924 100644 --- a/app/src/main/res/layout/dialog_zrtp_security_alert.xml +++ b/app/src/main/res/layout/dialog_zrtp_security_alert.xml @@ -35,7 +35,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:tint="@color/white" /> + app:tint="@color/bc_white" /> @@ -118,7 +118,7 @@ android:background="@drawable/shape_red_button_background" android:text="@string/call_action_hang_up" android:textSize="18sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:maxLines="1" android:ellipsize="end" app:layout_constraintWidth_max="@dimen/button_max_width" diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml index 44b79dbd3..b18c33227 100644 --- a/app/src/main/res/layout/drawer_menu.xml +++ b/app/src/main/res/layout/drawer_menu.xml @@ -135,7 +135,7 @@ android:layout_marginBottom="15dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@id/shortcuts" /> @@ -218,7 +218,7 @@ android:layout_marginBottom="15dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="@{viewModel.hideQuitButton ? View.GONE : View.VISIBLE, default=gone}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/file_media_viewer_activity.xml b/app/src/main/res/layout/file_media_viewer_activity.xml index e8876d093..e02561b40 100644 --- a/app/src/main/res/layout/file_media_viewer_activity.xml +++ b/app/src/main/res/layout/file_media_viewer_activity.xml @@ -24,7 +24,7 @@ + android:background="@color/bc_black"> + android:background="@color/bc_black"> + app:tint="@color/bc_white" /> + app:tint="@color/bc_white"/> diff --git a/app/src/main/res/layout/file_viewer_activity.xml b/app/src/main/res/layout/file_viewer_activity.xml index cdd01e0da..f06de0fe2 100644 --- a/app/src/main/res/layout/file_viewer_activity.xml +++ b/app/src/main/res/layout/file_viewer_activity.xml @@ -19,7 +19,7 @@ + android:background="@color/bc_black"> diff --git a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml index 25e5e8712..daf32b909 100644 --- a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml +++ b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml @@ -75,6 +75,7 @@ android:textSize="14sp" android:maxLines="1" android:ellipsize="end" + android:textColor="?attr/color_main2_700" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/selected" app:layout_constraintTop_toTopOf="parent" @@ -97,7 +98,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml index 88c11cdb9..1e5a2d57a 100644 --- a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml +++ b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml @@ -57,6 +57,7 @@ android:textSize="14sp" android:maxLines="1" android:ellipsize="end" + android:textColor="?attr/color_main2_700" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/selected" app:layout_constraintTop_toTopOf="parent" @@ -79,7 +80,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml b/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml index 2d1e482cd..a134fd1a1 100644 --- a/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml +++ b/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml @@ -46,6 +46,7 @@ android:textSize="14sp" android:maxLines="1" android:ellipsize="end" + android:textColor="?attr/color_main2_700" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/selected" app:layout_constraintTop_toTopOf="parent" @@ -68,7 +69,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml index dd5a54f2a..5450fd7f1 100644 --- a/app/src/main/res/layout/help_debug_fragment.xml +++ b/app/src/main/res/layout/help_debug_fragment.xml @@ -26,7 +26,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> + + + android:background="?attr/color_background_contrast_in_dark_mode"> + + + android:background="?attr/color_background_contrast_in_dark_mode"> diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml index ed9f82fd7..2ad44e51d 100644 --- a/app/src/main/res/layout/history_list_cell.xml +++ b/app/src/main/res/layout/history_list_cell.xml @@ -98,7 +98,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginEnd="10dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="gone" app:layout_constraintStart_toStartOf="@id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/history_list_long_press_menu.xml b/app/src/main/res/layout/history_list_long_press_menu.xml index a077f0f31..9a568605b 100644 --- a/app/src/main/res/layout/history_list_long_press_menu.xml +++ b/app/src/main/res/layout/history_list_long_press_menu.xml @@ -24,7 +24,7 @@ + android:background="?attr/color_separator"> + app:tint="@color/bc_white" /> + android:background="?attr/color_background_contrast_in_dark_mode"> + app:layout_constraintTop_toBottomOf="@id/subject" /> + app:layout_constraintTop_toBottomOf="@id/repeat" /> + app:layout_constraintTop_toBottomOf="@id/description" /> + app:layout_constraintTop_toBottomOf="@id/speakers" /> + app:layout_constraintTop_toTopOf="@id/add_more_participants" + app:tint="?attr/color_main2_600" /> + app:layout_constraintTop_toBottomOf="@id/participants_list" /> + android:background="?attr/color_background_contrast_in_dark_mode"> @@ -215,7 +216,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/timezone" /> @@ -246,7 +247,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="@{viewModel.description.length() > 0 ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -292,7 +293,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" android:visibility="@{viewModel.isBroadcast ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -333,7 +334,7 @@ android:id="@+id/separator_5" android:layout_width="0dp" android:layout_height="1dp" - android:background="?attr/color_main2_200" + android:background="?attr/color_separator" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/scrollView" /> diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml index 9b802dc1e..0ad34b408 100644 --- a/app/src/main/res/layout/meeting_schedule_fragment.xml +++ b/app/src/main/res/layout/meeting_schedule_fragment.xml @@ -32,7 +32,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> + app:layout_constraintTop_toBottomOf="@id/subject" /> + app:layout_constraintTop_toBottomOf="@id/repeat" /> + app:layout_constraintTop_toBottomOf="@id/description" /> + app:layout_constraintTop_toBottomOf="@id/speakers" /> + app:layout_constraintTop_toBottomOf="@id/participants_list" /> @@ -117,7 +117,7 @@ android:visibility="@{viewModel.isVideoAvailable && viewModel.isVideoEnabled && viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}" android:src="@drawable/camera_rotate" android:contentDescription="@string/content_description_change_camera" - app:tint="@color/white" + app:tint="@color/bc_white" app:layout_constraintTop_toTopOf="@id/video_preview" app:layout_constraintEnd_toEndOf="@id/video_preview" /> @@ -209,7 +209,7 @@ android:layout_height="wrap_content" android:text="@string/meeting_waiting_room_joining_title" android:textSize="22sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" @@ -225,7 +225,7 @@ android:layout_marginTop="20dp" android:text="@string/meeting_waiting_room_joining_subtitle" android:textSize="14sp" - android:textColor="@color/white" + android:textColor="@color/bc_white" android:gravity="center" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/meetings_list_long_press_menu.xml b/app/src/main/res/layout/meetings_list_long_press_menu.xml index 931b4cf63..4498d4b65 100644 --- a/app/src/main/res/layout/meetings_list_long_press_menu.xml +++ b/app/src/main/res/layout/meetings_list_long_press_menu.xml @@ -12,7 +12,7 @@ + android:background="?attr/color_separator"> + android:background="@color/bc_black"> + app:tint="@color/bc_white" /> + app:tint="@color/bc_white"/> @@ -101,7 +101,7 @@ android:id="@+id/top_bar_background" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/white" + android:background="@color/bc_white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/recordings_list_fragment.xml b/app/src/main/res/layout/recordings_list_fragment.xml index 076d87dc9..837af977e 100644 --- a/app/src/main/res/layout/recordings_list_fragment.xml +++ b/app/src/main/res/layout/recordings_list_fragment.xml @@ -16,9 +16,7 @@ + android:background="?attr/color_background_contrast_in_dark_mode"> + + + android:background="?attr/color_separator"> + android:background="?attr/color_background_contrast_in_dark_mode"> + android:background="?attr/color_background_contrast_in_dark_mode"> + app:layout_constraintTop_toBottomOf="@id/back" /> + android:background="?attr/color_background_contrast_in_dark_mode"> + app:layout_constraintTop_toBottomOf="@id/back" /> @@ -10,7 +10,7 @@ shortEdges true - @color/black + @color/background_color_dark_mode ?attr/color_main1_500 @color/orange_main_900 @@ -19,16 +19,16 @@ @color/orange_main_500 @color/orange_main_700 - @color/black + @color/background_color_dark_mode @color/gray_main2_800 @color/gray_main2_700 @color/gray_main2_700 @color/gray_main2_400 - @color/gray_main2_300 + @color/gray_main2_200 @color/gray_main2_200 @color/gray_main2_300 @color/gray_main2_200 - @color/white + @color/bc_white @color/gray_200_night @color/gray_600 @@ -51,7 +51,23 @@ @color/orange_warning_600_night - @color/white + @color/bc_white + @color/background_color_alt_dark_mode + @color/gray_main2_200 + @color/gray_main2_100 + @color/gray_main2_300 + + @color/text_field_background_color_dark_mode + @color/text_field_background_color_dark_mode + @color/gray_main2_300 + @color/background_color_alt_dark_mode + @color/text_field_background_color_dark_mode + + @color/background_color_alt_dark_mode + @color/background_color_alt_dark_mode + @color/gray_main2_600 + @color/text_field_background_color_dark_mode + @color/background_color_alt_dark_mode @@ -11,7 +11,7 @@ shortEdges true - @color/white + @color/bc_white ?attr/color_main1_500 @color/orange_main_100 @@ -20,7 +20,7 @@ @color/orange_main_500 @color/orange_main_700 - @color/white + @color/bc_white @color/gray_main2_100 @color/gray_main2_200 @color/gray_main2_300 @@ -29,7 +29,7 @@ @color/gray_main2_600 @color/gray_main2_700 @color/gray_main2_800 - @color/black + @color/bc_black @color/gray_100 @color/gray_200 @@ -52,7 +52,23 @@ @color/orange_warning_600 - @color/white + @color/bc_white + @color/bc_white + @color/gray_main2_200 + @color/gray_main2_600 + @color/gray_main2_400 + + @color/gray_100 + @color/gray_main2_200 + @color/gray_main2_600 + @color/gray_main2_100 + @color/orange_main_100 + + @color/gray_main2_100 + @color/bc_white + @color/gray_main2_100 + @color/blue_info_500 + @color/gray_100