owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show multiline poll options (#837)

Browse Source 
* fix: show multiline poll options

* fix resources not found exception

* don't force height on poll options

---------

Co-authored-by: sk <sk22@mailbox.org>
This commit is contained in:
FineFindus
2023-09-30 19:03:17 +02:00
committed by GitHub
parent 4de7211523
commit 6d085ae6f0
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/res/drawable/bg_poll_option_clickable.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item android:gravity="center_vertical" android:height="40dp">
<item>
<shape>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>

4
mastodon/src/main/res/drawable/bg_poll_option_clickable_inset.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item android:gravity="center_vertical" android:height="40dp">
<item>
<shape>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<solid android:color="?colorM3Surface"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>

4
mastodon/src/main/res/drawable/bg_poll_option_voted.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical" android:height="40dp">
<item>
<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
<shape>
<solid android:color="?colorM3SecondaryContainer"/>
@@ -8,7 +8,7 @@
</shape>
</scale>
</item>
<item android:gravity="center_vertical" android:height="40dp">
<item>
<shape>
<stroke android:width="1dp" android:color="?colorM3OutlineVariant"/>
<corners android:radius="20dp"/>

6
mastodon/src/main/res/drawable/bg_poll_option_voted_inset.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical" android:height="40dp">
<item>
<shape>
<solid android:color="?colorM3Surface"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:gravity="center_vertical" android:height="40dp">
<item>
<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
<shape>
<solid android:color="@color/poll_option_progress_inset"/>
@@ -14,7 +14,7 @@
</shape>
</scale>
</item>
<item android:gravity="center_vertical" android:height="40dp">
<item>
<shape>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<corners android:radius="20dp"/>