diff options
Diffstat (limited to 'merchant-terminal/src/main/res/layout')
| -rw-r--r-- | merchant-terminal/src/main/res/layout/fragment_merchant_config.xml | 368 | ||||
| -rw-r--r-- | merchant-terminal/src/main/res/layout/fragment_order.xml | 142 |
2 files changed, 337 insertions, 173 deletions
diff --git a/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml b/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml index 0061a1c..f53ecf6 100644 --- a/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml +++ b/merchant-terminal/src/main/res/layout/fragment_merchant_config.xml @@ -21,131 +21,279 @@ android:layout_height="match_parent" android:fillViewport="true"> - <androidx.constraintlayout.widget.ConstraintLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:orientation="vertical" tools:context=".config.ConfigFragment"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/configUrlView" - android:layout_width="0dp" + <com.google.android.material.button.MaterialButtonToggleGroup + android:id="@+id/configToggle" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dp" - android:hint="@string/config_url" - app:boxBackgroundColor="@android:color/transparent" - app:boxBackgroundMode="outline" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - - <com.google.android.material.textfield.TextInputEditText - android:layout_width="match_parent" + app:singleSelection="true" + app:checkedButton="@id/newConfigButton"> + <Button + style="?attr/materialButtonOutlinedStyle" + android:id="@+id/oldConfigButton" + android:layout_width="0dp" android:layout_height="wrap_content" - android:inputType="textUri" /> - - </com.google.android.material.textfield.TextInputLayout> + android:layout_weight="1" + android:text="@string/config_old_label"/> + <Button + style="?attr/materialButtonOutlinedStyle" + android:id="@+id/newConfigButton" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/config_new_label" /> + </com.google.android.material.button.MaterialButtonToggleGroup> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/usernameView" - android:layout_width="0dp" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/oldConfigForm" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dp" - android:hint="@string/config_username" - app:boxBackgroundColor="@android:color/transparent" - app:boxBackgroundMode="outline" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/configUrlView"> - - <com.google.android.material.textfield.TextInputEditText + android:visibility="gone" + tools:visibility="visible"> + + <androidx.cardview.widget.CardView + android:id="@+id/deprecationCard" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="text" /> + app:contentPadding="10dp" + android:layout_margin="16dp" + app:cardBackgroundColor="@color/red" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAlignment="center" + android:textColor="@android:color/white" + android:text="@string/config_old_deprecation" /> + </androidx.cardview.widget.CardView> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/configUrlView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_url" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/deprecationCard"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/passwordView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:hint="@string/config_password" - app:boxBackgroundColor="@android:color/transparent" - app:boxBackgroundMode="outline" - app:endIconMode="password_toggle" - app:layout_constraintEnd_toStartOf="@+id/forgetPasswordButton" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/usernameView"> - - <com.google.android.material.textfield.TextInputEditText - android:layout_width="match_parent" + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textUri" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/usernameView" + android:layout_width="0dp" android:layout_height="wrap_content" - android:inputType="textWebPassword" /> + android:layout_margin="16dp" + android:hint="@string/config_username" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/configUrlView"> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="text" /> - <Button - android:id="@+id/forgetPasswordButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:text="@string/config_forget_password" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="@+id/passwordView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/passwordView" - tools:visibility="visible" /> - - <CheckBox - android:id="@+id/savePasswordCheckBox" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:checked="true" - android:text="@string/config_save_password" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/okButton" - app:layout_constraintHorizontal_chainStyle="spread_inside" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/passwordView" - app:layout_constraintVertical_bias="0.0" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/okButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:text="@string/config_ok" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/savePasswordCheckBox" - app:layout_constraintTop_toBottomOf="@+id/passwordView" - app:layout_constraintVertical_bias="0.0" /> - - <ProgressBar - android:id="@+id/progressBar" - style="?android:attr/progressBarStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="invisible" - app:layout_constraintBottom_toBottomOf="@+id/okButton" - app:layout_constraintEnd_toEndOf="@+id/okButton" - app:layout_constraintStart_toStartOf="@+id/okButton" - app:layout_constraintTop_toTopOf="@+id/okButton" - tools:visibility="visible" /> - - <TextView - android:id="@+id/configDocsView" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:text="@string/config_docs" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/okButton" /> + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/passwordView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_password" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:endIconMode="password_toggle" + app:layout_constraintEnd_toStartOf="@+id/forgetPasswordButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/usernameView"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textWebPassword" /> + + </com.google.android.material.textfield.TextInputLayout> + + <Button + android:id="@+id/forgetPasswordButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_forget_password" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/passwordView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/passwordView" + tools:visibility="visible" /> + + <CheckBox + android:id="@+id/savePasswordCheckBox" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:checked="true" + android:text="@string/config_save_password" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/okOldButton" + app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/passwordView" + app:layout_constraintVertical_bias="0.0" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/okOldButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_ok" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/savePasswordCheckBox" + app:layout_constraintTop_toBottomOf="@+id/passwordView" + app:layout_constraintVertical_bias="0.0" /> + + <ProgressBar + android:id="@+id/progressBarOld" + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="@+id/okOldButton" + app:layout_constraintEnd_toEndOf="@+id/okOldButton" + app:layout_constraintStart_toStartOf="@+id/okOldButton" + app:layout_constraintTop_toTopOf="@+id/okOldButton" + tools:visibility="visible" /> + + <TextView + android:id="@+id/configDocsView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_docs" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/okOldButton" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/newConfigForm" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/merchantUrlView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_merchant_url" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textUri" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/tokenView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:hint="@string/config_token" + app:boxBackgroundColor="@android:color/transparent" + app:boxBackgroundMode="outline" + app:endIconMode="password_toggle" + app:layout_constraintEnd_toStartOf="@+id/forgetTokenButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/merchantUrlView"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textWebPassword" /> + + </com.google.android.material.textfield.TextInputLayout> + + <Button + android:id="@+id/forgetTokenButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_forget_password" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/tokenView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/tokenView" + tools:visibility="visible" /> + + <CheckBox + android:id="@+id/saveTokenCheckBox" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:checked="true" + android:text="@string/config_save_password" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/okNewButton" + app:layout_constraintHorizontal_chainStyle="spread_inside" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tokenView" + app:layout_constraintVertical_bias="0.0" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/okNewButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:text="@string/config_ok" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/saveTokenCheckBox" + app:layout_constraintTop_toBottomOf="@+id/tokenView" + app:layout_constraintVertical_bias="0.0" /> + + <ProgressBar + android:id="@+id/progressBarNew" + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="invisible" + app:layout_constraintBottom_toBottomOf="@+id/okNewButton" + app:layout_constraintEnd_toEndOf="@+id/okNewButton" + app:layout_constraintStart_toStartOf="@+id/okNewButton" + app:layout_constraintTop_toTopOf="@+id/okNewButton" + tools:visibility="visible" /> + + </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.constraintlayout.widget.ConstraintLayout> + </LinearLayout> </ScrollView> 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> |