style(ui): 優化出貨進度對話框結構、版面自適應與配色調整
- 頁面標題改為「出貨進度」，背景調整為主色 (primary) - 新增並更新多國語言字串 (processing, dispatch_progress) - 重構底部的當前出貨進度區塊結構，移除冗餘嵌套，將區塊背景設為 cardSurface - 取消按鈕樣式改為 warning/onWarning 配色，扁平化結構並去除冗餘 FrameLayout - 清單區域高度改為 weight=1 自適應剩餘空間，移除 Space 元件，背景改為 background 色
This commit is contained in:
TaiwanStar Developer
parent
907d5095d5
commit
f2ed393686
@ -4,15 +4,16 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/linearLayout3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/light_gray">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout4"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:background="@color/light_gray"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
@ -21,9 +22,9 @@
|
||||
android:id="@+id/textView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="@color/error"
|
||||
android:background="@color/primary"
|
||||
android:gravity="center"
|
||||
android:text="@string/shopping_cart_checkout"
|
||||
android:text="@string/dispatch_progress"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold" />
|
||||
@ -51,7 +52,9 @@
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@color/background"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
@ -67,130 +70,67 @@
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recyclerDialogDispatchList"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="450dp" />
|
||||
android:layout_height="match_parent" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingBottom="5dp"
|
||||
android:layout_marginStart="1dp"
|
||||
android:layout_marginEnd="1dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:background="@color/gray"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
android:background="@color/cardSurface"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingBottom="5dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/shipping_goods"
|
||||
android:background="@color/primary"
|
||||
android:text="@string/processing"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@color/white"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp"
|
||||
android:layout_marginStart="1dp"
|
||||
android:layout_marginTop="1dp"
|
||||
android:layout_marginEnd="1dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:background="@color/white"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintDimensionRatio="16:9"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
android:textColor="@color/onPrimary" />
|
||||
|
||||
<RelativeLayout
|
||||
<ImageView
|
||||
android:id="@+id/imageProductPicture"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintDimensionRatio="16:9"
|
||||
android:paddingTop="10dp"
|
||||
android:paddingBottom="10dp"
|
||||
android:paddingLeft="50dp"
|
||||
android:paddingRight="50dp"
|
||||
android:gravity="center">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageProductPicture"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:adjustViewBounds="true"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/default_product"
|
||||
app:layout_constraintDimensionRatio="16:9"
|
||||
/>
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginStart="1dp"
|
||||
android:layout_marginEnd="1dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:background="@color/white"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
android:layout_height="240dp"
|
||||
android:adjustViewBounds="true"
|
||||
android:scaleType="fitCenter"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingBottom="5dp"
|
||||
android:paddingLeft="20dp"
|
||||
android:paddingRight="20dp"
|
||||
android:src="@drawable/default_product" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textProductName"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="50dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/product_name"
|
||||
android:textSize="24sp"
|
||||
android:textColor="@color/black"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="180dp"
|
||||
android:layout_marginStart="1dp"
|
||||
android:layout_marginEnd="1dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:background="@color/white"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent">
|
||||
android:textColor="@color/black" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dispatchtips"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="180dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/pick_up_goods_within_15_seconds_after_pick_up_port_opened"
|
||||
android:textSize="65sp"
|
||||
android:textColor="@color/error"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dp"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
android:textColor="@color/primary" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonOk"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/white"
|
||||
android:layout_height="50dp"
|
||||
android:backgroundTint="@color/warning"
|
||||
android:text="@string/cancel_40"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@color/black" />
|
||||
android:textColor="@color/onWarning" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -274,6 +274,8 @@
|
||||
<string name="input_complete">Input Complete</string>
|
||||
<!-- dialog_dispatch.xml -->
|
||||
<string name="shipping_goods">Shipping goods</string>
|
||||
<string name="processing">Processing</string>
|
||||
<string name="dispatch_progress">Shipping Progress</string>
|
||||
<string name="product_name">Product Name</string>
|
||||
<string name="error_report">Error Report</string>
|
||||
<!-- dialog_invoice_barcode.xml -->
|
||||
|
||||
@ -274,6 +274,8 @@
|
||||
<string name="input_complete">入力完了</string>
|
||||
<!-- dialog_dispatch.xml -->
|
||||
<string name="shipping_goods">商品の発送</string>
|
||||
<string name="processing">処理中</string>
|
||||
<string name="dispatch_progress">出荷進度</string>
|
||||
<string name="product_name">製品名</string>
|
||||
<string name="error_report">エラーレポート</string>
|
||||
<!-- dialog_invoice_barcode.xml -->
|
||||
|
||||
@ -184,6 +184,8 @@
|
||||
<string name="input_complete">輸入完成</string>
|
||||
<!-- dialog_dispatch.xml -->
|
||||
<string name="shipping_goods">出貨商品</string>
|
||||
<string name="processing">正在處理</string>
|
||||
<string name="dispatch_progress">出貨進度</string>
|
||||
<string name="product_name">商品名稱</string>
|
||||
<string name="error_report">錯誤回報</string>
|
||||
<!-- dialog_invoice_barcode.xml -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user