mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 20:06:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Widget: fix widget title color

Browse source
This commit is contained in:
ganfra 2020-05-29 17:09:10 +02:00
parent 2002252f72
commit c742ca3b41
6 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/res/drawable/bg_active_widgets_banner.xml
View file

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

7
vector/src/main/res/layout/view_room_widgets_banner.xml
View file

@ -11,22 +11,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:paddingStart="12dp"
android:paddingTop="8dp"
android:paddingEnd="12dp"
android:paddingBottom="8dp"
android:background="?attr/selectableItemBackground"
android:textColor="?riotx_text_primary_body_contrast"
android:textAppearance="@style/TextAppearance.Vector.Title"
android:textColor="?riotx_room_active_widgets_banner_text"
tools:text="2 active widgets" />
<TextView
android:id="@+id/activeWidgetsViewAction"
android:background="@android:color/transparent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="@android:color/transparent"
android:gravity="center"
android:minWidth="48dp"
android:text="@string/active_widget_view_action"

13
vector/src/main/res/values/colors_riotx.xml
View file

@ -175,10 +175,15 @@
<color name="riotx_attachment_selector_border_dark">#FF22262E</color>
<color name="riotx_attachment_selector_border_black">#FF090A0C</color>
<attr name="riotx_room_active_widgets_banner" format="color" />
<color name="riotx_room_active_widgets_banner_light">#EBEFF5</color>
<color name="riotx_room_active_widgets_banner_dark">#27303A</color>
<color name="riotx_room_active_widgets_banner_black">#27303A</color>
<attr name="riotx_room_active_widgets_banner_bg" format="color" />
<color name="riotx_room_active_widgets_banner_bg_light">#EBEFF5</color>
<color name="riotx_room_active_widgets_banner_bg_dark">#27303A</color>
<color name="riotx_room_active_widgets_banner_bg_black">#27303A</color>
<attr name="riotx_room_active_widgets_banner_text" format="color" />
<color name="riotx_room_active_widgets_banner_text_light">#61708B</color>
<color name="riotx_room_active_widgets_banner_text_dark">#E3E8F0</color>
<color name="riotx_room_active_widgets_banner_text_black">#E3E8F0</color>
<!-- (color from RiotWeb) -->
<attr name="riotx_keys_backup_banner_accent_color" format="color" />

3
vector/src/main/res/values/theme_black.xml
View file

@ -33,7 +33,8 @@
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_black</item>
<item name="riotx_attachment_selector_background">@color/riotx_attachment_selector_background_black</item>
<item name="riotx_attachment_selector_border">@color/riotx_attachment_selector_border_black</item>
<item name="riotx_room_active_widgets_banner">@color/riotx_room_active_widgets_banner_black</item>
<item name="riotx_room_active_widgets_banner_bg">@color/riotx_room_active_widgets_banner_bg_black</item>
<item name="riotx_room_active_widgets_banner_text">@color/riotx_room_active_widgets_banner_text_black</item>
<!-- Drawables -->
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_black</item>

3
vector/src/main/res/values/theme_dark.xml
View file

@ -31,7 +31,8 @@
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_dark</item>
<item name="riotx_attachment_selector_background">@color/riotx_attachment_selector_background_dark</item>
<item name="riotx_attachment_selector_border">@color/riotx_attachment_selector_border_dark</item>
<item name="riotx_room_active_widgets_banner">@color/riotx_room_active_widgets_banner_dark</item>
<item name="riotx_room_active_widgets_banner_bg">@color/riotx_room_active_widgets_banner_bg_dark</item>
<item name="riotx_room_active_widgets_banner_text">@color/riotx_room_active_widgets_banner_text_dark</item>
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>

3
vector/src/main/res/values/theme_light.xml
View file

@ -32,7 +32,8 @@
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_light</item>
<item name="riotx_attachment_selector_background">@color/riotx_attachment_selector_background_light</item>
<item name="riotx_attachment_selector_border">@color/riotx_attachment_selector_border_light</item>
<item name="riotx_room_active_widgets_banner">@color/riotx_room_active_widgets_banner_light</item>
<item name="riotx_room_active_widgets_banner_bg">@color/riotx_room_active_widgets_banner_bg_light</item>
<item name="riotx_room_active_widgets_banner_text">@color/riotx_room_active_widgets_banner_text_light</item>
<!-- Drawables -->
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_light</item>