mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-04-18 06:08:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

More dark theme improvements

Browse source
This commit is contained in:
Sylvain Berfini 2024-01-18 10:49:12 +01:00
parent ae4d087ad6
commit e4d073471c
34 changed files with 78 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -550,7 +550,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
} }
@WorkerThread @WorkerThread
private fun getNotifiableForRoom(chatRoom: ChatRoom, messages: Array<ChatMessage>): Notifiable { private fun getNotifiableForConversation(chatRoom: ChatRoom, messages: Array<ChatMessage>): Notifiable {
val address = chatRoom.peerAddress.asStringUriOnly() val address = chatRoom.peerAddress.asStringUriOnly()
var notifiable: Notifiable? = chatNotificationsMap[address] var notifiable: Notifiable? = chatNotificationsMap[address]
if (notifiable == null) { if (notifiable == null) {
@ -585,7 +585,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
@WorkerThread @WorkerThread
private fun showChatRoomNotification(chatRoom: ChatRoom, messages: Array<ChatMessage>) { private fun showChatRoomNotification(chatRoom: ChatRoom, messages: Array<ChatMessage>) {
val notifiable = getNotifiableForRoom(chatRoom, messages) val notifiable = getNotifiableForConversation(chatRoom, messages)
if (!chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) { if (!chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())) {
if (chatRoom.subject != notifiable.groupTitle) { if (chatRoom.subject != notifiable.groupTitle) {
@ -620,7 +620,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
address: Address, address: Address,
message: ChatMessage 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 // Check if a previous reaction notifiable exists from the same person & for the same message
val from = address.asStringUriOnly() val from = address.asStringUriOnly()
@ -657,7 +657,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
isOutgoing = false, isOutgoing = false,
isReaction = true, isReaction = true,
reactionToMessageId = message.messageId, reactionToMessageId = message.messageId,
reactionFrom = address.asStringUriOnly() reactionFrom = from
) )
notifiable.messages.add(notifiableMessage) notifiable.messages.add(notifiableMessage)

0
app/src/main/res/drawable/shape_chat_bubble_reactions_background.xml → app/src/main/res/drawable/shape_chat_bubble_incoming_reactions_background.xml
View file

6
app/src/main/res/drawable/shape_chat_bubble_outgoing_reactions_background.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="?attr/color_main1_100"/>
<stroke android:color="?attr/color_main2_000" android:width="2dp" />
</shape>

2
app/src/main/res/drawable/shape_squircle_gray_600_background.xml
View file

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

4
app/src/main/res/layout-land/bottom_nav_bar.xml
View file

@ -57,7 +57,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}" android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintTop_toTopOf="@id/calls" app:layout_constraintTop_toTopOf="@id/calls"
@ -88,7 +88,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}" android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{viewModel.unreadMessages > 0 &amp;&amp; !viewModel.hideConversations ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.unreadMessages > 0 &amp;&amp; !viewModel.hideConversations ? View.VISIBLE : View.GONE}"

2
app/src/main/res/layout-land/call_actions_bottom_sheet.xml
View file

@ -95,7 +95,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}" android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
android:textColor="@color/white" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"

4
app/src/main/res/layout-land/welcome_page_1.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="65dp" android:layout_marginStart="65dp"
android:text="@string/welcome_page_title" android:text="@string/welcome_page_title"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="36sp" android:textSize="36sp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>
@ -35,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:text="@string/welcome_page_subtitle" android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintBottom_toBottomOf="@id/title_first_line"
app:layout_constraintStart_toEndOf="@id/title_first_line"/> app:layout_constraintStart_toEndOf="@id/title_first_line"/>

4
app/src/main/res/layout-land/welcome_page_2.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="65dp" android:layout_marginStart="65dp"
android:text="@string/welcome_page_title" android:text="@string/welcome_page_title"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="36sp" android:textSize="36sp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>
@ -35,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:text="@string/welcome_page_subtitle" android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintBottom_toBottomOf="@id/title_first_line"
app:layout_constraintStart_toEndOf="@id/title_first_line"/> app:layout_constraintStart_toEndOf="@id/title_first_line"/>

4
app/src/main/res/layout-land/welcome_page_3.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="65dp" android:layout_marginStart="65dp"
android:text="@string/welcome_page_title" android:text="@string/welcome_page_title"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="36sp" android:textSize="36sp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>
@ -35,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:text="@string/welcome_page_subtitle" android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintBottom_toBottomOf="@id/title_first_line" app:layout_constraintBottom_toBottomOf="@id/title_first_line"
app:layout_constraintStart_toEndOf="@id/title_first_line"/> app:layout_constraintStart_toEndOf="@id/title_first_line"/>

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

@ -95,7 +95,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(model.notificationsCount), default=`1`}" android:text="@{String.valueOf(model.notificationsCount), default=`1`}"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{model.notificationsCount > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{model.notificationsCount > 0 ? View.VISIBLE : View.GONE}"
@ -113,7 +113,8 @@
android:src="@drawable/dots_three_vertical" android:src="@drawable/dots_three_vertical"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/name" 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"/>
<View <View
android:id="@+id/separator" android:id="@+id/separator"

8
app/src/main/res/layout/account_profile_secure_mode_fragment.xml
View file

@ -86,7 +86,7 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:text="@string/assistant_secure_mode_default_title" android:text="@string/assistant_secure_mode_default_title"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/black" android:textColor="?attr/color_main2_900"
android:checked="@{viewModel.isCurrentlySelectedModeSecure}" android:checked="@{viewModel.isCurrentlySelectedModeSecure}"
android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}"
app:useMaterialThemeColors="false" app:useMaterialThemeColors="false"
@ -101,7 +101,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/info" android:src="@drawable/info"
app:tint="@color/black" app:tint="?attr/color_main2_900"
app:layout_constraintTop_toTopOf="@id/default_mode" app:layout_constraintTop_toTopOf="@id/default_mode"
app:layout_constraintBottom_toBottomOf="@id/default_mode" app:layout_constraintBottom_toBottomOf="@id/default_mode"
app:layout_constraintStart_toEndOf="@id/default_mode" /> app:layout_constraintStart_toEndOf="@id/default_mode" />
@ -223,7 +223,7 @@
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:text="@string/assistant_secure_mode_interoperable_title" android:text="@string/assistant_secure_mode_interoperable_title"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/black" android:textColor="?attr/color_main2_900"
android:checked="@{!viewModel.isCurrentlySelectedModeSecure}" android:checked="@{!viewModel.isCurrentlySelectedModeSecure}"
android:enabled="@{viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{viewModel.isCurrentlySelectedModeSecure}"
app:useMaterialThemeColors="false" app:useMaterialThemeColors="false"
@ -238,7 +238,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/info" android:src="@drawable/info"
app:tint="@color/black" app:tint="?attr/color_main2_900"
app:layout_constraintTop_toTopOf="@id/interop_mode" app:layout_constraintTop_toTopOf="@id/interop_mode"
app:layout_constraintBottom_toBottomOf="@id/interop_mode" app:layout_constraintBottom_toBottomOf="@id/interop_mode"
app:layout_constraintStart_toEndOf="@id/interop_mode" /> app:layout_constraintStart_toEndOf="@id/interop_mode" />

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

@ -36,7 +36,7 @@
android:layout_height="@dimen/top_bar_height" android:layout_height="@dimen/top_bar_height"
android:padding="15dp" android:padding="15dp"
android:src="@drawable/caret_left" android:src="@drawable/caret_left"
app:tint="?attr/color_main2_000" app:tint="@color/white"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>

10
app/src/main/res/layout/assistant_secure_mode_fragment.xml
View file

@ -76,7 +76,7 @@
android:paddingBottom="25dp" android:paddingBottom="25dp"
android:text="@string/assistant_account_secure_mode_subtitle" android:text="@string/assistant_account_secure_mode_subtitle"
android:textSize="14sp" android:textSize="14sp"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
app:layout_constraintTop_toBottomOf="@id/title" app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
@ -91,7 +91,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="@string/assistant_secure_mode_default_title" android:text="@string/assistant_secure_mode_default_title"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/black" android:textColor="?attr/color_main2_900"
android:checked="@{viewModel.isCurrentlySelectedModeSecure}" android:checked="@{viewModel.isCurrentlySelectedModeSecure}"
android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{!viewModel.isCurrentlySelectedModeSecure}"
app:useMaterialThemeColors="false" app:useMaterialThemeColors="false"
@ -106,7 +106,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/info" android:src="@drawable/info"
app:tint="@color/black" app:tint="?attr/color_main2_900"
app:layout_constraintTop_toTopOf="@id/default_mode" app:layout_constraintTop_toTopOf="@id/default_mode"
app:layout_constraintBottom_toBottomOf="@id/default_mode" app:layout_constraintBottom_toBottomOf="@id/default_mode"
app:layout_constraintStart_toEndOf="@id/default_mode" /> app:layout_constraintStart_toEndOf="@id/default_mode" />
@ -215,7 +215,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="@string/assistant_secure_mode_interoperable_title" android:text="@string/assistant_secure_mode_interoperable_title"
android:textSize="16sp" android:textSize="16sp"
android:textColor="@color/black" android:textColor="?attr/color_main2_900"
android:checked="@{!viewModel.isCurrentlySelectedModeSecure}" android:checked="@{!viewModel.isCurrentlySelectedModeSecure}"
android:enabled="@{viewModel.isCurrentlySelectedModeSecure}" android:enabled="@{viewModel.isCurrentlySelectedModeSecure}"
app:useMaterialThemeColors="false" app:useMaterialThemeColors="false"
@ -230,7 +230,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/info" android:src="@drawable/info"
app:tint="@color/black" app:tint="?attr/color_main2_900"
app:layout_constraintTop_toTopOf="@id/interop_mode" app:layout_constraintTop_toTopOf="@id/interop_mode"
app:layout_constraintBottom_toBottomOf="@id/interop_mode" app:layout_constraintBottom_toBottomOf="@id/interop_mode"
app:layout_constraintStart_toEndOf="@id/interop_mode" /> app:layout_constraintStart_toEndOf="@id/interop_mode" />

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

@ -65,7 +65,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}" android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}"
@ -103,7 +103,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}" android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{viewModel.unreadMessages > 0 &amp;&amp; !viewModel.hideConversations ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.unreadMessages > 0 &amp;&amp; !viewModel.hideConversations ? View.VISIBLE : View.GONE}"

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

