From 6d3ef66995d2a6c42671dc432b1dc83415b1c232 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 11 Dec 2024 16:49:48 +0100 Subject: [PATCH] More color fixes --- app/src/main/res/layout/chat_info_fragment.xml | 8 ++++---- app/src/main/res/layout/chat_participant_list_cell.xml | 3 +-- app/src/main/res/layout/contact_fragment.xml | 2 +- app/src/main/res/layout/history_fragment.xml | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml index ab921ba39..d84c1c021 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/app/src/main/res/layout/chat_info_fragment.xml @@ -120,7 +120,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{viewModel.isGroup ? viewModel.subject : viewModel.avatarModel.name, default=`John Doe`}" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -135,7 +135,7 @@ android:src="@drawable/pencil_simple" android:contentDescription="@string/content_description_chat_edit_conversation_subject" android:visibility="@{!viewModel.isGroup || viewModel.isReadOnly || !viewModel.isMyselfAdmin ? View.GONE : View.VISIBLE}" - app:tint="?attr/color_grey_600" + app:tint="?attr/color_main2_600" app:layout_constraintBottom_toBottomOf="@id/title" app:layout_constraintStart_toEndOf="@id/title" app:layout_constraintTop_toTopOf="@id/title" /> @@ -151,7 +151,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{viewModel.sipUri, default=`sip:john.doe@sip.example.org`}" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" android:textSize="14sp" android:drawableEnd="@drawable/copy" android:drawablePadding="5dp" @@ -172,7 +172,7 @@ android:ellipsize="end" android:maxLines="2" android:text="@{viewModel.peerSipUri, default=`sip:chatroom-xxxx@sip.example.org`}" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" android:textSize="14sp" android:drawableEnd="@drawable/copy" android:drawablePadding="5dp" diff --git a/app/src/main/res/layout/chat_participant_list_cell.xml b/app/src/main/res/layout/chat_participant_list_cell.xml index d3539d80f..e01fd8548 100644 --- a/app/src/main/res/layout/chat_participant_list_cell.xml +++ b/app/src/main/res/layout/chat_participant_list_cell.xml @@ -14,7 +14,6 @@ android:onClick="@{() -> model.onClicked()}" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/color_main2_000" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:paddingTop="5dp" @@ -68,7 +67,7 @@ android:src="@drawable/dots_three_vertical" android:contentDescription="@string/content_description_show_popup_menu" android:visibility="@{model.showMenu ? View.VISIBLE : View.GONE}" - app:tint="?attr/color_grey_600" + app:tint="?attr/color_grey_800" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/name" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index e34c6ccde..d456e2d3a 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -123,7 +123,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{viewModel.contact.name, default=`John Doe`}" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/history_fragment.xml b/app/src/main/res/layout/history_fragment.xml index fd99ca007..2908acd0b 100644 --- a/app/src/main/res/layout/history_fragment.xml +++ b/app/src/main/res/layout/history_fragment.xml @@ -109,7 +109,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@{viewModel.callLogModel.avatarModel.name, default=`John Doe`}" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" android:textSize="14sp" android:maxLines="1" android:ellipsize="end" @@ -125,7 +125,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:text="@{viewModel.callLogModel.displayedAddress, default=`+33601020304`}" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" android:textSize="14sp" android:maxLines="1" android:ellipsize="end"