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

Rework attrs riotx_highlighted_message_background

Browse source
This commit is contained in:
Benoit Marty 2020-08-05 18:54:13 +02:00
parent 85e6ef40a1
commit 8e81d6fe01
10 changed files with 4 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/res/drawable/highlighted_message_background_dark.xml → vector/src/main/res/drawable/highlighted_message_background.xml
View file

@ -9,7 +9,7 @@
<item android:left="6dp" android:right="2dp">
<shape>
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
<solid android:color="@color/riotx_header_panel_background_dark" />
<solid android:color="?riotx_header_panel_background" />
</shape>
</item>

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

@ -1,35 +0,0 @@
<?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_light.xml
View file

@ -1,35 +0,0 @@
<?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_light" />
</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>

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

@ -13,7 +13,7 @@
android:layout_height="match_parent"
android:layout_alignBottom="@+id/informationBottom"
android:layout_alignParentTop="true"
android:background="?riotx_highlighted_message_background" />
android:background="@drawable/highlighted_message_background" />
<ImageView
android:id="@+id/messageAvatarImageView"

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

@ -12,7 +12,7 @@
android:layout_height="match_parent"
android:layout_alignBottom="@+id/readReceiptsView"
android:layout_alignParentTop="true"
android:background="?riotx_highlighted_message_background" />
android:background="@drawable/highlighted_message_background" />
<View
android:id="@+id/messageStartGuideline"

2
vector/src/main/res/layout/item_timeline_event_base_state.xml
View file

@ -13,7 +13,7 @@
android:layout_height="match_parent"
android:layout_alignBottom="@+id/informationBottom"
android:layout_alignParentTop="true"
android:background="?riotx_highlighted_message_background" />
android:background="@drawable/highlighted_message_background" />
<View
android:id="@+id/messageStartGuideline"

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

@ -41,8 +41,6 @@
<attr name="vctr_icon_tint_on_light_action_bar_color" format="color" />
<attr name="vctr_settings_icon_tint_color" format="color" />
<attr name="riotx_highlighted_message_background" format="reference" />
</declare-styleable>
<declare-styleable name="PollResultLineView">

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

@ -39,9 +39,6 @@
<item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_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

@ -39,9 +39,6 @@
<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>

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

@ -38,9 +38,6 @@
<item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_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-->