style: 重構員工卡支付對話框佈局並更新身分證/員工卡相關圖檔資源

This commit is contained in:
TaiwanStar Developer 2026-06-08 11:54:15 +08:00
parent 28a3d623f0
commit 907d5095d5
7 changed files with 85 additions and 53 deletions

View File

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

View File

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

View File

@ -9,80 +9,76 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/light_gray"
android:background="@color/cardSurface"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<!-- 標題列 -->
<TextView
android:id="@+id/textViewTitle"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@color/error"
android:background="@color/primary"
android:gravity="center"
android:text="@string/member_card_pickup_title"
android:textColor="@color/white"
android:textColor="@color/onPrimary"
android:textSize="24sp"
android:textStyle="bold" />
<!-- 資訊區:金額、提示文字、交易狀態 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_marginBottom="1dp"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
android:layout_marginBottom="1dp"
android:orientation="vertical"
android:paddingVertical="30dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="無需付款"
android:textColor="@color/primary"
android:textSize="40sp"
android:textStyle="bold" />
<TextView
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/textStatus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/please_tap_member_card"
android:textColor="@color/error"
android:textSize="35sp"
android:textStyle="bold" />
<TextView
android:id="@+id/textDetectedCardNo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
android:text=""
android:text="交易狀態:等待感應"
android:textColor="@color/black"
android:textSize="25sp" />
android:textSize="15sp" />
</LinearLayout>
<!-- 卡號輸入區 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:background="@color/white"
android:orientation="vertical">
<ImageView
android:id="@+id/imageNfc"
android:layout_width="match_parent"
android:layout_height="250dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:srcCompat="@drawable/checkout_nfc_card" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="20dp"
android:gravity="center"
android:background="@color/white"
android:orientation="vertical">
android:layout_marginBottom="1dp"
android:orientation="vertical"
android:padding="20dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="感應卡號:"
android:text="卡號資訊:"
android:textSize="20sp"
android:textColor="@color/black" />
@ -96,34 +92,70 @@
android:hint="請感應卡片"
android:inputType="text"
android:textSize="30sp"
android:textColor="@color/error"
android:textColor="@color/primary"
android:textStyle="bold"
android:focusable="true"
android:focusableInTouchMode="true" />
</LinearLayout>
<!-- 支援方式示意圖區 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_marginBottom="1dp"
android:gravity="center"
android:orientation="horizontal">
android:orientation="vertical"
android:paddingVertical="12dp">
<Button
<ImageView
android:layout_width="match_parent"
android:layout_height="180dp"
android:background="@null"
android:scaleType="fitCenter"
app:srcCompat="@drawable/payment_accepted_types_idcard" />
</LinearLayout>
<!-- 提示圖區(滿版) -->
<ImageView
android:id="@+id/imageNfc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="fitXY"
app:srcCompat="@drawable/payment_channel_idcard" />
<!-- 底部按鈕列 -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:backgroundTint="@color/white"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="64dp"
android:paddingHorizontal="0dp"
android:backgroundTint="@color/warning"
android:text="@string/cancel_40"
android:textSize="20sp"
android:textColor="@color/black" />
<!-- Hidden simulation button for testing card 0640741922 -->
android:textColor="@color/white"
android:textSize="16sp"
app:elevation="4dp"
app:cornerRadius="8dp" />
<!-- 隱藏模擬按鈕 (測試卡號 0640741922) -->
<View
android:id="@+id/viewSimulateTap"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="end|center_vertical"
android:background="@android:color/transparent" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -300,7 +300,7 @@
<string name="there_is_something_at_the_pickup_port">取貨口有東西,請先取出</string>
<string name="i_knew">知道了</string>
<string name="input_vehicle">輸入載具</string>
<string name="member_card_pickup_title">領取確認</string>
<string name="member_card_pickup_title">員工卡支付</string>
<string name="please_tap_member_card">請將員工卡靠近讀卡機</string>
<string name="sync_product">下載商品資料</string>
<string name="sync_product_warning">確定要從雲端下載商品資料嗎?這將會更新所有商品的品名、價格與圖片,並覆蓋目前的資訊。</string>