@ -92,7 +92,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}" android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
android:textColor="@color/white" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"

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

@ -91,7 +91,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}" android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
android:textColor="@color/white" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}" android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"

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

@ -57,7 +57,8 @@
android:background="@drawable/shape_squircle_main2_200_left" android:background="@drawable/shape_squircle_main2_200_left"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:tint="?attr/color_main2_600" />
<com.google.android.material.progressindicator.CircularProgressIndicator <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/download_progress" android:id="@+id/download_progress"

1
app/src/main/res/layout/chat_bubble_incoming.xml
View file

@ -262,6 +262,7 @@
android:onClick="@{showReactionInfoClickListener}" android:onClick="@{showReactionInfoClickListener}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_chat_bubble_incoming_reactions_background"
android:text="@{model.reactions, default=@string/emoji_love}" android:text="@{model.reactions, default=@string/emoji_love}"
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/bubble" app:layout_constraintEnd_toEndOf="@id/bubble"

1
app/src/main/res/layout/chat_bubble_outgoing.xml
View file

@ -225,6 +225,7 @@
android:onClick="@{showReactionInfoClickListener}" android:onClick="@{showReactionInfoClickListener}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_chat_bubble_outgoing_reactions_background"
android:text="@{model.reactions, default=@string/emoji_love}" android:text="@{model.reactions, default=@string/emoji_love}"
android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{model.reactions.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/bubble" app:layout_constraintEnd_toEndOf="@id/bubble"

1
app/src/main/res/layout/chat_conversation_attachments_area.xml
View file

@ -42,6 +42,7 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:src="@drawable/x" android:src="@drawable/x"
app:tint="@color/icon_color_selector"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/separator" /> app:layout_constraintTop_toBottomOf="@id/separator" />

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

@ -280,7 +280,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}" android:text="@{String.valueOf(viewModel.unreadMessagesCount), default=`1`}"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:visibility="@{viewModel.isUserScrollingUp &amp;&amp; viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.isUserScrollingUp &amp;&amp; viewModel.unreadMessagesCount > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintBottom_toTopOf="@id/scroll_to_bottom" app:layout_constraintBottom_toTopOf="@id/scroll_to_bottom"

1
app/src/main/res/layout/chat_conversation_participants_area.xml
View file

@ -48,6 +48,7 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:src="@drawable/x" android:src="@drawable/x"
app:tint="@color/icon_color_selector"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/separator" /> app:layout_constraintTop_toBottomOf="@id/separator" />

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

@ -135,7 +135,7 @@
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_red_round" android:background="@drawable/shape_red_round"
android:text="@{String.valueOf(model.unreadMessageCount), default=`1`}" android:text="@{String.valueOf(model.unreadMessageCount), default=`1`}"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="13sp" android:textSize="13sp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:visibility="@{model.unreadMessageCount > 0 ? View.VISIBLE : View.GONE}" android:visibility="@{model.unreadMessageCount > 0 ? View.VISIBLE : View.GONE}"

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

@ -70,6 +70,7 @@
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:text="@{viewModel.letters1, default=`RV`}" android:text="@{viewModel.letters1, default=`RV`}"
android:textSize="32sp" android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_circle_white_call_background" android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp" android:elevation="5dp"
@ -87,6 +88,7 @@
android:layout_height="70dp" android:layout_height="70dp"
android:text="@{viewModel.letters2, default=`PT`}" android:text="@{viewModel.letters2, default=`PT`}"
android:textSize="32sp" android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_circle_white_call_background" android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp" android:elevation="5dp"
@ -105,6 +107,7 @@
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:text="@{viewModel.letters3, default=`BB`}" android:text="@{viewModel.letters3, default=`BB`}"
android:textSize="32sp" android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_circle_white_call_background" android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp" android:elevation="5dp"
@ -122,6 +125,7 @@
android:layout_height="70dp" android:layout_height="70dp"
android:text="@{viewModel.letters4, default=`NM`}" android:text="@{viewModel.letters4, default=`NM`}"
android:textSize="32sp" android:textSize="32sp"
android:textColor="@color/gray_main2_600"
android:gravity="center" android:gravity="center"
android:background="@drawable/shape_circle_white_call_background" android:background="@drawable/shape_circle_white_call_background"
android:elevation="5dp" android:elevation="5dp"

3
app/src/main/res/layout/meeting_fragment.xml
View file

@ -154,7 +154,8 @@
app:layout_constraintTop_toTopOf="@id/sip_uri" app:layout_constraintTop_toTopOf="@id/sip_uri"
app:layout_constraintBottom_toBottomOf="@id/sip_uri" app:layout_constraintBottom_toBottomOf="@id/sip_uri"
app:layout_constraintStart_toEndOf="@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" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style" style="@style/default_text_style"

1
app/src/main/res/layout/meeting_list_cell.xml
View file

@ -114,6 +114,7 @@
android:ellipsize="end" android:ellipsize="end"
android:drawableStart="@{model.isBroadcast ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}" android:drawableStart="@{model.isBroadcast ? @drawable/slideshow : @drawable/meeting, default=@drawable/meeting}"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableTint="?attr/color_main2_600"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>

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

@ -455,7 +455,7 @@
android:textSize="14sp" android:textSize="14sp"
android:drawableStart="@drawable/users" android:drawableStart="@drawable/users"
android:drawablePadding="8dp" 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}" android:visibility="@{viewModel.participants.size() > 0 ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

23
app/src/main/res/layout/meeting_waiting_room_fragment.xml
View file

@ -15,20 +15,19 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/color_grey_900"> android:background="@color/gray_900">
<ImageView <ImageView
android:id="@+id/back" android:id="@+id/back"
android:onClick="@{backClickListener}" android:onClick="@{backClickListener}"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="@dimen/top_bar_height"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:padding="15dp" android:padding="15dp"
android:src="@drawable/caret_left" android:src="@drawable/caret_left"
app:tint="?attr/color_main1_500" app:tint="@color/main1_500"
app:layout_constraintBottom_toBottomOf="@id/subtitle"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/title" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/main_page_title_style" style="@style/main_page_title_style"
@ -38,10 +37,11 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:text="@{viewModel.subject, default=`Meeting with John Doe`}" android:text="@{viewModel.subject, default=`Meeting with John Doe`}"
android:textColor="?attr/color_main2_000" android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back" app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toTopOf="@id/subtitle"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_300" style="@style/default_text_style_300"
@ -52,10 +52,11 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:text="@{viewModel.dateTime, default=`Wed. 25 Oct. 14:00 - 15:00`}" android:text="@{viewModel.dateTime, default=`Wed. 25 Oct. 14:00 - 15:00`}"
android:textSize="12sp" android:textSize="12sp"
android:textColor="?attr/color_main2_000" android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back" app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toBottomOf="@id/title"/> app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toBottomOf="@id/back"/>
<View <View
android:id="@+id/no_video_background" android:id="@+id/no_video_background"
@ -101,7 +102,7 @@
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@{viewModel.selfAvatar.name, default=`John Doe`}" android:text="@{viewModel.selfAvatar.name, default=`John Doe`}"
android:textColor="?attr/color_main2_000" android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="@id/no_video_background" app:layout_constraintBottom_toBottomOf="@id/no_video_background"
app:layout_constraintStart_toStartOf="@id/no_video_background" /> app:layout_constraintStart_toStartOf="@id/no_video_background" />
@ -115,7 +116,7 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:visibility="@{viewModel.isVideoAvailable &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}" android:visibility="@{viewModel.isVideoAvailable &amp;&amp; viewModel.isVideoEnabled &amp;&amp; viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}"
android:src="@drawable/camera_rotate" android:src="@drawable/camera_rotate"
app:tint="?attr/color_main2_000" app:tint="@color/white"
app:layout_constraintTop_toTopOf="@id/video_preview" app:layout_constraintTop_toTopOf="@id/video_preview"
app:layout_constraintEnd_toEndOf="@id/video_preview" /> app:layout_constraintEnd_toEndOf="@id/video_preview" />

10
app/src/main/res/layout/settings_fragment.xml
View file

@ -98,7 +98,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/settings_conversations_title" android:text="@string/settings_conversations_title"
android:drawableEnd="@{viewModel.expandConversations ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" 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}" android:visibility="@{viewModel.showConversationsSettings ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -128,7 +128,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/settings_meetings_title" android:text="@string/settings_meetings_title"
android:drawableEnd="@{viewModel.expandMeetings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" 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}" android:visibility="@{viewModel.showMeetingsSettings ? View.VISIBLE : View.GONE}"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -158,7 +158,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/settings_network_title" android:text="@string/settings_network_title"
android:drawableEnd="@{viewModel.expandNetwork ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" 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_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/meetings_settings"/> app:layout_constraintTop_toBottomOf="@id/meetings_settings"/>
@ -187,7 +187,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/settings_user_interface_title" android:text="@string/settings_user_interface_title"
android:drawableEnd="@{viewModel.expandUserInterface ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}" 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_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/network_settings"/> app:layout_constraintTop_toBottomOf="@id/network_settings"/>
@ -216,7 +216,7 @@
android:layout_marginBottom="@dimen/screen_bottom_margin" android:layout_marginBottom="@dimen/screen_bottom_margin"
android:text="@string/settings_advanced_title" android:text="@string/settings_advanced_title"
android:drawableEnd="@drawable/caret_right" android:drawableEnd="@drawable/caret_right"
android:drawableTint="@color/gray_main2_600" android:drawableTint="?attr/color_main2_600"
app:layout_constraintVertical_bias="0" app:layout_constraintVertical_bias="0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

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

