diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml index 0767f9f22..c40a9dbad 100644 --- a/app/src/main/res/layout/chat_list_cell.xml +++ b/app/src/main/res/layout/chat_list_cell.xml @@ -89,7 +89,7 @@ android:gravity="center_vertical|start" android:text="@{model.lastMessageTextSender, default=`John Doe:`}" android:textSize="14sp" - android:textColor="?attr/color_main2_400" + android:textColor="?attr/color_main2_500" android:visibility="@{model.isBeingDeleted || model.lastMessageTextSender.length() == 0 || model.isComposing ? View.GONE : View.VISIBLE}" textFont="@{model.isBeingDeleted || model.unreadMessageCount > 0 || model.isComposing ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}" app:layout_constraintStart_toStartOf="@id/title" @@ -121,7 +121,7 @@ android:ellipsize="end" android:text="@{model.isBeingDeleted ? @string/conversations_list_is_being_removed_label : model.isComposing ? model.composingLabel : model.lastMessageText, default=`Hello there!`}" android:textSize="14sp" - android:textColor="?attr/color_main2_400" + android:textColor="?attr/color_main2_500" textFont="@{model.isBeingDeleted || model.unreadMessageCount > 0 || model.isComposing ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}" app:layout_constraintStart_toEndOf="@id/last_message_forward" app:layout_constraintEnd_toStartOf="@id/right_border" @@ -181,7 +181,7 @@ app:layout_constraintEnd_toStartOf="@id/last_sent_message_status" app:layout_constraintTop_toBottomOf="@id/date_time" app:layout_constraintBottom_toTopOf="@id/separator" - app:tint="?attr/color_main2_400" /> + app:tint="?attr/color_main2_600" /> + app:tint="?attr/color_main2_600" /> diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml index 293e490d5..1bcb29491 100644 --- a/app/src/main/res/layout/contact_list_cell.xml +++ b/app/src/main/res/layout/contact_list_cell.xml @@ -77,7 +77,7 @@ android:text="@{model.name, default=`John Doe`}" android:textSize="14sp" android:layout_marginStart="10dp" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml index daf32b909..aa028c959 100644 --- a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml +++ b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml @@ -75,7 +75,7 @@ android:textSize="14sp" android:maxLines="1" android:ellipsize="end" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/selected" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml index 1e5a2d57a..481e3ff9d 100644 --- a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml +++ b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml @@ -57,7 +57,7 @@ android:textSize="14sp" android:maxLines="1" android:ellipsize="end" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/selected" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml b/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml index a134fd1a1..12e98f7d5 100644 --- a/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml +++ b/app/src/main/res/layout/generic_address_picker_suggestion_list_cell.xml @@ -46,7 +46,7 @@ android:textSize="14sp" android:maxLines="1" android:ellipsize="end" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintEnd_toStartOf="@id/selected" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml index 2ad44e51d..529ce524a 100644 --- a/app/src/main/res/layout/history_list_cell.xml +++ b/app/src/main/res/layout/history_list_cell.xml @@ -51,7 +51,7 @@ android:layout_marginStart="10dp" android:text="@{model.avatarModel.name, default=`John Doe`}" android:textSize="14sp" - android:textColor="?attr/color_main2_700" + android:textColor="?attr/color_main2_800" app:layout_constraintStart_toEndOf="@id/avatar" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/date_time"/> diff --git a/app/src/main/res/layout/meeting_list_cell.xml b/app/src/main/res/layout/meeting_list_cell.xml index 69ac843ca..6d53c90fe 100644 --- a/app/src/main/res/layout/meeting_list_cell.xml +++ b/app/src/main/res/layout/meeting_list_cell.xml @@ -108,7 +108,7 @@ android:layout_marginEnd="16dp" android:text="@{model.subject, default=`Meeting with John`}" android:textSize="13sp" - android:textColor="?attr/color_main2_600" + android:textColor="?attr/color_main2_800" android:maxLines="1" android:ellipsize="end" android:drawableStart="@{model.isBroadcast ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}" diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml index a51d1ae42..27b799503 100644 --- a/app/src/main/res/values-night-v31/themes.xml +++ b/app/src/main/res/values-night-v31/themes.xml @@ -1,6 +1,6 @@ @@ -10,7 +10,7 @@ shortEdges true - @color/background_color_dark_mode + @color/background_color_alt_dark_mode ?attr/color_main1_500 @color/orange_main_900