Improvements for dark theme

This commit is contained in:
Sylvain Berfini 2024-01-17 11:27:01 +01:00
parent b1e5e45b43
commit ae4d087ad6
17 changed files with 33 additions and 31 deletions

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:color="?attr/color_main2_000" />
android:color="?attr/color_on_main" />
<item android:state_pressed="true"
android:color="?attr/color_main2_000" />
android:color="?attr/color_on_main" />
<item
android:color="?attr/color_main2_000"/>
android:color="?attr/color_on_main"/>
</selector>

View file

@ -106,7 +106,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/plus_circle"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -154,7 +154,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/user_plus"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -125,7 +125,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/phone_plus"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -122,7 +122,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/plus_circle"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -266,7 +266,7 @@
android:layout_margin="16dp"
android:src="@drawable/caret_double_down"
android:visibility="@{viewModel.isUserScrollingUp ? View.VISIBLE : View.GONE}"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -107,7 +107,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/plus_circle"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -84,6 +84,7 @@
android:padding="10dp"
android:src="@drawable/smiley"
android:visibility="@{viewModel.picturePath.empty ? View.VISIBLE : View.GONE}"
app:tint="?attr/color_main2_500"
app:layout_constraintEnd_toEndOf="@id/avatar"
app:layout_constraintStart_toStartOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar"
@ -169,7 +170,7 @@
android:paddingEnd="20dp"
android:text="@={viewModel.firstName, default=`John`}"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
android:textColor="?attr/color_main2_600"
android:hint="@string/contact_editor_first_name"
android:maxLines="1"
android:background="@drawable/edit_text_background"
@ -202,7 +203,7 @@
android:paddingEnd="20dp"
android:text="@={viewModel.lastName, default=`Doe`}"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
android:textColor="?attr/color_main2_600"
android:hint="@string/contact_editor_last_name"
android:maxLines="1"
android:background="@drawable/edit_text_background"
@ -281,7 +282,7 @@
android:paddingEnd="20dp"
android:text="@={viewModel.company, default=`Belledonne Comm`}"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
android:textColor="?attr/color_main2_600"
android:hint="@string/contact_editor_company"
android:maxLines="1"
android:background="@drawable/edit_text_background"
@ -315,7 +316,7 @@
android:layout_marginBottom="@dimen/screen_bottom_margin"
android:text="@={viewModel.jobTitle, default=`Android dev`}"
android:textSize="14sp"
android:textColor="@color/gray_main2_600"
android:textColor="?attr/color_main2_600"
android:hint="@string/contact_editor_first_name"
android:maxLines="1"
android:background="@drawable/edit_text_background"

View file

@ -156,7 +156,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/user_plus"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -170,7 +170,7 @@
android:layout_margin="16dp"
android:visibility="@{viewModel.selection.size() > 0 ? View.VISIBLE : View.GONE}"
android:src="@drawable/check"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -126,7 +126,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/phone_plus"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -123,7 +123,7 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/plus_circle"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -141,7 +141,7 @@
android:src="@drawable/meeting"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/search_bar"
app:tint="?attr/color_main2_000" />
app:tint="?attr/color_on_main" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
@ -153,7 +153,7 @@
android:drawableEnd="@drawable/caret_right"
android:padding="5dp"
android:text="@string/history_call_start_create_group_call"
android:textColor="@color/black"
android:textColor="?attr/color_main2_900"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@id/group_call_icon"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:text="@{viewModel.selectionCount, default=`0 selected`}"
android:textSize="12sp"
android:textColor="@color/black"
android:textColor="?attr/color_main2_900"
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" />
@ -164,7 +164,7 @@
android:src="@drawable/users_three"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/search_bar"
app:tint="?attr/color_main2_000" />
app:tint="?attr/color_on_main" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
@ -177,7 +177,7 @@
android:drawableEnd="@drawable/caret_right"
android:padding="5dp"
android:text="@string/new_conversation_create_group"
android:textColor="@color/black"
android:textColor="?attr/color_main2_900"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@id/group_chat_icon"
app:layout_constraintEnd_toEndOf="parent"
@ -231,7 +231,7 @@
android:layout_margin="16dp"
android:visibility="@{viewModel.multipleSelectionMode &amp;&amp; viewModel.groupChatRoomCreateButtonEnabled ? View.VISIBLE : View.GONE, default=gone}"
android:src="@drawable/check"
app:tint="?attr/color_main2_000"
app:tint="?attr/color_on_main"
app:backgroundTint="?attr/color_main1_500"
app:shapeAppearanceOverlay="@style/rounded"
app:layout_constraintEnd_toEndOf="parent"

View file

@ -114,7 +114,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textCursorDrawable="@null"
android:textColor="?attr/color_grey_200"
android:textColor="?attr/color_on_main"
android:textSize="16sp"
android:inputType="text"
android:paddingVertical="1dp"

View file

@ -15,24 +15,24 @@
<item name="android:windowBackground">@color/black</item>
<item name="android:navigationBarColor">@color/black</item>
<item name="color_main1_100">@color/orange_main_100</item>
<item name="color_main1_100">@color/orange_main_900</item>
<item name="color_main1_300">@color/orange_main_300</item>
<item name="color_main1_500">@color/orange_main_500</item>
<item name="color_main1_700">@color/orange_main_700</item>
<item name="color_main2_000">@color/black</item>
<item name="color_main2_100">@color/gray_main2_100_night</item>
<item name="color_main2_200">@color/gray_main2_800</item>
<item name="color_main2_100">@color/gray_main2_800</item>
<item name="color_main2_200">@color/gray_main2_700</item>
<item name="color_main2_300">@color/gray_main2_700</item>
<item name="color_main2_400">@color/gray_main2_600</item>
<item name="color_main2_500">@color/gray_main2_500</item>
<item name="color_main2_600">@color/gray_main2_400</item>
<item name="color_main2_400">@color/gray_main2_400</item>
<item name="color_main2_500">@color/gray_main2_300</item>
<item name="color_main2_600">@color/gray_main2_200</item>
<item name="color_main2_700">@color/gray_main2_300</item>
<item name="color_main2_800">@color/gray_main2_200</item>
<item name="color_main2_900">@color/white</item>
<item name="color_grey_100">@color/gray_900</item>
<item name="color_grey_200">@color/gray_800</item>
<item name="color_grey_200">@color/gray_600</item>
<item name="color_grey_300">@color/gray_300</item>
<item name="color_grey_400">@color/gray_600</item>
<item name="color_grey_500">@color/gray_500</item>

View file

@ -9,6 +9,7 @@
<color name="orange_main_300">#FFB266</color>
<color name="orange_main_500">#FF5E00</color>
<color name="orange_main_700">#B72D00</color>
<color name="orange_main_900">#662600</color>
<color name="gray_main2_100">#EEF6F8</color>
<color name="gray_main2_100_night">#191919</color>