mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 02:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rework attrs vctr_line_divider and vctr_pill_receipt

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

2
vector/src/main/res/drawable/line_divider_dark.xml → vector/src/main/res/drawable/line_divider.xml
View file

@ -6,6 +6,6 @@
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/list_divider_color_dark" />
<solid android:color="?list_divider_color" />
</shape>

11
vector/src/main/res/drawable/line_divider_light.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/list_divider_color_light" />
</shape>

2
vector/src/main/res/drawable/pill_receipt_dark.xml → vector/src/main/res/drawable/pill_receipt.xml
View file

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<solid android:color="@color/riotx_header_panel_border_mobile_dark" />
<solid android:color="?riotx_header_panel_border_mobile" />
</shape>

6
vector/src/main/res/drawable/pill_receipt_black.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<solid android:color="@color/riotx_header_panel_border_mobile_black" />
</shape>

6
vector/src/main/res/drawable/pill_receipt_light.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<solid android:color="@color/riotx_header_panel_border_mobile_light" />
</shape>

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

@ -115,7 +115,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?vctr_line_divider"
android:background="@drawable/line_divider"
app:layout_constraintBottom_toBottomOf="parent" />
</merge>

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

@ -10,7 +10,7 @@
android:id="@+id/receiptMore"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:background="?vctr_pill_receipt"
android:background="@drawable/pill_receipt"
android:gravity="center"
android:importantForAccessibility="no"
android:paddingStart="4dp"

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

@ -41,12 +41,6 @@
<attr name="vctr_icon_tint_on_light_action_bar_color" format="color" />
<attr name="vctr_settings_icon_tint_color" format="color" />
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
<!-- dedicated drawables are created for each theme -->
<attr name="vctr_line_divider" format="reference" />
<attr name="vctr_pill_receipt" format="reference" />
<attr name="riotx_highlighted_message_background" format="reference" />
</declare-styleable>

1
vector/src/main/res/values/colors_riot.xml
View file

@ -46,6 +46,7 @@
<color name="accent_color_status">#FF586C7B</color>
<!--Default/Line break mobile-->
<attr name="list_divider_color" format="color" />
<color name="list_divider_color_light">#EEEFEF</color>
<!--Dark/Line break mobile-->
<color name="list_divider_color_dark">#FF61708B</color>

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

@ -80,8 +80,6 @@
<item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
<item name="vctr_pill_receipt">@drawable/pill_receipt_black</item>
<!-- activities background -->
<item name="android:windowBackground">@color/riot_primary_background_color_black</item>
<item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_black</item>

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

@ -122,11 +122,7 @@
<item name="vctr_settings_icon_tint_color">@android:color/white</item>
<item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
<!-- dedicated drawables are created for each theme -->
<item name="vctr_line_divider">@drawable/line_divider_dark</item>
<item name="vctr_pill_receipt">@drawable/pill_receipt_dark</item>
<item name="list_divider_color">@color/list_divider_color_dark</item>
<!-- ANDROID SUPPORT ATTRIBUTES -->
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->

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

@ -122,11 +122,7 @@
<item name="vctr_settings_icon_tint_color">@android:color/black</item>
<item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
<!-- dedicated drawables are created for each theme -->
<item name="vctr_line_divider">@drawable/line_divider_light</item>
<item name="vctr_pill_receipt">@drawable/pill_receipt_light</item>
<item name="list_divider_color">@color/list_divider_color_light</item>
<!-- ANDROID SUPPORT ATTRIBUTES -->
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->

4
vector/src/main/res/values/theme_status.xml
View file

@ -63,10 +63,6 @@
<item name="vctr_settings_icon_tint_color">@color/accent_color_status</item>
<item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
<!-- dedicated drawables are created for each theme -->
<item name="vctr_line_divider">@drawable/line_divider_light</item>
<!-- ANDROID SUPPORT ATTRIBUTES -->
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
<item name="android:overScrollMode">never</item>