gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2430 from nextcloud/bugfix/2426/verticalButtonsForPolls

Browse Source 
change poll buttons to vertical orientation
This commit is contained in:
Marcel Hibbe 2022-09-27 11:26:18 +02:00 committed by GitHub
commit 51d4b54aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/res/layout/dialog_poll_results.xml
View File

@ -42,26 +42,27 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_margin"
android:gravity="end"> android:orientation="vertical"
android:gravity="center">
<com.google.android.material.button.MaterialButton
android:id="@+id/poll_results_end_poll_button"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/standard_margin"
android:minHeight="@dimen/min_size_clickable_area"
android:text="@string/polls_end_poll"
app:cornerRadius="@dimen/button_corner_radius" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/edit_vote_button" android:id="@+id/edit_vote_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/min_size_clickable_area" android:minHeight="@dimen/min_size_clickable_area"
android:minWidth="@dimen/poll_buttons_min_width"
android:text="@string/polls_edit_vote" android:text="@string/polls_edit_vote"
android:theme="@style/Button.Primary" android:theme="@style/Button.Primary"
app:cornerRadius="@dimen/button_corner_radius" /> app:cornerRadius="@dimen/button_corner_radius" />
<com.google.android.material.button.MaterialButton
android:id="@+id/poll_results_end_poll_button"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/min_size_clickable_area"
android:text="@string/polls_end_poll"
app:cornerRadius="@dimen/button_corner_radius" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

19
app/src/main/res/layout/dialog_poll_vote.xml
View File

@ -56,16 +56,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_margin"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:gravity="end"> android:orientation="vertical"
android:gravity="center">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/poll_vote_end_poll_button" android:id="@+id/poll_vote_submit_button"
style="@style/Button.Borderless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/standard_margin"
android:minHeight="@dimen/min_size_clickable_area" android:minHeight="@dimen/min_size_clickable_area"
android:text="@string/polls_end_poll" android:minWidth="@dimen/poll_buttons_min_width"
android:text="@string/polls_submit_vote"
android:theme="@style/Button.Primary"
app:cornerRadius="@dimen/button_corner_radius" /> app:cornerRadius="@dimen/button_corner_radius" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -73,20 +74,20 @@
style="@style/OutlinedButton" style="@style/OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/standard_margin"
android:minHeight="@dimen/min_size_clickable_area" android:minHeight="@dimen/min_size_clickable_area"
android:minWidth="@dimen/poll_buttons_min_width"
android:text="@string/nc_common_dismiss" android:text="@string/nc_common_dismiss"
android:visibility="gone" android:visibility="gone"
app:cornerRadius="@dimen/button_corner_radius" app:cornerRadius="@dimen/button_corner_radius"
tools:visibility="visible" /> tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/poll_vote_submit_button" android:id="@+id/poll_vote_end_poll_button"
style="@style/Button.Borderless"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/min_size_clickable_area" android:minHeight="@dimen/min_size_clickable_area"
android:text="@string/polls_submit_vote" android:text="@string/polls_end_poll"
android:theme="@style/Button.Primary"
app:cornerRadius="@dimen/button_corner_radius" /> app:cornerRadius="@dimen/button_corner_radius" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/values/dimens.xml
View File

@ -82,4 +82,8 @@
<dimen name="default_checkbox_dialog_start_margin">18dp</dimen> <dimen name="default_checkbox_dialog_start_margin">18dp</dimen>
<dimen name="mediatab_file_icon_size">50dp</dimen> <dimen name="mediatab_file_icon_size">50dp</dimen>
<dimen name="poll_buttons_min_width">150dp</dimen>
</resources> </resources>

1
app/src/main/res/values/styles.xml
View File

@ -272,7 +272,6 @@
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
<item name="android:typeface">sans</item> <item name="android:typeface">sans</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
<item name="android:layout_gravity">center_vertical</item>
</style> </style>
<style name="TextAppearanceTab" parent="TextAppearance.Design.Tab"> <style name="TextAppearanceTab" parent="TextAppearance.Design.Tab">