Skip to content

T
TangKuPos
Commit 00cbd8db authored by 王海's avatar 王海
Browse files
Options

修改ui

parent 9b68b368
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 111 deletions
app/src/main/res/layout/dialog_handover.xml
View file @ 00cbd8db
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:weightSum="2" android:weightSum="2"
app:layout_constraintTop_toBottomOf="@id/view1"> app:layout_constraintTop_toBottomOf="@id/view1">
......
app/src/main/res/layout/dialog_prompt.xml
View file @ 00cbd8db
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
style="@style/SpinKitView.Circle" style="@style/SpinKitView.Circle"
android:layout_width="@dimen/prompt_dialog_logo_size" android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size" android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:SpinKit_Color="@color/black" /> app:SpinKit_Color="@color/black" />
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
android:id="@+id/tv_text" android:id="@+id/tv_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:text="正在处理，请稍后." android:text="正在处理，请稍后."
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
style="@style/button_positive_allradius" style="@style/button_positive_allradius"
android:layout_width="@dimen/button1_width" android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height" android:layout_height="@dimen/button1_height"
android:layout_marginBottom="@dimen/all_padding_left_right" android:layout_marginBottom="@dimen/all_bounced_padding"
android:text="重新获取" /> android:text="重新获取" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/dialog_sendTicker_befor.xml → app/src/main/res/layout/dialog_sendticker_befor.xml
View file @ 00cbd8db
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
android:layout_height="@dimen/prompt_dialog_height" android:layout_height="@dimen/prompt_dialog_height"
android:background="@color/store_back" android:background="@color/store_back"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical">
android:paddingTop="@dimen/all_margin">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -55,6 +54,7 @@ ...@@ -55,6 +54,7 @@
android:text="50元" android:text="50元"
android:textSize="@dimen/all_text_size_small"/> android:textSize="@dimen/all_text_size_small"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -74,7 +74,30 @@ ...@@ -74,7 +74,30 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="right"
android:text="50元" android:text="全部会员"
android:textSize="@dimen/all_text_size_small"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="发送张数："
android:textSize="@dimen/all_text_size_low"/>
<TextView
android:id="@+id/tv_send_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="5张"
android:textSize="@dimen/all_text_size_small"/> android:textSize="@dimen/all_text_size_small"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_inventory.xml
View file @ 00cbd8db
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="共0人次盘库记录" android:text="共0人次盘库记录"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/fragment_inventory_add.xml
View file @ 00cbd8db
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="@string/manage_inventory_add_title" android:text="@string/manage_inventory_add_title"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/fragment_myself.xml
View file @ 00cbd8db
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:id="@+id/user_img" android:id="@+id/user_img"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
android:id="@+id/drop_down_fff" android:id="@+id/drop_down_fff"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
android:src="@mipmap/drop_down_fff" android:src="@mipmap/drop_down_fff"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
......
app/src/main/res/layout/fragment_order_main.xml
View file @ 00cbd8db
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
android:id="@+id/ed_title" android:id="@+id/ed_title"
style="@style/searchBarEditor" style="@style/searchBarEditor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small" android:layout_marginTop="@dimen/padding_small"
android:layout_marginBottom="@dimen/padding_small" android:layout_marginBottom="@dimen/padding_small"
android:layout_height="30dp" android:layout_height="30dp"
......
app/src/main/res/layout/fragment_other_detail.xml
View file @ 00cbd8db
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_padding_left_right" android:layout_marginBottom="@dimen/all_bounced_padding"
android:background="@drawable/singleline_white_gray" android:background="@drawable/singleline_white_gray"
android:paddingBottom="@dimen/all_padding"> android:paddingBottom="@dimen/all_padding">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:id="@+id/img_goods" android:id="@+id/img_goods"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
app:layout_constraintTop_toTopOf="@id/img_goods" /> app:layout_constraintTop_toTopOf="@id/img_goods" />
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
android:id="@+id/tv_price" android:id="@+id/tv_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:textColor="@color/red_lvzhi" android:textColor="@color/red_lvzhi"
android:textSize="@dimen/big_text_size" android:textSize="@dimen/big_text_size"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -155,9 +155,9 @@ ...@@ -155,9 +155,9 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_stores" android:drawableStart="@mipmap/icon_stores"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding_left_right" android:paddingTop="@dimen/all_bounced_padding"
android:text="@{shopName}" android:text="@{shopName}"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -167,9 +167,9 @@ ...@@ -167,9 +167,9 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_address" android:drawableStart="@mipmap/icon_address"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding_left_right" android:paddingTop="@dimen/all_bounced_padding"
android:text="@{address}" android:text="@{address}"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -179,10 +179,10 @@ ...@@ -179,10 +179,10 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_telephone" android:drawableStart="@mipmap/icon_telephone"
android:paddingBottom="@dimen/all_padding_left_right" android:paddingBottom="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding_left_right" android:paddingTop="@dimen/all_bounced_padding"
android:text="@{phone}" android:text="@{phone}"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ 00cbd8db
...@@ -73,16 +73,16 @@ ...@@ -73,16 +73,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/ly_title" android:layout_below="@id/ly_title"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/white_caocao"> android:background="@color/white_caocao">
<TextView <TextView
android:id="@+id/tv_supplier_title" android:id="@+id/tv_supplier_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="供货方" android:text="供货方"
android:textColor="@color/black" android:textColor="@color/black"
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toTopOf="@id/view_line_left_1"> app:layout_constraintTop_toTopOf="@id/view_line_left_1">
...@@ -213,9 +213,9 @@ ...@@ -213,9 +213,9 @@
android:id="@+id/tv_shop_title" android:id="@+id/tv_shop_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="定货方" android:text="定货方"
android:textColor="@color/black" android:textColor="@color/black"
...@@ -254,8 +254,8 @@ ...@@ -254,8 +254,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tv_shop_title"> app:layout_constraintTop_toBottomOf="@id/tv_shop_title">
...@@ -355,8 +355,8 @@ ...@@ -355,8 +355,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}" android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop" app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop" app:layout_constraintStart_toStartOf="@id/ll_shop"
...@@ -384,8 +384,8 @@ ...@@ -384,8 +384,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}" android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop" app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop" app:layout_constraintStart_toStartOf="@id/ll_shop"
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:padding="@dimen/all_padding_left_right" android:padding="@dimen/all_bounced_padding"
android:text="定货明细" android:text="定货明细"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small_title" android:textSize="@dimen/all_text_size_small_title"
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ly_title" android:layout_below="@id/ly_title"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
......
app/src/main/res/layout/item_announcement_detail.xml
View file @ 00cbd8db
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/all_padding_left_right"> android:paddingBottom="@dimen/all_bounced_padding">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
......
app/src/main/res/layout/item_bale_edit.xml
View file @ 00cbd8db
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintStart_toEndOf="@id/iv_pic" app:layout_constraintStart_toEndOf="@id/iv_pic"
app:layout_constraintTop_toTopOf="@id/iv_pic"/> app:layout_constraintTop_toTopOf="@id/iv_pic"/>
......
app/src/main/res/layout/item_inventory.xml
View file @ 00cbd8db
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
android:id="@+id/img" android:id="@+id/img"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
android:src="@mipmap/img_boss" android:src="@mipmap/img_boss"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
android:id="@+id/tv_phone" android:id="@+id/tv_phone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" android:textSize="@dimen/all_text_size_low"
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
android:id="@+id/view_line" android:id="@+id/view_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_kongming" android:background="@color/gray_kongming"
app:layout_constraintTop_toBottomOf="@id/img" /> app:layout_constraintTop_toBottomOf="@id/img" />
......
app/src/main/res/layout/item_inventory_goods.xml
View file @ 00cbd8db
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:id="@+id/img_goods" android:id="@+id/img_goods"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
android:id="@+id/tv_goods_size" android:id="@+id/tv_goods_size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:background="@drawable/frame_frame_zhouyu_bg" android:background="@drawable/frame_frame_zhouyu_bg"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:text="规格" android:text="规格"
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_cart_item_button_height" android:layout_height="@dimen/dialog_cart_item_button_height"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
style="@style/other_select_smallstyle" style="@style/other_select_smallstyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/dp_4" android:layout_marginTop="@dimen/dp_4"
android:text="构成数量：" android:text="构成数量："
android:textStyle="bold" android:textStyle="bold"
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
style="@style/other_select_smallstyle" style="@style/other_select_smallstyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
android:text="系统库存：" android:text="系统库存："
android:textStyle="bold" android:textStyle="bold"
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
android:id="@+id/btn_ok" android:id="@+id/btn_ok"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:background="@drawable/shape_red_round_rectangle_more_round" android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground" android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing" android:paddingBottom="@dimen/all_spacing"
......
app/src/main/res/layout/item_marketing_menu.xml
View file @ 00cbd8db
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/white" android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_padding_left_right" android:layout_marginRight="@dimen/all_bounced_padding"
android:src="@mipmap/right" /> android:src="@mipmap/right" />
<LinearLayout <LinearLayout
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/iv" android:layout_toLeftOf="@+id/iv"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding"> android:paddingTop="@dimen/all_padding">
<ImageView <ImageView
......
app/src/main/res/layout/item_other_select.xml
View file @ 00cbd8db
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:id="@+id/img_goods" android:id="@+id/img_goods"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
app:layout_constraintTop_toTopOf="@id/img_goods" /> app:layout_constraintTop_toTopOf="@id/img_goods" />
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
android:id="@+id/tv_shop" android:id="@+id/tv_shop"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:drawableStart="@mipmap/icon_stores" android:drawableStart="@mipmap/icon_stores"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/item_replenishment.xml
View file @ 00cbd8db
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
android:id="@+id/ll_boss" android:id="@+id/ll_boss"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
android:gravity="center" android:gravity="center"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
android:id="@+id/ll_date" android:id="@+id/ll_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
android:id="@+id/ll_no" android:id="@+id/ll_no"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ 00cbd8db
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:text="规格" android:text="规格"
android:textSize="@dimen/all_text_size_small" android:textSize="@dimen/all_text_size_small"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_code" app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_goods_code" /> app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
......
app/src/main/res/layout/item_statistics.xml
View file @ 00cbd8db
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
android:layout_height="45dp" android:layout_height="45dp"
android:layout_marginBottom="@dimen/all_padding" android:layout_marginBottom="@dimen/all_padding"
android:layout_marginEnd="@dimen/all_padding" android:layout_marginEnd="@dimen/all_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:id="@+id/tv_left_top" android:id="@+id/tv_left_top"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_padding" android:paddingEnd="@dimen/all_padding"
android:text="1231231244124124" android:text="1231231244124124"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/item_string_head.xml
View file @ 00cbd8db
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:gravity="left" android:gravity="left"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:singleLine="true" android:singleLine="true"
android:text="北京店" android:text="北京店"
......
app/src/main/res/layout/view_inventory_detail.xml
View file @ 00cbd8db
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_margin"
android:padding="@dimen/dp_4"> android:padding="@dimen/dp_4">
......
app/src/main/res/layout/view_order_detail.xml
View file @ 00cbd8db
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin"> android:layout_marginTop="@dimen/all_margin">
<LinearLayout <LinearLayout
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/dp_4" android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4"> android:paddingTop="@dimen/dp_4">
<TextView <TextView
......
app/src/main/res/layout/view_ticket.xml
View file @ 00cbd8db
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin"> android:layout_marginTop="@dimen/all_margin">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:paddingBottom="@dimen/dp_4" android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/layout/view_vip_recharge.xml
View file @ 00cbd8db
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin"> android:layout_marginTop="@dimen/all_margin">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:paddingBottom="@dimen/dp_4" android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/values/dimens.xml
View file @ 00cbd8db
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<dimen name="all_spacing">8dp</dimen> <dimen name="all_spacing">8dp</dimen>
<dimen name="all_spacing_min">5dp</dimen> <dimen name="all_spacing_min">5dp</dimen>
<dimen name="all_bounced_spacing">6dp</dimen> <dimen name="all_bounced_spacing">6dp</dimen>
<dimen name="all_bounced_padding">16dp</dimen>
<dimen name="all_sub_title_size">20sp</dimen> <dimen name="all_sub_title_size">20sp</dimen>
<dimen name="big_text_size">18sp</dimen> <dimen name="big_text_size">18sp</dimen>
<dimen name="big_big_text_size">20sp</dimen> <dimen name="big_big_text_size">20sp</dimen>
...@@ -26,7 +27,6 @@ ...@@ -26,7 +27,6 @@
<dimen name="all_title_size">26sp</dimen> <dimen name="all_title_size">26sp</dimen>
<dimen name="all_padding">10dp</dimen> <dimen name="all_padding">10dp</dimen>
<dimen name="all_seach_height">36dp</dimen> <dimen name="all_seach_height">36dp</dimen>
<dimen name="all_padding_left_right">16dp</dimen>
<dimen name="Minus_padding_left_right">-17dp</dimen> <dimen name="Minus_padding_left_right">-17dp</dimen>
<dimen name="all_text_size_big">22sp</dimen> <dimen name="all_text_size_big">22sp</dimen>
<dimen name="all_text_size_big_big">30sp</dimen> <dimen name="all_text_size_big_big">30sp</dimen>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment