From e9f55949b7e65a4384ea927968675cf3584e3349 Mon Sep 17 00:00:00 2001
From: hunnihundert <47563806+hunnihundert@users.noreply.github.com>
Date: Sat, 11 Jul 2020 09:21:11 +0900
Subject: [PATCH] change "Cancel/Confirm" button pattern when adding items to
 "+" image button add content description for "+" image button to string.xml

---
 .../layout/row_new_help_request_article.xml   | 41 +++++--------------
 app/src/main/res/values-de/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/layout/row_new_help_request_article.xml b/app/src/main/res/layout/row_new_help_request_article.xml
index fb9bc56..bee6c73 100644
--- a/app/src/main/res/layout/row_new_help_request_article.xml
+++ b/app/src/main/res/layout/row_new_help_request_article.xml
@@ -112,47 +112,26 @@
             tools:itemCount="3"
             tools:listitem="@layout/view_chip_article_unit" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/container_new_article_buttons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@android:color/white"
-            android:padding="10dp"
-            android:visibility="@{viewModel.buttonsVisibility}"
-            app:layout_constraintTop_toBottomOf="@id/recyclerview_new_article_units">
 
-            <Button
-                android:id="@+id/button_new_article_cancel"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/rounded_outer_primary"
-                android:padding="8dp"
-                android:text="@string/cancel_button_title"
-                android:textColor="@color/colorPrimary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@id/button_new_article_confirm"
-                app:layout_constraintHorizontal_chainStyle="spread_inside"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <Button
+            <ImageButton
                 android:id="@+id/button_new_article_confirm"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:background="@drawable/rounded_primary"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/rounded_white"
                 android:enabled="@{!viewModel.articleName.empty}"
                 android:onClick="@{() -> viewModel.listener.onConfirm(viewModel)}"
                 android:padding="8dp"
-                android:text="@string/confirm_button_title"
+                android:contentDescription="@string/seeker_request_create_add_item_content_description"
+                android:src="@android:drawable/ic_menu_add"
+
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@id/button_new_article_cancel"
+                android:textSize="24sp"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/button_new_article_cancel"
-                app:layout_constraintTop_toTopOf="@id/button_new_article_cancel" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                android:visibility="@{viewModel.buttonsVisibility}"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/recyclerview_new_article_units" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9675e05..876e15c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -172,6 +172,7 @@
     <string name="seeker_request_create_confirm_address">"Bitte bestätige deine Lieferadresse"</string>
     <string name="seeker_request_create_submit">"Anfrage senden"</string>
     <string name="seeker_request_create_no_articles">"Bitte mindestens 1 Artikel wählen"</string>
+    <string name="seeker_request_create_add_item_content_description">Artikel hinzufügen</string>
     <string name="helper_request_detail_additional_request_header">"Zusätzliche Info"</string>
     <string name="helper_request_detail_delivery_address_header">"Lieferaddresse"</string>
     <string name="delivery_confirmation_delivery_comment">"Lieferhinweis"</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3722329..1287730 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -172,6 +172,7 @@ phone call"</string>
     <string name="seeker_request_create_confirm_address">"Please confirm your delivery address"</string>
     <string name="seeker_request_create_submit">"Submit Request"</string>
     <string name="seeker_request_create_no_articles">"Please enter at least 1 article"</string>
+    <string name="seeker_request_create_add_item_content_description">Add article</string>
     <string name="helper_request_detail_additional_request_header">"Additional Request"</string>
     <string name="helper_request_detail_delivery_address_header">"Delivery Address"</string>
     <string name="delivery_confirmation_delivery_comment">"Delivery comment"</string>