diff --git a/pos_android_app/src/main/java/com/dspread/pos/ui/cashier/CashierFragment.java b/pos_android_app/src/main/java/com/dspread/pos/ui/cashier/CashierFragment.java index d0649c7..1b87735 100644 --- a/pos_android_app/src/main/java/com/dspread/pos/ui/cashier/CashierFragment.java +++ b/pos_android_app/src/main/java/com/dspread/pos/ui/cashier/CashierFragment.java @@ -70,16 +70,21 @@ public class CashierFragment extends BaseFragment amount = new ObservableField<>("0.00"); - public ObservableField currencyCode = new ObservableField<>("RUB"); + public ObservableField currencyCode = new ObservableField<>("₽"); + public ObservableField instructionText = new ObservableField<>(" "); + private final MutableLiveData paymentStatus = new MutableLiveData<>(PaymentStatus.WAITING); public LiveData getPaymentStatus() { return paymentStatus; @@ -53,6 +55,7 @@ public class CashierViewModel extends BaseAppViewModel { super(application); mContext = application.getApplicationContext(); initializePrinter(); + instructionText.set("Введите сумму для оплаты на PIN-пад"); } private void initializePrinter() { @@ -206,7 +209,7 @@ public class CashierViewModel extends BaseAppViewModel { public void sendMessage(String message) { try { sendWebSocketMessage(message); - + instructionText.set("Ожидание оплаты с пин-пада"); } catch (Exception e) { Log.e(TAG, "Error sending WebSocket message", e); } diff --git a/pos_android_app/src/main/res/drawable/background_new.xml b/pos_android_app/src/main/res/drawable/background_new.xml new file mode 100644 index 0000000..ed1afae --- /dev/null +++ b/pos_android_app/src/main/res/drawable/background_new.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/pos_android_app/src/main/res/drawable/mishka_like.gif b/pos_android_app/src/main/res/drawable/mishka_like.gif new file mode 100644 index 0000000..ca938dd Binary files /dev/null and b/pos_android_app/src/main/res/drawable/mishka_like.gif differ diff --git a/pos_android_app/src/main/res/layout/activity_payment.xml b/pos_android_app/src/main/res/layout/activity_payment.xml index 3de3a76..0ef899b 100644 --- a/pos_android_app/src/main/res/layout/activity_payment.xml +++ b/pos_android_app/src/main/res/layout/activity_payment.xml @@ -111,14 +111,14 @@ android:id="@+id/iv_status" android:layout_width="40dp" android:layout_height="40dp" - android:src="@{viewModel.isSuccess ? @drawable/ic_check_circle : @drawable/ic_error_circle}" + android:src="@{viewModel.isSuccess ? @drawable/ic_check_circle : null}" android:layout_marginEnd="8dp"/> diff --git a/pos_android_app/src/main/res/layout/fragment_cashier.xml b/pos_android_app/src/main/res/layout/fragment_cashier.xml index 0be3bb1..98d4667 100644 --- a/pos_android_app/src/main/res/layout/fragment_cashier.xml +++ b/pos_android_app/src/main/res/layout/fragment_cashier.xml @@ -20,10 +20,11 @@ + android:maxLines="1" + android:textColor="@color/white" + android:visibility="visible"/> + android:textStyle="bold" /> @@ -74,11 +79,13 @@