@ -24,7 +24,7 @@
android:layout_marginStart="65dp" android:layout_marginStart="65dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/welcome_page_title" android:text="@string/welcome_page_title"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="36sp" android:textSize="36sp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>
@ -37,7 +37,7 @@
android:layout_marginEnd="65dp" android:layout_marginEnd="65dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:text="@string/welcome_page_subtitle" android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintTop_toBottomOf="@id/title_first_line"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>

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

@ -24,7 +24,7 @@
android:layout_marginStart="65dp" android:layout_marginStart="65dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/welcome_page_title" android:text="@string/welcome_page_title"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="36sp" android:textSize="36sp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>
@ -37,7 +37,7 @@
android:layout_marginEnd="65dp" android:layout_marginEnd="65dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:text="@string/welcome_page_subtitle" android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintTop_toBottomOf="@id/title_first_line"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>

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

@ -24,7 +24,7 @@
android:layout_marginStart="65dp" android:layout_marginStart="65dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/welcome_page_title" android:text="@string/welcome_page_title"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="36sp" android:textSize="36sp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>
@ -37,7 +37,7 @@
android:layout_marginEnd="65dp" android:layout_marginEnd="65dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:text="@string/welcome_page_subtitle" android:text="@string/welcome_page_subtitle"
android:textColor="?attr/color_main2_000" android:textColor="?attr/color_on_main"
android:textSize="26sp" android:textSize="26sp"
app:layout_constraintTop_toBottomOf="@id/title_first_line" app:layout_constraintTop_toBottomOf="@id/title_first_line"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>

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

