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

Merge pull request #2436 from nextcloud/feature/noid/improvePollsButtons

Browse Source 
Feature/noid/improve polls buttons
This commit is contained in:
Andy Scherzinger 2022-09-29 11:40:32 +02:00 committed by GitHub
commit 1382a23b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt
View File

@ -128,7 +128,7 @@ class PollVoteFragment : Fragment() {
private fun themeDialog() { private fun themeDialog() {
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.pollVoteSubmitButton) viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.pollVoteSubmitButton)
viewThemeUtils.material.colorMaterialButtonText(binding.pollVoteEndPollButton) viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.pollVoteEndPollButton)
viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.pollVoteEditDismiss) viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.pollVoteEditDismiss)
} }

2
app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt
View File

@ -153,7 +153,7 @@ class PollMainViewModel @Inject constructor(private val repository: PollReposito
} }
private fun showEndPollButton(poll: Poll): Boolean { private fun showEndPollButton(poll: Poll): Boolean {
return poll.status == Poll.STATUS_OPEN && (isPollCreatedByCurrentUser(poll) || isOwnerOrModerator) return !editVotes && poll.status == Poll.STATUS_OPEN && (isPollCreatedByCurrentUser(poll) || isOwnerOrModerator)
} }
private fun showVotersAmount(poll: Poll): Boolean { private fun showVotersAmount(poll: Poll): Boolean {

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

@ -43,7 +43,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_margin"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center"> android:gravity="end">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/edit_vote_button" android:id="@+id/edit_vote_button"
@ -57,10 +57,11 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/poll_results_end_poll_button" android:id="@+id/poll_results_end_poll_button"
style="@style/Button.Borderless" style="@style/OutlinedButton"
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_end_poll" android:text="@string/polls_end_poll"
app:cornerRadius="@dimen/button_corner_radius" /> app:cornerRadius="@dimen/button_corner_radius" />
</LinearLayout> </LinearLayout>

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

@ -57,7 +57,7 @@
android:layout_marginTop="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_margin"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center"> android:gravity="end">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/poll_vote_submit_button" android:id="@+id/poll_vote_submit_button"
@ -66,7 +66,6 @@
android:minHeight="@dimen/min_size_clickable_area" android:minHeight="@dimen/min_size_clickable_area"
android:minWidth="@dimen/poll_buttons_min_width" android:minWidth="@dimen/poll_buttons_min_width"
android:text="@string/polls_submit_vote" 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
@ -83,10 +82,11 @@
<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_end_poll_button"
style="@style/Button.Borderless" style="@style/OutlinedButton"
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_end_poll" android:text="@string/polls_end_poll"
app:cornerRadius="@dimen/button_corner_radius" /> app:cornerRadius="@dimen/button_corner_radius" />
</LinearLayout> </LinearLayout>