From 9b690743525f4f5a8cfd82ea4041d38b85af018c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 1 Dec 2023 10:56:39 +0100 Subject: [PATCH] Updated colors in main call views to keep the same color no matter the light/dark theme --- .../res/color/in_call_button_tint_color.xml | 6 +++--- .../circle_white_button_background.xml | 2 +- app/src/main/res/drawable/linphone.xml | 2 +- .../shape_call_bottom_sheet_background.xml | 2 +- ...=> shape_circle_white_call_background.xml} | 2 +- .../shape_round_in_call_button_background.xml | 2 +- ...und_in_call_disabled_button_background.xml | 2 +- .../shape_round_in_call_gray_background.xml | 2 +- ...ound_in_call_pressed_button_background.xml | 2 +- ...squircle_gray_600_top_call_background.xml} | 2 +- ... shape_squircle_main2_200_call_border.xml} | 2 +- .../layout-land/call_actions_bottom_sheet.xml | 2 +- .../layout-land/dialog_confirm_zrtp_sas.xml | 8 ++++---- .../res/layout/call_actions_bottom_sheet.xml | 2 +- .../call_active_conference_fragment.xml | 8 ++++---- .../main/res/layout/call_active_fragment.xml | 8 ++++---- .../call_activity_other_calls_top_bar.xml | 6 +++--- .../layout/call_audio_device_list_cell.xml | 6 +++--- .../res/layout/call_audio_devices_menu.xml | 2 +- .../main/res/layout/call_common_actions.xml | 4 ++-- .../call_conference_actions_bottom_sheet.xml | 2 +- .../res/layout/call_conference_grid_cell.xml | 6 +++--- .../layout/call_conference_layout_menu.xml | 20 +++++++++---------- .../main/res/layout/call_ended_actions.xml | 4 ++-- .../main/res/layout/call_ended_fragment.xml | 6 +++--- .../res/layout/call_incoming_bottom_bar.xml | 4 ++-- .../res/layout/call_incoming_fragment.xml | 10 +++++----- .../res/layout/call_numpad_bottom_sheet.xml | 6 +++--- .../res/layout/call_outgoing_fragment.xml | 12 +++++------ .../res/layout/dialog_confirm_zrtp_sas.xml | 8 ++++---- app/src/main/res/values-night/themes.xml | 6 ++++++ app/src/main/res/values/styles.xml | 6 +++--- app/src/main/res/values/themes.xml | 3 ++- 33 files changed, 86 insertions(+), 79 deletions(-) rename app/src/main/res/drawable/{shape_circle_white_background.xml => shape_circle_white_call_background.xml} (75%) rename app/src/main/res/drawable/{shape_squircle_gray_600_top_background.xml => shape_squircle_gray_600_top_call_background.xml} (78%) rename app/src/main/res/drawable/{shape_squircle_main2_200_border.xml => shape_squircle_main2_200_call_border.xml} (71%) 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 7ba9fea56..1eda9d9d7 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/drawable/circle_white_button_background.xml b/app/src/main/res/drawable/circle_white_button_background.xml index e2feca243..83326874b 100644 --- a/app/src/main/res/drawable/circle_white_button_background.xml +++ b/app/src/main/res/drawable/circle_white_button_background.xml @@ -5,5 +5,5 @@ + android:drawable="@drawable/shape_circle_white_call_background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/linphone.xml b/app/src/main/res/drawable/linphone.xml index 2a373a596..e0e8e1829 100644 --- a/app/src/main/res/drawable/linphone.xml +++ b/app/src/main/res/drawable/linphone.xml @@ -14,7 +14,7 @@ diff --git a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml index 7e898c824..37ea330b5 100644 --- a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml +++ b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_circle_white_background.xml b/app/src/main/res/drawable/shape_circle_white_call_background.xml similarity index 75% rename from app/src/main/res/drawable/shape_circle_white_background.xml rename to app/src/main/res/drawable/shape_circle_white_call_background.xml index a73ea70ec..07f066002 100644 --- a/app/src/main/res/drawable/shape_circle_white_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_round_in_call_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_button_background.xml index 5ddeee1f7..97def84bb 100644 --- a/app/src/main/res/drawable/shape_round_in_call_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml index 6644edc2e..d242fd79e 100644 --- a/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_disabled_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml b/app/src/main/res/drawable/shape_round_in_call_gray_background.xml index 1c0bbc272..62367e1b1 100644 --- a/app/src/main/res/drawable/shape_round_in_call_gray_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_gray_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml b/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml index 327ee432c..2ce614341 100644 --- a/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml +++ b/app/src/main/res/drawable/shape_round_in_call_pressed_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml b/app/src/main/res/drawable/shape_squircle_gray_600_top_call_background.xml similarity index 78% rename from app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml rename to app/src/main/res/drawable/shape_squircle_gray_600_top_call_background.xml index 48ecb5101..8a888a493 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_600_top_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_600_top_call_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_main2_200_border.xml b/app/src/main/res/drawable/shape_squircle_main2_200_call_border.xml similarity index 71% rename from app/src/main/res/drawable/shape_squircle_main2_200_border.xml rename to app/src/main/res/drawable/shape_squircle_main2_200_call_border.xml index ef2e9e813..891993dc0 100644 --- a/app/src/main/res/drawable/shape_squircle_main2_200_border.xml +++ b/app/src/main/res/drawable/shape_squircle_main2_200_call_border.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml index e57ca4a9e..79bfd6145 100644 --- a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml @@ -95,7 +95,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" diff --git a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml index b3242a3c5..f73fad32a 100644 --- a/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout-land/dialog_confirm_zrtp_sas.xml @@ -71,7 +71,7 @@ android:text="@{viewModel.letters1, default=`RV`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/letters_2" @@ -89,7 +89,7 @@ android:text="@{viewModel.letters2, default=`PT`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toEndOf="@id/letters_1" app:layout_constraintEnd_toStartOf="@id/letters_3" @@ -106,7 +106,7 @@ android:text="@{viewModel.letters3, default=`BB`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toEndOf="@id/letters_2" app:layout_constraintEnd_toStartOf="@id/letters_4" @@ -122,7 +122,7 @@ android:text="@{viewModel.letters4, default=`NM`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toEndOf="@id/letters_3" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/call_actions_bottom_sheet.xml b/app/src/main/res/layout/call_actions_bottom_sheet.xml index 9e5b7413d..f5280b6b2 100644 --- a/app/src/main/res/layout/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_actions_bottom_sheet.xml @@ -92,7 +92,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" 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 177773a29..01fe199b3 100644 --- a/app/src/main/res/layout/call_active_conference_fragment.xml +++ b/app/src/main/res/layout/call_active_conference_fragment.xml @@ -37,7 +37,7 @@ android:id="@+id/constraint_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_grey_900"> + android:background="@color/gray_900"> @@ -186,7 +186,7 @@ android:layout_marginEnd="10dp" android:src="@drawable/camera_rotate" android:visibility="@{!viewModel.fullScreenMode && !viewModel.pipMode && viewModel.isVideoEnabled && viewModel.showSwitchCamera ? View.VISIBLE : View.GONE}" - app:tint="?attr/color_main2_000" + app:tint="@color/white" app:layout_constraintTop_toTopOf="@id/conference_subject" app:layout_constraintBottom_toBottomOf="@id/conference_subject" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml index a16dc9ecc..68ba6b761 100644 --- a/app/src/main/res/layout/call_active_fragment.xml +++ b/app/src/main/res/layout/call_active_fragment.xml @@ -31,7 +31,7 @@ android:id="@+id/constraint_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_grey_900"> + android:background="@color/gray_900"> 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 ca0937c61..d23af3eda 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 @@ -27,11 +27,11 @@ android:layout_marginBottom="5dp" android:gravity="center_vertical" android:text="@{viewModel.otherCallsLabel, default=`John Doe`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="16sp" android:drawableStart="@drawable/pause_call" android:drawablePadding="10dp" - android:drawableTint="?attr/color_main2_000" + android:drawableTint="@color/white" app:layout_constraintEnd_toStartOf="@id/call_time" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -45,7 +45,7 @@ android:layout_marginEnd="16dp" android:gravity="center_vertical" android:text="@{viewModel.otherCallsStatus, default=`Paused`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/call_display_name" diff --git a/app/src/main/res/layout/call_audio_device_list_cell.xml b/app/src/main/res/layout/call_audio_device_list_cell.xml index fdea0fb3a..e734f30dd 100644 --- a/app/src/main/res/layout/call_audio_device_list_cell.xml +++ b/app/src/main/res/layout/call_audio_device_list_cell.xml @@ -18,13 +18,13 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@{model.name, default=`Speaker`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:gravity="center_vertical" android:layout_marginBottom="1dp" android:drawableEnd="@{model.type == Type.Speaker ? @drawable/speaker_high : model.type == Type.Bluetooth || model.type == Type.HearingAid ? @drawable/bluetooth : model.type == Type.Headphones || model.type == Type.Headset ? @drawable/headset : @drawable/ear, default=@drawable/speaker_high}" - android:drawableTint="?attr/color_main2_000" + android:drawableTint="@color/white" android:checked="@{model.isCurrentlySelected}" app:useMaterialThemeColors="false" - app:buttonTint="?attr/color_main2_000"/> + app:buttonTint="@color/white"/> \ No newline at end of file diff --git a/app/src/main/res/layout/call_audio_devices_menu.xml b/app/src/main/res/layout/call_audio_devices_menu.xml index 585e8a2b9..40604b974 100644 --- a/app/src/main/res/layout/call_audio_devices_menu.xml +++ b/app/src/main/res/layout/call_audio_devices_menu.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="@drawable/shape_squircle_gray_600_top_background" + android:background="@drawable/shape_squircle_gray_600_top_call_background" entries="@{devices}" layout="@{@layout/call_audio_device_list_cell}"> diff --git a/app/src/main/res/layout/call_common_actions.xml b/app/src/main/res/layout/call_common_actions.xml index 27d12e35e..5600b4db7 100644 --- a/app/src/main/res/layout/call_common_actions.xml +++ b/app/src/main/res/layout/call_common_actions.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:padding="11dp" android:src="@drawable/shape_drawer_handle" - app:tint="?attr/color_main2_000" + app:tint="@color/white" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -43,7 +43,7 @@ android:paddingBottom="15dp" android:src="@drawable/phone_disconnect" android:background="@drawable/squircle_red_button_background" - app:tint="?attr/color_main2_000" + app:tint="@color/white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"/> diff --git a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml index 512c203fc..13d571094 100644 --- a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml @@ -91,7 +91,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" 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 2a830e2f0..c1c9d9f37 100644 --- a/app/src/main/res/layout/call_conference_grid_cell.xml +++ b/app/src/main/res/layout/call_conference_grid_cell.xml @@ -67,7 +67,7 @@ android:layout_marginEnd="10dp" android:padding="2dp" android:src="@drawable/microphone_slash" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:visibility="@{model.isMuted ? View.VISIBLE : View.GONE}" app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -80,7 +80,7 @@ android:layout_marginStart="12dp" android:layout_marginBottom="8dp" android:text="@{model.avatarModel.name, default=`John Doe`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -89,7 +89,7 @@ android:id="@+id/speaking" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@drawable/shape_squircle_main2_200_border" + android:src="@drawable/shape_squircle_main2_200_call_border" android:visibility="@{model.isSpeaking ? View.VISIBLE : View.GONE}" /> diff --git a/app/src/main/res/layout/call_conference_layout_menu.xml b/app/src/main/res/layout/call_conference_layout_menu.xml index f6a490aa1..232c2318b 100644 --- a/app/src/main/res/layout/call_conference_layout_menu.xml +++ b/app/src/main/res/layout/call_conference_layout_menu.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="@drawable/shape_squircle_gray_600_top_background"> + android:background="@drawable/shape_squircle_gray_600_top_call_background"> + app:buttonTint="@color/white"/> + app:buttonTint="@color/white"/> + app:buttonTint="@color/white"/> diff --git a/app/src/main/res/layout/call_ended_actions.xml b/app/src/main/res/layout/call_ended_actions.xml index 6e31a7ce3..d0a0a8246 100644 --- a/app/src/main/res/layout/call_ended_actions.xml +++ b/app/src/main/res/layout/call_ended_actions.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/call_main_actions_menu_height" android:paddingBottom="5dp" - android:background="?attr/color_grey_900"> + android:background="@color/gray_900"> diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml index 8c6b0a076..33f2031b1 100644 --- a/app/src/main/res/layout/call_ended_fragment.xml +++ b/app/src/main/res/layout/call_ended_fragment.xml @@ -13,7 +13,7 @@ + android:background="@color/gray_900"> + app:tint="@color/white" /> + app:tint="@color/white" /> diff --git a/app/src/main/res/layout/call_incoming_fragment.xml b/app/src/main/res/layout/call_incoming_fragment.xml index 61df46f0d..891b8882c 100644 --- a/app/src/main/res/layout/call_incoming_fragment.xml +++ b/app/src/main/res/layout/call_incoming_fragment.xml @@ -14,7 +14,7 @@ + android:background="@color/gray_900"> @@ -99,7 +99,7 @@ android:id="@+id/chronometer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="30sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -113,7 +113,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="@{viewModel.displayedName, default=`John Doe`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="22sp" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toStartOf="parent" @@ -125,7 +125,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/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_numpad_bottom_sheet.xml b/app/src/main/res/layout/call_numpad_bottom_sheet.xml index da01ed850..a86deb752 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="?attr/color_main2_000" + app:tint="@color/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="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="30sp" android:text="@{model.digits, default=`0123456789`}" android:background="@color/transparent_color" @@ -64,7 +64,7 @@ android:src="@drawable/backspace_fill" android:padding="20dp" android:elevation="3dp" - app:tint="?attr/color_main2_000" + app:tint="@color/white" app:layout_constraintTop_toBottomOf="@id/handle" app:layout_constraintStart_toEndOf="@id/digits_history" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml index 96e1679b4..3138aea26 100644 --- a/app/src/main/res/layout/call_outgoing_fragment.xml +++ b/app/src/main/res/layout/call_outgoing_fragment.xml @@ -14,7 +14,7 @@ + android:background="@color/gray_900"> + app:tint="@color/white" /> @@ -113,7 +113,7 @@ android:id="@+id/chronometer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="30sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -127,7 +127,7 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:text="@{viewModel.displayedName, default=`John Doe`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="22sp" app:layout_constraintTop_toBottomOf="@id/avatar" app:layout_constraintStart_toStartOf="parent" @@ -139,7 +139,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}" - android:textColor="?attr/color_main2_000" + android:textColor="@color/white" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/name" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml index 786e70ca4..1e1f8db2c 100644 --- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml @@ -71,7 +71,7 @@ android:text="@{viewModel.letters1, default=`RV`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/letters_2" @@ -88,7 +88,7 @@ android:text="@{viewModel.letters2, default=`PT`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toEndOf="@id/letters_1" app:layout_constraintEnd_toEndOf="parent" @@ -106,7 +106,7 @@ android:text="@{viewModel.letters3, default=`BB`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/letters_4" @@ -123,7 +123,7 @@ android:text="@{viewModel.letters4, default=`NM`}" android:textSize="32sp" android:gravity="center" - android:background="@drawable/shape_circle_white_background" + android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" app:layout_constraintStart_toEndOf="@id/letters_3" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 74e7f80c8..ee04ba422 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,8 +1,14 @@ + +