From b32f76c7536b8811cdf975d23ce17344cf613501 Mon Sep 17 00:00:00 2001
From: TaiwanStar Developer <twsystem1003@gmail.com>
Date: Mon, 15 Jun 2026 13:57:41 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=AA=BF=E6=95=B4=E7=B5=90=E5=B8=B3?=
 =?UTF-8?q?=E5=B0=8D=E8=A9=B1=E6=A1=86=E4=BA=A4=E6=98=93=E9=87=91=E9=A1=8D?=
 =?UTF-8?q?=E5=86=92=E8=99=9F=E8=88=87=E6=8C=89=E9=88=95=E9=A1=8F=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 將Line Pay、NFC卡片、NFC手機、NFC加值對話框中的交易金額冒號改為全形

- 調整NFC卡片對話框取消按鈕文字色為onWarning，修改支付方式背景色為gray
---
 .../res/layout/dialog_checkout_line_pay.xml   | 158 +++++++++++-------
 .../res/layout/dialog_checkout_nfc_card.xml   | 155 ++++++++++-------
 .../res/layout/dialog_checkout_nfc_phone.xml  | 157 ++++++++++-------
 .../layout/dialog_checkout_nfc_recharge.xml   | 156 ++++++++++-------
 4 files changed, 379 insertions(+), 247 deletions(-)

diff --git a/app/src/main/res/layout/dialog_checkout_line_pay.xml b/app/src/main/res/layout/dialog_checkout_line_pay.xml
index 37afe31..93d0a11 100644
--- a/app/src/main/res/layout/dialog_checkout_line_pay.xml
+++ b/app/src/main/res/layout/dialog_checkout_line_pay.xml
@@ -11,7 +11,7 @@
         android:id="@+id/linearLayout4"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="@color/light_gray"
+        android:background="@color/surface"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -20,76 +20,88 @@
         <TextView
             android:id="@+id/textView"
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@color/error"
+            android:layout_height="60dp"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:text="@string/shopping_cart_linepay_checkout"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="20sp"
             android:textStyle="bold" />
 
         <LinearLayout
             android:id="@+id/linearLayout"
             android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0dp"
+            android:orientation="vertical"
+            android:paddingVertical="30dp">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="交易金額："
+                    android:textColor="@color/black"
+                    android:textSize="40sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="NT$"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/textPrice"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="0"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
             <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1.10"
-                android:gravity="center|end"
-                android:text="@string/transaction_amount"
-                android:textColor="@color/error"
-                android:textSize="30sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="請將付款條碼對準掃描器"
+                android:textColor="@color/primary"
+                android:textSize="25sp"
                 android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/textPrice"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.90"
-                android:gravity="center|start"
-                android:text="0"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
             <TextView
                 android:id="@+id/textStatus"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.90"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
                 android:gravity="center"
                 android:text="@string/transaction_status"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:textStyle="" />
+
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingVertical="50dp"
             android:gravity="center"
             android:orientation="vertical">
 
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="100dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
@@ -97,40 +109,60 @@
                 app:srcCompat="@drawable/checkout_wait" />
 
             <ImageView
-                android:id="@+id/imageCheckout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="300dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/checkout_barcode" />
+                app:srcCompat="@drawable/tappay30" />
+
+            <ImageView
+                android:id="@+id/imageCheckout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:adjustViewBounds="true"
+                android:background="@null"
+                android:scaleType="fitCenter"
+                app:srcCompat="@drawable/payment_channel_qrcode_scan" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/cancel_40"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/warning"
+                android:text="取消支付(40秒)"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonChange"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
+                android:layout_marginStart="16dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/replacement_payment"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/infoContainer"
+                android:text="修改支付方式"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
         </LinearLayout>
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_checkout_nfc_card.xml b/app/src/main/res/layout/dialog_checkout_nfc_card.xml
index 51f6d99..5864612 100644
--- a/app/src/main/res/layout/dialog_checkout_nfc_card.xml
+++ b/app/src/main/res/layout/dialog_checkout_nfc_card.xml
@@ -11,7 +11,7 @@
         android:id="@+id/linearLayout4"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="@color/light_gray"
+        android:background="@color/surface"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,73 +21,87 @@
             android:id="@+id/textView"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/error"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:text="@string/shopping_cart_credit_card_checkout"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="20sp"
             android:textStyle="bold" />
 
         <LinearLayout
             android:id="@+id/linearLayout"
             android:layout_width="match_parent"
-            android:layout_height="280dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0dp"
+            android:orientation="vertical"
+            android:paddingVertical="30dp">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="交易金額："
+                    android:textColor="@color/black"
+                    android:textSize="40sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="NT$"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/textPrice"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="0"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
             <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1.1"
-                android:gravity="center|end"
-                android:text="@string/transaction_amount"
-                android:textColor="@color/error"
-                android:textSize="30sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="請將卡片靠近感應區"
+                android:textColor="@color/primary"
+                android:textSize="25sp"
                 android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/textPrice"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.90"
-                android:gravity="center|start"
-                android:text="0"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="280dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
             <TextView
                 android:id="@+id/textStatus"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.90"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
                 android:gravity="center"
                 android:text="@string/transaction_status"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:textStyle="" />
+
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingVertical="50dp"
             android:gravity="center"
             android:orientation="vertical">
 
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="100dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
@@ -95,41 +109,60 @@
                 app:srcCompat="@drawable/checkout_wait" />
 
             <ImageView
