diff options
Diffstat (limited to 'merchant-terminal/src/main/res/layout/fragment_order.xml')
| -rw-r--r-- | merchant-terminal/src/main/res/layout/fragment_order.xml | 142 |
1 files changed, 79 insertions, 63 deletions
diff --git a/merchant-terminal/src/main/res/layout/fragment_order.xml b/merchant-terminal/src/main/res/layout/fragment_order.xml index 45f1aee..dd2edc5 100644 --- a/merchant-terminal/src/main/res/layout/fragment_order.xml +++ b/merchant-terminal/src/main/res/layout/fragment_order.xml @@ -25,7 +25,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toStartOf="@+id/guideline1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -44,7 +44,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintStart_toStartOf="@+id/guideline1" app:layout_constraintTop_toTopOf="parent" @@ -63,86 +63,102 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline2" app:layout_constraintTop_toTopOf="parent" tools:layout="@layout/fragment_categories" /> - <Button - android:id="@+id/restartButton" - android:layout_width="wrap_content" + <HorizontalScrollView + android:id="@+id/buttonBar" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_restart" + android:scrollbars="horizontal" + android:fadeScrollbars="false" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintEnd_toStartOf="@id/completeButton"> - <Button - android:id="@+id/plusButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:minWidth="48dp" - android:text="+1" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/minusButton" - tools:ignore="HardcodedText" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> - <Button - android:id="@+id/minusButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:minWidth="48dp" - android:text="-1" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/restartButton" - tools:ignore="HardcodedText" /> + <Button + android:id="@+id/restartButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_restart" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - <Button - android:id="@+id/prevButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_previous" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/plusButton" /> + <Button + android:id="@+id/plusButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:minWidth="48dp" + android:text="+1" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/minusButton" + tools:ignore="HardcodedText" /> - <Button - android:id="@+id/nextButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_next" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/prevButton" /> - - <ImageButton - android:id="@+id/customButton" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_marginStart="16dp" - android:backgroundTint="?colorPrimary" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/nextButton" - app:srcCompat="@drawable/ic_dialpad" - android:contentDescription="@string/order_custom" /> + <Button + android:id="@+id/minusButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:minWidth="48dp" + android:text="-1" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/restartButton" + tools:ignore="HardcodedText" /> + + <Button + android:id="@+id/prevButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_previous" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/plusButton" /> + + <Button + android:id="@+id/nextButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_next" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/prevButton" /> + + <ImageButton + android:id="@+id/customButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="8dp" + android:backgroundTint="?colorPrimary" + app:srcCompat="@drawable/ic_dialpad" + android:contentDescription="@string/order_custom" /> + + </LinearLayout> + + </HorizontalScrollView> <Button android:id="@+id/completeButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="32dp" android:layout_marginEnd="8dp" - android:backgroundTint="@color/button_bottom" + android:backgroundTint="@color/green" android:text="@string/order_complete" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@+id/customButton" /> + app:layout_constraintHorizontal_bias="1.0" /> </androidx.constraintlayout.widget.ConstraintLayout> |