filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle all themes

Browse Source
This commit is contained in:
Benoit Marty 2019-06-20 17:04:52 +02:00
parent 401f878a9c
commit 625242a3d9
10 changed files with 85 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vector/src/main/res/drawable/highlighted_message_background_black.xml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true">
<layer-list>
<!-- Draw the BG. -->
<item android:left="6dp" android:right="2dp">
<shape>
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
<solid android:color="@color/riotx_header_panel_background_black" />
</shape>
</item>
<item android:gravity="start" android:left="2dp">
<shape>
<size android:width="4dp" />
<corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
<solid android:color="@color/riotx_accent" />
</shape>
</item>
</layer-list>
</item>
<item android:state_checked="false">
<shape android:shape="rectangle">
<solid android:color="@android:color/transparent" />
</shape>
</item>
</selector>

35
vector/src/main/res/drawable/highlighted_message_background_dark.xml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true">
<layer-list>
<!-- Draw the BG. -->
<item android:left="6dp" android:right="2dp">
<shape>
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
<solid android:color="@color/riotx_header_panel_background_dark" />
</shape>
</item>
<item android:gravity="start" android:left="2dp">
<shape>
<size android:width="4dp" />
<corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
<solid android:color="@color/riotx_accent" />
</shape>
</item>
</layer-list>
</item>
<item android:state_checked="false">
<shape android:shape="rectangle">
<solid android:color="@android:color/transparent" />
</shape>
</item>
</selector>

1
vector/src/main/res/drawable/highligthed_message_background.xml → vector/src/main/res/drawable/highlighted_message_background_light.xml
View File

@ -9,7 +9,6 @@
<item android:left="6dp" android:right="2dp">
<shape>
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
<!-- TODO Handle drawable for dark themes -->
<solid android:color="@color/riotx_header_panel_background_light" />
</shape>
</item>

2
vector/src/main/res/layout/item_timeline_event_base.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/messageSelectedBackground"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/highligthed_message_background"
android:background="?riotx_highlighted_message_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
View File

@ -11,7 +11,7 @@
android:id="@+id/messageSelectedBackground"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/highligthed_message_background"
android:background="?riotx_highlighted_message_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
vector/src/main/res/values/attrs.xml
View File

@ -92,5 +92,7 @@
<!-- Widget banner background -->
<attr name="vctr_widget_banner_background" format="color" />
<attr name="riotx_highlighted_message_background" format="reference" />
</declare-styleable>
</resources>

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

@ -31,6 +31,9 @@
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_black</item>
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_black</item>
<!-- Drawables -->
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_black</item>
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item>
<!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->

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

@ -30,6 +30,9 @@
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_dark</item>
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>
<!-- Drawables -->
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_dark</item>
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item>
<item name="colorPrimaryVariant">@color/primary_color_dark_light</item>

6
vector/src/main/res/values/theme_light.xml
View File

@ -30,6 +30,9 @@
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_light</item>
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_light</item>
<!-- Drawables -->
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_light</item>
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/riotx_accent</item>
<!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
@ -153,8 +156,7 @@
<item name="vctr_tabbar_background">@drawable/vector_tabbar_background_light</item>
<item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_light</item>
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_light
</item>
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_light</item>
<item name="vctr_pill_text_color_user_id">@color/riot_primary_text_color_light</item>
<item name="vctr_pill_text_color_room_alias">@android:color/white</item>

3
vector/src/main/res/values/theme_status.xml
View File

@ -111,8 +111,7 @@
<item name="vctr_tabbar_background">@drawable/vector_tabbar_background_status</item>
<item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_status</item>
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_status
</item>
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_status</item>
<item name="vctr_pill_text_color_user_id">@color/riot_primary_text_color_status</item>
<item name="vctr_pill_text_color_room_alias">@android:color/white</item>