-                android:id="@+id/imageCheckout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="100dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/checkout_nfc_card"
-                />
+                app:srcCompat="@drawable/payment_accepted_types_credit_card" />
+
+            <ImageView
+                android:id="@+id/imageCheckout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:adjustViewBounds="true"
+                android:background="@null"
+                android:scaleType="fitCenter"
+                app:srcCompat="@drawable/payment_channel_idcard" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/cancel_40"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/warning"
+                android:text="取消支付(40秒)"
+                android:textColor="@color/onWarning"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonChange"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
+                android:layout_marginStart="16dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/replacement_payment"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/gray"
+                android:text="修改支付方式"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
         </LinearLayout>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_checkout_nfc_phone.xml b/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
index 61f5d2c..89101f1 100644
--- a/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
+++ b/app/src/main/res/layout/dialog_checkout_nfc_phone.xml
@@ -11,7 +11,7 @@
         android:id="@+id/linearLayout4"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="@color/light_gray"
+        android:background="@color/surface"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,74 +21,87 @@
             android:id="@+id/textView"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/error"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:text="@string/shopping_cart_mobile_payment_checkout"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="20sp"
             android:textStyle="bold" />
 
         <LinearLayout
             android:id="@+id/linearLayout"
             android:layout_width="match_parent"
-            android:layout_height="280dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0dp"
+            android:orientation="vertical"
+            android:paddingVertical="30dp">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="交易金額："
+                    android:textColor="@color/black"
+                    android:textSize="40sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="NT$"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/textPrice"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="0"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
             <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1.1"
-                android:gravity="center|end"
-                android:text="@string/transaction_amount"
-                android:textColor="@color/error"
-                android:textSize="30sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="請將付款條碼對準掃描器"
+                android:textColor="@color/primary"
+                android:textSize="25sp"
                 android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/textPrice"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.9"
-                android:gravity="center|start"
-                android:text="0"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="280dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
             <TextView
                 android:id="@+id/textStatus"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.90"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
                 android:gravity="center"
                 android:text="@string/transaction_status"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:textStyle="" />
+
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingVertical="50dp"
             android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="visible">
+            android:orientation="vertical">
 
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="100dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
@@ -96,40 +109,60 @@
                 app:srcCompat="@drawable/checkout_wait" />
 
             <ImageView
-                android:id="@+id/imageCheckout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="100dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/checkout_nfc_phone" />
+                app:srcCompat="@drawable/payment_accepted_types_mobile" />
+
+            <ImageView
+                android:id="@+id/imageCheckout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:adjustViewBounds="true"
+                android:background="@null"
+                android:scaleType="fitCenter"
+                app:srcCompat="@drawable/payment_channel_qrcode_scan" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/cancel_40"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/warning"
+                android:text="取消支付(40秒)"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonChange"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
+                android:layout_marginStart="16dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/replacement_payment"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/infoContainer"
+                android:text="修改支付方式"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
         </LinearLayout>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml b/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
index 3f1c2cd..03401a3 100644
--- a/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
+++ b/app/src/main/res/layout/dialog_checkout_nfc_recharge.xml
@@ -11,7 +11,7 @@
         android:id="@+id/linearLayout4"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="@color/light_gray"
+        android:background="@color/surface"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -21,73 +21,87 @@
             android:id="@+id/textView"
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:background="@color/error"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:text="@string/shopping_cart_merchant_payment_checkout"
-            android:textColor="@color/white"
+            android:textColor="@color/black"
             android:textSize="20sp"
             android:textStyle="bold" />
 
         <LinearLayout
             android:id="@+id/linearLayout"
             android:layout_width="match_parent"
-            android:layout_height="280dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="0dp"
+            android:orientation="vertical"
+            android:paddingVertical="30dp">
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="交易金額："
+                    android:textColor="@color/black"
+                    android:textSize="40sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="NT$"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/textPrice"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="0"
+                    android:textColor="@color/primary"
+                    android:textSize="48sp"
+                    android:textStyle="bold" />
+            </LinearLayout>
             <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1.1"
-                android:gravity="center|end"
-                android:text="@string/transaction_amount"
-                android:textColor="@color/error"
-                android:textSize="30sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="請將卡片靠近感應區"
+                android:textColor="@color/primary"
+                android:textSize="25sp"
                 android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/textPrice"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.90"
-                android:gravity="center|start"
-                android:text="0"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="280dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
             <TextView
                 android:id="@+id/textStatus"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.90"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
                 android:gravity="center"
                 android:text="@string/transaction_status"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
+                android:textColor="@color/black"
+                android:textSize="15sp"
+                android:textStyle="" />
+
         </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingVertical="50dp"
             android:gravity="center"
             android:orientation="vertical">
 
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="100dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
@@ -95,40 +109,60 @@
                 app:srcCompat="@drawable/checkout_wait" />
 
             <ImageView
-                android:id="@+id/imageCheckout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="100dp"
                 android:adjustViewBounds="true"
                 android:background="@null"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/checkout_nfc_recharge" />
+                app:srcCompat="@drawable/pay_smart_card_method" />
+
+            <ImageView
+                android:id="@+id/imageCheckout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:adjustViewBounds="true"
+                android:background="@null"
+                android:scaleType="fitCenter"
+                app:srcCompat="@drawable/payment_channel_idcard" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/cancel_40"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/warning"
+                android:text="取消支付(40秒)"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonChange"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
+                android:layout_marginStart="16dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/replacement_payment"
-                android:textSize="20sp"
-                android:textColor="@color/black" />
+                android:paddingHorizontal="0dp"
+                android:backgroundTint="@color/infoContainer"
+                android:text="修改支付方式"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                app:elevation="4dp"
+                app:cornerRadius="8dp" />
         </LinearLayout>
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>