Fix issue #183

1 files changed, 54 insertions, 37 deletions

diff --git a/app/src/main/res/layout/popup_poll.xml b/app/src/main/res/layout/popup_poll.xml
index a931f96d1..3d856e177 100644
--- a/app/src/main/res/layout/popup_poll.xml
+++ b/app/src/main/res/layout/popup_poll.xml
@@ -23,46 +23,63 @@
     android:paddingLeft="20dp"
     android:paddingRight="20dp"
     android:layout_height="match_parent">
-    <EditText
-        android:id="@+id/choice_1"
-        android:hint="@string/poll_choice_1"
-        android:singleLine="true"
-        android:maxLength="25"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text"
-        android:layout_marginBottom="10dp"
-       />
-    <EditText
-        android:id="@+id/choice_2"
-        android:hint="@string/poll_choice_2"
-        android:maxLength="25"
-        android:singleLine="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text"
-        android:layout_marginBottom="10dp"
-        />
-    <EditText
-        android:id="@+id/choice_3"
-        android:hint="@string/poll_choice_3"
-        android:maxLength="25"
-        android:singleLine="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text"
-        android:layout_marginBottom="10dp"
-        />
-    <EditText
-        android:id="@+id/choice_4"
-        android:hint="@string/poll_choice_4"
-        android:maxLength="25"
-        android:singleLine="true"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:id="@+id/poll_items_container"
+            android:layout_height="wrap_content">
+            <EditText
+                android:id="@+id/choice_1"
+                android:hint="@string/poll_choice_1"
+                android:singleLine="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text"
+                android:layout_marginBottom="10dp"
+                />
+            <EditText
+                android:id="@+id/choice_2"
+                android:hint="@string/poll_choice_2"
+                android:singleLine="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text"
+                android:layout_marginBottom="10dp"
+                />
+        </LinearLayout>
+    </ScrollView>
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="text"
-        android:layout_marginBottom="10dp"
-        />
+        android:orientation="horizontal">
+        <ImageButton
+            android:id="@+id/add_poll_item"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center"
+            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
+            android:adjustViewBounds="true"
+            android:background="@color/transparent"
+            android:contentDescription="@string/add_poll_item"
+            android:scaleType="centerCrop"
+            android:src="@drawable/ic_add" />
+        <ImageButton
+            android:id="@+id/remove_poll_item"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center"
+            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
+            android:adjustViewBounds="true"
+            android:background="@color/transparent"
+            android:contentDescription="@string/remove_poll_item"
+            android:scaleType="centerCrop"
+            android:src="@drawable/ic_remove_white" />
+    </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"