Fix issue #862

2 files changed, 41 insertions, 26 deletions

diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 50b52a61a..48ea5126d 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -726,10 +726,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
         </LinearLayout>
-        <include
+        <LinearLayout
+            android:layout_marginStart="60dp"
+            android:layout_marginLeft="60dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            layout="@layout/layout_poll" />
+            android:orientation="horizontal">
+            <include
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                layout="@layout/layout_poll" />
+        </LinearLayout>
         <LinearLayout
             android:layout_marginStart="60dp"
             android:layout_marginLeft="60dp"
diff --git a/app/src/main/res/layout/layout_poll.xml b/app/src/main/res/layout/layout_poll.xml
index c09c19890..1fbf58c9e 100644
--- a/app/src/main/res/layout/layout_poll.xml
+++ b/app/src/main/res/layout/layout_poll.xml
@@ -20,10 +20,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_marginBottom="10dp"
-    android:layout_marginLeft="20dp"
-    android:layout_marginRight="20dp"
-    android:layout_marginStart="20dp"
-    android:layout_marginEnd="20dp"
     android:id="@+id/poll_container"
     android:visibility="gone"
     android:orientation="vertical"
@@ -94,16 +90,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </LinearLayout>
-    <Button
-        android:visibility="gone"
-        android:layout_marginTop="10dp"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:id="@+id/submit_vote"
-        style="@style/Base.Widget.AppCompat.Button.Colored"
-        android:text="@string/vote"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
 
     <LinearLayout
         android:visibility="gone"
@@ -116,6 +102,38 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
     </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button
+            android:visibility="gone"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/submit_vote"
+            style="@style/Base.Widget.AppCompat.Button.Colored"
+            android:text="@string/vote"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            tools:ignore="UselessLeaf" />
+        <Button
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:layout_gravity="center_vertical"
+            android:id="@+id/refresh_poll"
+            style="@style/Base.Widget.AppCompat.Button.Colored"
+            android:text="@string/refresh_poll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -133,15 +151,5 @@
             android:id="@+id/remaining_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"/>
-        <TextView
-            android:id="@+id/refresh_poll"
-            android:textColor="?colorAccent"
-            android:text="@string/refresh_poll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file