@ -31,7 +31,7 @@
<item name="color_main2_800">@color/gray_main2_200</item> <item name="color_main2_800">@color/gray_main2_200</item>
<item name="color_main2_900">@color/white</item> <item name="color_main2_900">@color/white</item>
<item name="color_grey_100">@color/gray_900</item> <item name="color_grey_100">@color/gray_200_night</item>
<item name="color_grey_200">@color/gray_600</item> <item name="color_grey_200">@color/gray_600</item>
<item name="color_grey_300">@color/gray_300</item> <item name="color_grey_300">@color/gray_300</item>
<item name="color_grey_400">@color/gray_600</item> <item name="color_grey_400">@color/gray_600</item>

3
app/src/main/res/values/styles.xml
View file

@ -38,7 +38,7 @@
</style> </style>
<style name="assistant_page_title_style"> <style name="assistant_page_title_style">
<item name="android:fontFamily">@font/noto_sans_800</item> <item name="android:fontFamily">@font/noto_sans_800</item>
<item name="android:textColor">?attr/color_main2_000</item> <item name="android:textColor">?attr/color_on_main</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="call_header_style"> <style name="call_header_style">
@ -136,7 +136,6 @@
<item name="android:orientation">horizontal</item> <item name="android:orientation">horizontal</item>
<item name="android:layout_marginTop">-10dp</item> <item name="android:layout_marginTop">-10dp</item>
<item name="android:layout_marginBottom">5dp</item> <item name="android:layout_marginBottom">5dp</item>
<item name="android:background">@drawable/shape_chat_bubble_reactions_background</item>
</style> </style>
<style name="call_numpad_digits_style"> <style name="call_numpad_digits_style">
<item name="android:fontFamily">@font/noto_sans</item> <item name="android:fontFamily">@font/noto_sans</item>