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

feat: add option to view poll results (#935)

Browse Source 
* feat: add option to view poll results

* fix: button showing wrong text when refreshing

* fix: hide results button when voted

* remove unused string

* change view results layout, remove unused setting

---------

Co-authored-by: sk <sk22@mailbox.org>
This commit is contained in:
FineFindus
2023-11-27 21:44:53 +01:00
committed by GitHub
parent 70b9d08830
commit 79d5067c97
39 changed files with 91 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mastodon/src/main/res/layout/display_item_poll_footer.xml
View File

@@ -6,18 +6,38 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/text"
<LinearLayout
android:id="@+id/wrapper"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="12dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="@style/m3_body_medium"
android:gravity="center_vertical"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="fdsafdsafsdafds"/>
android:layout_height="wrap_content">
<TextView
android:id="@+id/text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginVertical="6dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="@style/m3_body_medium"
android:layout_gravity="center_vertical"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="fdsafdsafsdafds"/>
<Button
android:id="@+id/results_btn"
style="@style/Widget.Mastodon.M3.Button.Tonal"
android:background="@drawable/bg_button_m3_tonal_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="16dp"
android:layout_marginVertical="4dp"
android:textAppearance="@style/m3_label_small"
android:text="@string/sk_poll_show_results"/>
</LinearLayout>
<Button
android:id="@+id/vote_btn"
@@ -25,7 +45,6 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="4dp"
android:layout_marginTop="-4dp"
android:enabled="false"
style="@style/Widget.Mastodon.M3.Button.Filled.Elevated"
android:text="@string/action_vote"/>