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

Feature/noid/improve polls buttons

4 files changed, 8 insertions, 7 deletions

diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt
index 5226d188a..2ce3ccbf4 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt
@@ -128,7 +128,7 @@ class PollVoteFragment : Fragment() {
 
     private fun themeDialog() {
         viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.pollVoteSubmitButton)
-        viewThemeUtils.material.colorMaterialButtonText(binding.pollVoteEndPollButton)
+        viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.pollVoteEndPollButton)
         viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.pollVoteEditDismiss)
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt
index da8977e56..32f0152d7 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollMainViewModel.kt
@@ -153,7 +153,7 @@ class PollMainViewModel @Inject constructor(private val repository: PollReposito
     }
 
     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 {
diff --git a/app/src/main/res/layout/dialog_poll_results.xml b/app/src/main/res/layout/dialog_poll_results.xml
index 43afda4ee..ec0542ba1 100644
--- a/app/src/main/res/layout/dialog_poll_results.xml
+++ b/app/src/main/res/layout/dialog_poll_results.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_margin"
         android:orientation="vertical"
-        android:gravity="center">
+        android:gravity="end">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/edit_vote_button"
@@ -57,10 +57,11 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/poll_results_end_poll_button"
-            style="@style/Button.Borderless"
+            style="@style/OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/min_size_clickable_area"
+            android:minWidth="@dimen/poll_buttons_min_width"
             android:text="@string/polls_end_poll"
             app:cornerRadius="@dimen/button_corner_radius" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_poll_vote.xml b/app/src/main/res/layout/dialog_poll_vote.xml
index 966fb1409..38e756935 100644
--- a/app/src/main/res/layout/dialog_poll_vote.xml
+++ b/app/src/main/res/layout/dialog_poll_vote.xml
@@ -57,7 +57,7 @@
         android:layout_marginTop="@dimen/standard_margin"
         android:layout_marginEnd="4dp"
         android:orientation="vertical"
-        android:gravity="center">
+        android:gravity="end">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/poll_vote_submit_button"
@@ -66,7 +66,6 @@
             android:minHeight="@dimen/min_size_clickable_area"
             android:minWidth="@dimen/poll_buttons_min_width"
             android:text="@string/polls_submit_vote"
-            android:theme="@style/Button.Primary"
             app:cornerRadius="@dimen/button_corner_radius" />
 
         <com.google.android.material.button.MaterialButton
@@ -83,10 +82,11 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/poll_vote_end_poll_button"
-            style="@style/Button.Borderless"
+            style="@style/OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/min_size_clickable_area"
+            android:minWidth="@dimen/poll_buttons_min_width"
             android:text="@string/polls_end_poll"
             app:cornerRadius="@dimen/button_corner_radius" />
     </LinearLayout>