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 953cc9b..d0649c7 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 @@ -136,6 +136,9 @@ public class CashierFragment extends BaseFragment()); NAV_ITEMS.put(NAV_PRINTER, new ArrayList<>()); NAV_ITEMS.put(NAV_SETTINGS, new ArrayList<>()); + NAV_ITEMS.put(NAV_PINPAD, new ArrayList<>()); + NAV_ITEMS.put(NAV_CASHIER, new ArrayList<>()); Log.d(TAG, "Initialized empty NAV_ITEMS"); } @@ -261,15 +265,19 @@ public class PosParameters { map.put("NAV_SCAN", NAV_SCAN); map.put("NAV_PRINTER", NAV_PRINTER); map.put("NAV_SETTINGS", NAV_SETTINGS); + map.put("NAV_PINPAD", NAV_PINPAD); + map.put("NAV_CASHIER", NAV_CASHIER); return map; } private static Map createIconResourceMap() { Map map = new HashMap<>(); - map.put("home", R.drawable.am_card_pay_black); - map.put("scan", R.drawable.am_barcode_black); - map.put("printer", R.drawable.am_receipt_cart_black); - map.put("settings", R.drawable.am_settings_black); + map.put("home", R.drawable.ax_payment_grey); + map.put("scan", R.drawable.ax_scaner_grey); + map.put("printer", R.drawable.ax_receipt_grey); + map.put("settings", R.drawable.ax_settings_grey); + map.put("pinpad", R.drawable.ax_menu_grey); + map.put("cashier", R.drawable.ax_cashier_grey); map.put("mulberry", R.drawable.am_mulberry_logo_wide_color); map.put("overtec", R.drawable.am_overtec_logo_wide_color); map.put("datexpay", R.drawable.am_datexpay_logo_wide_color); diff --git a/pos_android_app/src/main/res/drawable/ax_cancle_grey.xml b/pos_android_app/src/main/res/drawable/ax_cancle_grey.xml new file mode 100644 index 0000000..d1a7428 --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_cancle_grey.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_card_grey.xml b/pos_android_app/src/main/res/drawable/ax_card_grey.xml new file mode 100644 index 0000000..81fe63a --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_card_grey.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_cashier_grey.xml b/pos_android_app/src/main/res/drawable/ax_cashier_grey.xml new file mode 100644 index 0000000..5e699d5 --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_cashier_grey.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_menu_grey.xml b/pos_android_app/src/main/res/drawable/ax_menu_grey.xml new file mode 100644 index 0000000..7516991 --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_menu_grey.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_payment_grey.xml b/pos_android_app/src/main/res/drawable/ax_payment_grey.xml new file mode 100644 index 0000000..e748fca --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_payment_grey.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_receipt_grey.xml b/pos_android_app/src/main/res/drawable/ax_receipt_grey.xml new file mode 100644 index 0000000..cc017e5 --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_receipt_grey.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_refund_grey.xml b/pos_android_app/src/main/res/drawable/ax_refund_grey.xml new file mode 100644 index 0000000..06926e8 --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_refund_grey.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_scaner_grey.xml b/pos_android_app/src/main/res/drawable/ax_scaner_grey.xml new file mode 100644 index 0000000..b70c2e2 --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_scaner_grey.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/pos_android_app/src/main/res/drawable/ax_settings_grey.xml b/pos_android_app/src/main/res/drawable/ax_settings_grey.xml new file mode 100644 index 0000000..1632c0c --- /dev/null +++ b/pos_android_app/src/main/res/drawable/ax_settings_grey.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/pos_android_app/src/main/res/layout/item_mulberry_card.xml b/pos_android_app/src/main/res/layout/item_mulberry_card.xml index 5109da1..11bccb2 100644 --- a/pos_android_app/src/main/res/layout/item_mulberry_card.xml +++ b/pos_android_app/src/main/res/layout/item_mulberry_card.xml @@ -28,8 +28,8 @@ android:layout_width="100dp" android:layout_height="100dp" android:src="@{viewModel.icon}" - android:scaleType="centerCrop" - tools:src="@drawable/am_mulberry_logo_wide_color" /> + android:scaleType="fitCenter" + tools:src="@drawable/ax_card_grey" />