From e4d073471cf4e9ef1b0fbe19b60a3ecec8d6fb08 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 18 Jan 2024 10:49:12 +0100 Subject: [PATCH] More dark theme improvements --- .../notifications/NotificationsManager.kt | 8 +++---- ..._bubble_incoming_reactions_background.xml} | 0 ...t_bubble_outgoing_reactions_background.xml | 6 +++++ .../shape_squircle_gray_600_background.xml | 2 +- .../main/res/layout-land/bottom_nav_bar.xml | 4 ++-- .../layout-land/call_actions_bottom_sheet.xml | 2 +- .../main/res/layout-land/welcome_page_1.xml | 4 ++-- .../main/res/layout-land/welcome_page_2.xml | 4 ++-- .../main/res/layout-land/welcome_page_3.xml | 4 ++-- app/src/main/res/layout/account_list_cell.xml | 5 ++-- .../account_profile_secure_mode_fragment.xml | 8 +++---- .../assistant_qr_code_scanner_fragment.xml | 2 +- .../layout/assistant_secure_mode_fragment.xml | 10 ++++---- app/src/main/res/layout/bottom_nav_bar.xml | 4 ++-- .../res/layout/call_actions_bottom_sheet.xml | 2 +- .../call_conference_actions_bottom_sheet.xml | 2 +- .../layout/chat_bubble_content_grid_cell.xml | 3 ++- .../main/res/layout/chat_bubble_incoming.xml | 1 + .../main/res/layout/chat_bubble_outgoing.xml | 1 + .../chat_conversation_attachments_area.xml | 1 + .../res/layout/chat_conversation_fragment.xml | 2 +- .../chat_conversation_participants_area.xml | 1 + app/src/main/res/layout/chat_list_cell.xml | 2 +- .../res/layout/dialog_confirm_zrtp_sas.xml | 4 ++++ app/src/main/res/layout/meeting_fragment.xml | 3 ++- app/src/main/res/layout/meeting_list_cell.xml | 1 + .../res/layout/meeting_schedule_fragment.xml | 2 +- .../layout/meeting_waiting_room_fragment.xml | 23 ++++++++++--------- app/src/main/res/layout/settings_fragment.xml | 10 ++++---- app/src/main/res/layout/welcome_page_1.xml | 4 ++-- app/src/main/res/layout/welcome_page_2.xml | 4 ++-- app/src/main/res/layout/welcome_page_3.xml | 4 ++-- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/styles.xml | 3 +-- 34 files changed, 78 insertions(+), 60 deletions(-) rename app/src/main/res/drawable/{shape_chat_bubble_reactions_background.xml => shape_chat_bubble_incoming_reactions_background.xml} (100%) create mode 100644 app/src/main/res/drawable/shape_chat_bubble_outgoing_reactions_background.xml diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt index 2927d6029..91627b169 100644 --- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt +++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt @@ -550,7 +550,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) } @WorkerThread - private fun getNotifiableForRoom(chatRoom: ChatRoom, messages: Array): Notifiable { + private fun getNotifiableForConversation(chatRoom: ChatRoom, messages: Array): Notifiable { val address = chatRoom.peerAddress.asStringUriOnly() var notifiable: Notifiable? = chatNotificationsMap[address] if (notifiable == null) { @@ -585,7 +585,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) @WorkerThread private fun showChatRoomNotification(chatRoom: ChatRoom, messages: Array) { - val notifiable = getNotifiableForRoom(chatRoom, messages) + val notifiable = getNotifiableForConversation(chatRoom, messages) if (!chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) { if (chatRoom.subject != notifiable.groupTitle) { @@ -620,7 +620,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) address: Address, message: ChatMessage ) { - val notifiable = getNotifiableForRoom(chatRoom, arrayOf(message)) + val notifiable = getNotifiableForConversation(chatRoom, arrayOf(message)) // Check if a previous reaction notifiable exists from the same person & for the same message val from = address.asStringUriOnly() @@ -657,7 +657,7 @@ class NotificationsManager @MainThread constructor(private val context: Context) isOutgoing = false, isReaction = true, reactionToMessageId = message.messageId, - reactionFrom = address.asStringUriOnly() + reactionFrom = from ) notifiable.messages.add(notifiableMessage) diff --git a/app/src/main/res/drawable/shape_chat_bubble_reactions_background.xml b/app/src/main/res/drawable/shape_chat_bubble_incoming_reactions_background.xml similarity index 100% rename from app/src/main/res/drawable/shape_chat_bubble_reactions_background.xml rename to app/src/main/res/drawable/shape_chat_bubble_incoming_reactions_background.xml 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 new file mode 100644 index 000000000..368570b54 --- /dev/null +++ b/app/src/main/res/drawable/shape_chat_bubble_outgoing_reactions_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_squircle_gray_600_background.xml b/app/src/main/res/drawable/shape_squircle_gray_600_background.xml index 4841cd8d1..deffe1a5e 100644 --- a/app/src/main/res/drawable/shape_squircle_gray_600_background.xml +++ b/app/src/main/res/drawable/shape_squircle_gray_600_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file 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 dd8ef1063..a98938a21 100644 --- a/app/src/main/res/layout-land/bottom_nav_bar.xml +++ b/app/src/main/res/layout-land/bottom_nav_bar.xml @@ -57,7 +57,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}" app:layout_constraintTop_toTopOf="@id/calls" @@ -88,7 +88,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{viewModel.unreadMessages > 0 && !viewModel.hideConversations ? View.VISIBLE : View.GONE}" 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 ab980b867..203145f96 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="@color/white" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" diff --git a/app/src/main/res/layout-land/welcome_page_1.xml b/app/src/main/res/layout-land/welcome_page_1.xml index 6250bc961..57ccf864d 100644 --- a/app/src/main/res/layout-land/welcome_page_1.xml +++ b/app/src/main/res/layout-land/welcome_page_1.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:text="@string/welcome_page_title" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:text="@string/welcome_page_subtitle" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> diff --git a/app/src/main/res/layout-land/welcome_page_2.xml b/app/src/main/res/layout-land/welcome_page_2.xml index d68c924b1..f81905c8d 100644 --- a/app/src/main/res/layout-land/welcome_page_2.xml +++ b/app/src/main/res/layout-land/welcome_page_2.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:text="@string/welcome_page_title" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:text="@string/welcome_page_subtitle" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> diff --git a/app/src/main/res/layout-land/welcome_page_3.xml b/app/src/main/res/layout-land/welcome_page_3.xml index de30608d0..4cc78cae7 100644 --- a/app/src/main/res/layout-land/welcome_page_3.xml +++ b/app/src/main/res/layout-land/welcome_page_3.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="65dp" android:text="@string/welcome_page_title" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:text="@string/welcome_page_subtitle" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintStart_toEndOf="@id/title_first_line"/> diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml index 4132a5313..d3f2a7912 100644 --- a/app/src/main/res/layout/account_list_cell.xml +++ b/app/src/main/res/layout/account_list_cell.xml @@ -95,7 +95,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(model.notificationsCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{model.notificationsCount > 0 ? View.VISIBLE : View.GONE}" @@ -113,7 +113,8 @@ android:src="@drawable/dots_three_vertical" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/name" - app:layout_constraintBottom_toBottomOf="@id/register_status" /> + app:layout_constraintBottom_toBottomOf="@id/register_status" + app:tint="?attr/color_main2_600"/> @@ -223,7 +223,7 @@ android:layout_marginStart="20dp" android:text="@string/assistant_secure_mode_interoperable_title" android:textSize="16sp" - android:textColor="@color/black" + android:textColor="?attr/color_main2_900" android:checked="@{!viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{viewModel.isCurrentlySelectedModeSecure}" app:useMaterialThemeColors="false" @@ -238,7 +238,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:src="@drawable/info" - app:tint="@color/black" + app:tint="?attr/color_main2_900" app:layout_constraintTop_toTopOf="@id/interop_mode" app:layout_constraintBottom_toBottomOf="@id/interop_mode" app:layout_constraintStart_toEndOf="@id/interop_mode" /> diff --git a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml index c5ed46c45..a8154ce3a 100644 --- a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml +++ b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml @@ -36,7 +36,7 @@ android:layout_height="@dimen/top_bar_height" android:padding="15dp" android:src="@drawable/caret_left" - app:tint="?attr/color_main2_000" + app:tint="@color/white" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> diff --git a/app/src/main/res/layout/assistant_secure_mode_fragment.xml b/app/src/main/res/layout/assistant_secure_mode_fragment.xml index 411f84410..44a13af18 100644 --- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml +++ b/app/src/main/res/layout/assistant_secure_mode_fragment.xml @@ -76,7 +76,7 @@ android:paddingBottom="25dp" android:text="@string/assistant_account_secure_mode_subtitle" android:textSize="14sp" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" app:layout_constraintTop_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -91,7 +91,7 @@ android:layout_marginStart="16dp" android:text="@string/assistant_secure_mode_default_title" android:textSize="16sp" - android:textColor="@color/black" + android:textColor="?attr/color_main2_900" android:checked="@{viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}" app:useMaterialThemeColors="false" @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:src="@drawable/info" - app:tint="@color/black" + app:tint="?attr/color_main2_900" app:layout_constraintTop_toTopOf="@id/default_mode" app:layout_constraintBottom_toBottomOf="@id/default_mode" app:layout_constraintStart_toEndOf="@id/default_mode" /> @@ -215,7 +215,7 @@ android:layout_marginStart="16dp" android:text="@string/assistant_secure_mode_interoperable_title" android:textSize="16sp" - android:textColor="@color/black" + android:textColor="?attr/color_main2_900" android:checked="@{!viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{viewModel.isCurrentlySelectedModeSecure}" app:useMaterialThemeColors="false" @@ -230,7 +230,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:src="@drawable/info" - app:tint="@color/black" + app:tint="?attr/color_main2_900" app:layout_constraintTop_toTopOf="@id/interop_mode" app:layout_constraintBottom_toBottomOf="@id/interop_mode" app:layout_constraintStart_toEndOf="@id/interop_mode" /> diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml index bbb2c452a..5f99f7c80 100644 --- a/app/src/main/res/layout/bottom_nav_bar.xml +++ b/app/src/main/res/layout/bottom_nav_bar.xml @@ -65,7 +65,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}" @@ -103,7 +103,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{viewModel.unreadMessages > 0 && !viewModel.hideConversations ? View.VISIBLE : View.GONE}" 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 f5280b6b2..21491fab2 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="@color/white" + android:textColor="?attr/color_on_main" 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_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml index 13d571094..4e075a300 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="@color/white" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" diff --git a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml index 51f75dfcb..9c4e2a3f8 100644 --- a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml +++ b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml @@ -57,7 +57,8 @@ android:background="@drawable/shape_squircle_main2_200_left" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:tint="?attr/color_main2_600" /> diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml index 34f6bc2f5..93db0cc50 100644 --- a/app/src/main/res/layout/chat_conversation_fragment.xml +++ b/app/src/main/res/layout/chat_conversation_fragment.xml @@ -280,7 +280,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:visibility="@{viewModel.isUserScrollingUp && viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}" app:layout_constraintBottom_toTopOf="@id/scroll_to_bottom" diff --git a/app/src/main/res/layout/chat_conversation_participants_area.xml b/app/src/main/res/layout/chat_conversation_participants_area.xml index 9f01af032..e9963eee3 100644 --- a/app/src/main/res/layout/chat_conversation_participants_area.xml +++ b/app/src/main/res/layout/chat_conversation_participants_area.xml @@ -48,6 +48,7 @@ android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:src="@drawable/x" + app:tint="@color/icon_color_selector" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/separator" /> diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml index e7a751fb1..8044c69db 100644 --- a/app/src/main/res/layout/chat_list_cell.xml +++ b/app/src/main/res/layout/chat_list_cell.xml @@ -135,7 +135,7 @@ android:gravity="center" android:background="@drawable/shape_red_round" android:text="@{String.valueOf(model.unreadMessageCount), default=`1`}" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="13sp" android:paddingBottom="2dp" android:visibility="@{model.unreadMessageCount > 0 ? View.VISIBLE : View.GONE}" 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 1e1f8db2c..f7279277c 100644 --- a/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml +++ b/app/src/main/res/layout/dialog_confirm_zrtp_sas.xml @@ -70,6 +70,7 @@ android:layout_marginEnd="32dp" android:text="@{viewModel.letters1, default=`RV`}" android:textSize="32sp" + android:textColor="@color/gray_main2_600" android:gravity="center" android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" @@ -87,6 +88,7 @@ android:layout_height="70dp" android:text="@{viewModel.letters2, default=`PT`}" android:textSize="32sp" + android:textColor="@color/gray_main2_600" android:gravity="center" android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" @@ -105,6 +107,7 @@ android:layout_marginEnd="32dp" android:text="@{viewModel.letters3, default=`BB`}" android:textSize="32sp" + android:textColor="@color/gray_main2_600" android:gravity="center" android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" @@ -122,6 +125,7 @@ android:layout_height="70dp" android:text="@{viewModel.letters4, default=`NM`}" android:textSize="32sp" + android:textColor="@color/gray_main2_600" android:gravity="center" android:background="@drawable/shape_circle_white_call_background" android:elevation="5dp" diff --git a/app/src/main/res/layout/meeting_fragment.xml b/app/src/main/res/layout/meeting_fragment.xml index fdd168f53..588297f22 100644 --- a/app/src/main/res/layout/meeting_fragment.xml +++ b/app/src/main/res/layout/meeting_fragment.xml @@ -154,7 +154,8 @@ app:layout_constraintTop_toTopOf="@id/sip_uri" app:layout_constraintBottom_toBottomOf="@id/sip_uri" app:layout_constraintStart_toEndOf="@id/sip_uri" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:tint="?attr/color_main2_600" /> diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml index bd13f46eb..2df4dce1d 100644 --- a/app/src/main/res/layout/meeting_schedule_fragment.xml +++ b/app/src/main/res/layout/meeting_schedule_fragment.xml @@ -455,7 +455,7 @@ android:textSize="14sp" android:drawableStart="@drawable/users" android:drawablePadding="8dp" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:visibility="@{viewModel.participants.size() > 0 ? View.GONE : View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/meeting_waiting_room_fragment.xml b/app/src/main/res/layout/meeting_waiting_room_fragment.xml index 13dfce816..982b43ed8 100644 --- a/app/src/main/res/layout/meeting_waiting_room_fragment.xml +++ b/app/src/main/res/layout/meeting_waiting_room_fragment.xml @@ -15,20 +15,19 @@ + android:background="@color/gray_900"> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@id/back" + app:layout_constraintBottom_toTopOf="@id/subtitle"/> + app:layout_constraintTop_toBottomOf="@id/title" + app:layout_constraintBottom_toBottomOf="@id/back"/> @@ -115,7 +116,7 @@ android:layout_marginTop="10dp" android:visibility="@{viewModel.isVideoAvailable && viewModel.isVideoEnabled && viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}" android:src="@drawable/camera_rotate" - app:tint="?attr/color_main2_000" + app:tint="@color/white" app:layout_constraintTop_toTopOf="@id/video_preview" app:layout_constraintEnd_toEndOf="@id/video_preview" /> diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml index 2abac7d31..497508c87 100644 --- a/app/src/main/res/layout/settings_fragment.xml +++ b/app/src/main/res/layout/settings_fragment.xml @@ -98,7 +98,7 @@ android:layout_marginTop="16dp" android:text="@string/settings_conversations_title" android:drawableEnd="@{viewModel.expandConversations ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:visibility="@{viewModel.showConversationsSettings ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -128,7 +128,7 @@ android:layout_marginTop="16dp" android:text="@string/settings_meetings_title" android:drawableEnd="@{viewModel.expandMeetings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" android:visibility="@{viewModel.showMeetingsSettings ? View.VISIBLE : View.GONE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -158,7 +158,7 @@ android:layout_marginTop="16dp" android:text="@string/settings_network_title" android:drawableEnd="@{viewModel.expandNetwork ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/meetings_settings"/> @@ -187,7 +187,7 @@ android:layout_marginTop="16dp" android:text="@string/settings_user_interface_title" android:drawableEnd="@{viewModel.expandUserInterface ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/network_settings"/> @@ -216,7 +216,7 @@ android:layout_marginBottom="@dimen/screen_bottom_margin" android:text="@string/settings_advanced_title" android:drawableEnd="@drawable/caret_right" - android:drawableTint="@color/gray_main2_600" + android:drawableTint="?attr/color_main2_600" app:layout_constraintVertical_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/welcome_page_1.xml b/app/src/main/res/layout/welcome_page_1.xml index fe791afdf..7939dc3d5 100644 --- a/app/src/main/res/layout/welcome_page_1.xml +++ b/app/src/main/res/layout/welcome_page_1.xml @@ -24,7 +24,7 @@ android:layout_marginStart="65dp" android:layout_marginTop="16dp" android:text="@string/welcome_page_title" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -37,7 +37,7 @@ android:layout_marginEnd="65dp" android:paddingBottom="16dp" android:text="@string/welcome_page_subtitle" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/welcome_page_2.xml b/app/src/main/res/layout/welcome_page_2.xml index 8ae8c065a..2c8864b2e 100644 --- a/app/src/main/res/layout/welcome_page_2.xml +++ b/app/src/main/res/layout/welcome_page_2.xml @@ -24,7 +24,7 @@ android:layout_marginStart="65dp" android:layout_marginTop="16dp" android:text="@string/welcome_page_title" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -37,7 +37,7 @@ android:layout_marginEnd="65dp" android:paddingBottom="16dp" android:text="@string/welcome_page_subtitle" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintEnd_toEndOf="parent"/> diff --git a/app/src/main/res/layout/welcome_page_3.xml b/app/src/main/res/layout/welcome_page_3.xml index d276ad671..8684f79bb 100644 --- a/app/src/main/res/layout/welcome_page_3.xml +++ b/app/src/main/res/layout/welcome_page_3.xml @@ -24,7 +24,7 @@ android:layout_marginStart="65dp" android:layout_marginTop="16dp" android:text="@string/welcome_page_title" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="36sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"/> @@ -37,7 +37,7 @@ android:layout_marginEnd="65dp" android:paddingBottom="16dp" android:text="@string/welcome_page_subtitle" - android:textColor="?attr/color_main2_000" + android:textColor="?attr/color_on_main" android:textSize="26sp" app:layout_constraintTop_toBottomOf="@id/title_first_line" 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 cc5fcf4bf..2051d0e3d 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -31,7 +31,7 @@ @color/gray_main2_200 @color/white - @color/gray_900 + @color/gray_200_night @color/gray_600 @color/gray_300 @color/gray_600 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 613a5bb89..7d92f8337 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -38,7 +38,7 @@