diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml index 6a86c0be..c4e6adbf 100644 --- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml +++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml @@ -155,14 +155,14 @@ android:layout_marginRight="16dp" android:scaleType="fitCenter" android:src="@drawable/ic_material_leave" - android:tint="@color/vector_error_color" /> + android:tint="@color/riotx_notice" /> @@ -188,14 +188,14 @@ android:layout_marginEnd="16dp" android:layout_marginRight="16dp" android:src="@drawable/ic_material_exit_to_app" - android:tint="@color/vector_error_color" /> + android:tint="@color/riotx_notice" /> diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml index 3867680f..9e84e377 100644 --- a/vector/src/main/res/layout/fragment_home_detail.xml +++ b/vector/src/main/res/layout/fragment_home_detail.xml @@ -48,7 +48,7 @@ android:id="@+id/roomListContainer" android:layout_width="match_parent" android:layout_height="0dp" - android:background="#F3F8FD" + android:background="?riotx_header_panel_background" app:layout_constraintBottom_toTopOf="@+id/bottomNavigationView" app:layout_constraintTop_toBottomOf="@+id/groupToolbar" /> @@ -56,7 +56,7 @@ android:id="@+id/bottomNavigationView" android:layout_width="0dp" android:layout_height="48dp" - android:background="#FFFFFF" + android:background="?riotx_background" app:itemIconSize="20dp" app:itemIconTint="@color/home_bottom_nav_view_tint" app:itemTextColor="@color/home_bottom_nav_view_tint" diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml index f05a9587..6a988346 100644 --- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml +++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml @@ -112,7 +112,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/layout_vertical_margin" android:gravity="center" - android:textColor="@color/vector_error_color" + android:textColor="@color/riotx_notice" android:textSize="15sp" android:visibility="gone" tools:text="Error" diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml index c084fd3a..f8b99b75 100644 --- a/vector/src/main/res/layout/item_room.xml +++ b/vector/src/main/res/layout/item_room.xml @@ -7,8 +7,7 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" android:clickable="true" - android:focusable="true" - tools:background="@color/pale_grey"> + android:focusable="true"> _' --> + #FFFFFFFF #FF181B21 #FF000000 + #FF27303A #FF15171B #FF060708 + #FFFFFFFF #FFEDF3FF #FFEDF3FF + #FFFFFFFF #FFEDF3FF #FFEDF3FF + #FFFFFFFF #FF181B21 #FF181B21 + #FFF3F8FD #FF22262E #FF090A0C + #FFE9EDF1 #FF181B21 #FF0D0F12 + #FF61708B #FFA1B2D1 #FFA1B2D1 + #FFC8C8CD #FFC8C8CD #FFC8C8CD + #FF2E2F32 #FFEDF3FF #FFEDF3FF + #FF9E9E9E #FFA1B2D1 #FFA1B2D1 + #FF7E899C #FF7E899C #FF7E899C + #FF61708B #FF61708B #FF61708B + #FFFFFFFF #FF343446 #FF22262E + #FF2E3648 #FF2E3648 #FF2E3648 + #FF2E3648 #FF0D0E10 #FF000000 + #FFEEEFEF #FF61708B #FF22262E diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml index bb3dd512..7b560437 100644 --- a/vector/src/main/res/values/theme_light.xml +++ b/vector/src/main/res/values/theme_light.xml @@ -14,7 +14,7 @@ @color/accent_color_light #0039CB @android:color/white - @color/vector_error_color + @color/riotx_notice #FFFFFF #FFFFFF #212121 @@ -32,7 +32,26 @@ @color/black_38 @color/black_37 - @color/link_color_light + @color/riotx_links + + + @color/riotx_background + @color/riotx_base + @color/riotx_base_text_icon_primary_light + @color/riotx_base_text_icon_secondary_light + @color/riotx_search_background_mobile_light + @color/riotx_header_panel_background_light + @color/riotx_header_panel_border_mobile_light + @color/riotx_header_panel_text_primary_light + @color/riotx_header_panel_text_secondary_light + @color/riotx_text_primary_light + @color/riotx_text_secondary_light + @color/riotx_android_secondary_light + @color/riotx_search_placeholder_light + @color/riotx_room_highlight_light + @color/riotx_unread_room_indent_light + @color/riotx_android_status_bar_light + @color/riotx_line_break_mobile_light @@ -49,7 +68,7 @@ @color/riotx_text_primary_light @color/riotx_text_primary_light - @color/link_color_light + @color/riotx_links @color/primary_hint_text_color_light