diff --git a/app/src/main/res/drawable/add_24.xml b/app/src/main/res/drawable/add_24.xml new file mode 100644 index 0000000..7a1b5bb --- /dev/null +++ b/app/src/main/res/drawable/add_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/bg_quantity_outline_button.xml b/app/src/main/res/drawable/bg_quantity_outline_button.xml new file mode 100644 index 0000000..e6e9c1c --- /dev/null +++ b/app/src/main/res/drawable/bg_quantity_outline_button.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/bg_waste_outline_button.xml b/app/src/main/res/drawable/bg_waste_outline_button.xml new file mode 100644 index 0000000..2de6c1b --- /dev/null +++ b/app/src/main/res/drawable/bg_waste_outline_button.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/close_24.xml b/app/src/main/res/drawable/close_24.xml new file mode 100644 index 0000000..2d0ef43 --- /dev/null +++ b/app/src/main/res/drawable/close_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/close_warning_24.xml b/app/src/main/res/drawable/close_warning_24.xml new file mode 100644 index 0000000..89d530e --- /dev/null +++ b/app/src/main/res/drawable/close_warning_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/remove_24.xml b/app/src/main/res/drawable/remove_24.xml new file mode 100644 index 0000000..c4ae68f --- /dev/null +++ b/app/src/main/res/drawable/remove_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/fragment_shopping_cart.xml b/app/src/main/res/layout/fragment_shopping_cart.xml index bd54c6a..f6d0d14 100644 --- a/app/src/main/res/layout/fragment_shopping_cart.xml +++ b/app/src/main/res/layout/fragment_shopping_cart.xml @@ -7,12 +7,23 @@ android:background="@color/white" android:orientation="vertical"> + + + @@ -30,41 +41,27 @@ android:id="@+id/summaryContainer" android:layout_width="match_parent" android:layout_height="120dp" + android:gravity="center|end" android:orientation="horizontal" - android:paddingHorizontal="40dp"> + android:paddingHorizontal="100dp"> - + - - - - - + - + + style="@style/TextAppearance.App.QuickCart.Medium" + android:textSize="24sp" + android:textStyle="normal" /> + + + + @@ -59,9 +73,11 @@ + android:layout_width="44dp" + android:layout_height="44dp" + android:padding="10dp" + android:background="@drawable/bg_quantity_outline_button" + android:src="@drawable/remove_24" /> + android:textColor="@color/black" /> + android:layout_width="44dp" + android:layout_height="44dp" + android:padding="10dp" + android:background="@drawable/bg_quantity_outline_button" + android:src="@drawable/add_24" /> - - - + android:layout_width="44dp" + android:layout_height="44dp" + android:layout_marginStart="32dp" + android:padding="10dp" + android:background="@drawable/bg_waste_outline_button" + android:src="@drawable/close_warning_24" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 2a2a49a..746add6 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -408,8 +408,8 @@ Add More Items Proceed to Checkout Cancel (%d sec) - Items: (%d) - NT$ %d + Cart Items (%d) + NT$%d Out of Stock Cannot Decrease Further Up to 8 items per cart diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1ac5723..4c759f4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -410,8 +410,8 @@ 商品を追加 お会計へ進む キャンセル(%d秒) - 商品数:(%d) - NT$ %d + 商品数(%d個) + NT$%d 在庫切れ これ以上減らせません カートは最大8点まで購入できます diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ee04141..f1ea949 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -327,8 +327,8 @@ 加購商品 前往結帳 取消(%d秒) - 商品數量:(%d) - NT$ %d + 購物車品項(%d件) + NT$%d 超出庫存 不能減少了 購物車最多可購買 8 件商品