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

Poll voting

Browse Source
This commit is contained in:
Grishka
2022-02-16 03:58:13 +03:00
parent f7ddac6ae6
commit 1a238d79e0
18 changed files with 345 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/res/color/poll_option_progress.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorPollMostVoted" android:state_selected="true"/>
<item android:color="?colorPollVoted"/>
</selector>

17
mastodon/src/main/res/drawable/bg_poll_option_voted.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="?android:colorBackground"/>
<corners android:radius="10dp"/>
</shape>
</item>
<item>
<clip android:clipOrientation="horizontal" android:gravity="start">
<shape>
<solid android:color="@color/poll_option_progress"/>
<corners android:radius="10dp"/>
</shape>
</clip>
</item>
</layer-list>

3
mastodon/src/main/res/drawable/ic_fluent_checkmark_circle_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2zm0 1.5c-4.694 0-8.5 3.806-8.5 8.5s3.806 8.5 8.5 8.5 8.5-3.806 8.5-8.5-3.806-8.5-8.5-8.5zm-1.25 9.94l4.47-4.47c0.293-0.293 0.767-0.293 1.06 0 0.267 0.266 0.29 0.683 0.073 0.976L16.28 10.03l-5 5c-0.266 0.267-0.683 0.29-0.976 0.073L10.22 15.03l-2.5-2.5c-0.293-0.293-0.293-0.767 0-1.06 0.266-0.267 0.683-0.29 0.976-0.073L8.78 11.47l1.97 1.97 4.47-4.47-4.47 4.47z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

5
mastodon/src/main/res/drawable/ic_poll_option_button.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_fluent_checkmark_circle_24_regular" android:state_selected="true"/>
<item android:drawable="@drawable/ic_fluent_circle_24_regular"/>
</selector>

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

@@ -1,9 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textAppearance="@style/m3_label_large"
android:textColor="?android:textColorPrimary" />
android:orientation="vertical">
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textAppearance="@style/m3_label_large"
android:textColor="?android:textColorPrimary" />
<Button
android:id="@+id/vote_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginBottom="8dp"
android:enabled="false"
android:text="@string/action_vote"/>
</LinearLayout>

15
mastodon/src/main/res/layout/display_item_poll_option.xml
View File

@@ -20,11 +20,24 @@
android:layoutDirection="locale">
<ImageView
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_fluent_circle_24_regular"/>
android:duplicateParentState="true"
android:src="@drawable/ic_poll_option_button"/>
<TextView
android:id="@+id/percent"
android:layout_width="46dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:textAppearance="@style/m3_title_medium"
android:visibility="gone"
tools:visibility="visible"
tools:text="00.0%"/>
<TextView
android:id="@+id/text"

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

@@ -5,5 +5,7 @@
<attr name="colorBackgroundLight" format="color"/>
<attr name="colorBackgroundLightest" format="color"/>
<attr name="colorDarkIcon" format="color"/>
<attr name="colorPollMostVoted" format="color"/>
<attr name="colorPollVoted" format="color"/>
<attr name="secondaryButtonStyle" format="reference"/>
</resources>

74
mastodon/src/main/res/values/colors.xml
View File

@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
@@ -24,13 +19,78 @@
<color name="gray_800t">#CC282C37</color>
<color name="gray_900">#101828</color>
<color name="primary_25">#FAFDFF</color>
<color name="primary_50">#EAF4FB</color>
<color name="primary_100">#D5E9F7</color>
<color name="primary_200">#BFDEF4</color>
<color name="primary_300">#AAD3F0</color>
<color name="primary_400">#95C8EC</color>
<color name="primary_500">#80BCE8</color>
<color name="primary_600">#55A6E1</color>
<color name="primary_700">#2B90D9</color>
<color name="primary_800">#2273AE</color>
<color name="primary_900">#16486D</color>
<color name="error_25">#FFFBFA</color>
<color name="error_50">#FEF3F2</color>
<color name="error_100">#FEE4E2</color>
<color name="error_200">#FECDCA</color>
<color name="error_300">#FDA29B</color>
<color name="error_400">#F97066</color>
<color name="error_500">#F04438</color>
<color name="error_600">#D92D20</color>
<color name="error_700">#B42318</color>
<color name="error_800">#912018</color>
<color name="error_900">#7A271A</color>
<color name="warning_25">#FFFCF5</color>
<color name="warning_50">#FFFAEB</color>
<color name="warning_100">#FEF0C7</color>
<color name="warning_200">#FEDF89</color>
<color name="warning_300">#FEC84B</color>
<color name="warning_400">#FDB022</color>
<color name="warning_500">#F79009</color>
<color name="warning_600">#DC6803</color>
<color name="warning_700">#B54708</color>
<color name="warning_800">#93370D</color>
<color name="warning_900">#7A2E0E</color>
<color name="success_25">#F6FEF9</color>
<color name="success_50">#ECFDF3</color>
<color name="success_100">#D1FADF</color>
<color name="success_200">#A6F4C5</color>
<color name="success_300">#6CE9A6</color>
<color name="success_400">#32D583</color>
<color name="success_500">#12B76A</color>
<color name="success_600">#039855</color>
<color name="success_700">#027A48</color>
<color name="success_800">#05603A</color>
<color name="success_900">#054F31</color>
<color name="slate_25">#FCFCFD</color>
<color name="slate_50">#F8FAFC</color>
<color name="slate_100">#EAEFF5</color>
<color name="slate_200">#C8D4E5</color>
<color name="slate_300">#9EB3D1</color>
<color name="slate_400">#7190BC</color>
<color name="slate_500">#4E73A6</color>
<color name="slate_600">#3E5B84</color>
<color name="slate_700">#364F72</color>
<color name="slate_800">#293C56</color>
<color name="slate_900">#101823</color>
<color name="purple_25">#FAFAFF</color>
<color name="purple_50">#F4F3FF</color>
<color name="purple_100">#EBE9FE</color>
<color name="purple_200">#D9D6FE</color>
<color name="purple_300">#BDB4FE</color>
<color name="purple_400">#9B8AFB</color>
<color name="purple_500">#7A5AF8</color>
<color name="purple_600">#6938EF</color>
<color name="purple_700">#5925DC</color>
<color name="purple_800">#4A1FB8</color>
<color name="purple_900">#3E1C96</color>
<color name="fab_icon">#282C37</color>
<color name="actionbar_bg">#FAFBFC</color>
<color name="navigation_bar_bg">#282C37</color>
<color name="highlight_over_dark">#80FFFFFF</color>
<color name="favorite_selected">#FF9F0A</color>
<color name="boost_selected">#79BD9A</color>
<color name="favorite_selected">@color/warning_500</color>
<color name="boost_selected">@color/primary_500</color>
</resources>

1
mastodon/src/main/res/values/strings.xml
View File

@@ -122,4 +122,5 @@
<string name="do_unblock">Unblock</string>
<string name="button_muted">Muted</string>
<string name="button_blocked">Blocked</string>
<string name="action_vote">Vote</string>
</resources>

2
mastodon/src/main/res/values/styles.xml
View File

@@ -28,6 +28,8 @@
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert</item>
<item name="colorPollMostVoted">@color/primary_500</item>
<item name="colorPollVoted">@color/gray_300</item>
</style>
<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">