Skip to content

[FTA] change adding new items design #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hunnihundert wants to merge 1 commit into
base: feature/free-text-articles-2
Choose a base branch
from
Open

[FTA] change adding new items design #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 10 additions & 31 deletions app/src/main/res/layout/row_new_help_request_article.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down