Skip to content

T
TangKuPos
Commit 1ae349a1 authored by 王海's avatar 王海
Browse files
Options

修改常量

parent 10ae7e68
Show whitespace changes
Inline Side-by-side
Showing with 488 additions and 457 deletions
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @ 1ae349a1
...@@ -28,27 +28,57 @@ ...@@ -28,27 +28,57 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<Button
android:id="@+id/btn_add"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/all_margin"
android:background="@color/red_guanyu"
android:onClick="@{OnClickListener}"
android:text="确定"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/btn_add"
android:layout_below="@+id/ic_title">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/store_back" android:background="@color/store_back"
android:focusable="true" android:focusable="true"
android:orientation="vertical"> android:orientation="vertical">
<include
android:id="@+id/ic_title" <View
layout="@layout/title"/> android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="基本信息" android:text="基本信息"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"/> android:textSize="@dimen/text_secondary_title"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -63,7 +93,7 @@ ...@@ -63,7 +93,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="规则名称:" android:text="规则名称:"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -102,7 +132,7 @@ ...@@ -102,7 +132,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="启用状态:" android:text="启用状态:"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -145,20 +175,23 @@ ...@@ -145,20 +175,23 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:background="@color/gray_huanggai"></View>
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="规则设置" android:text="规则设置"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"/> android:textSize="@dimen/text_secondary_title"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -172,7 +205,7 @@ ...@@ -172,7 +205,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="会员等级:" android:text="会员等级:"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -183,7 +216,8 @@ ...@@ -183,7 +216,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_weight="4" android:layout_marginRight="@dimen/all_margin"
android:layout_weight="5"
android:drawableRight="@mipmap/createstore_drop_down" android:drawableRight="@mipmap/createstore_drop_down"
android:ems="10" android:ems="10"
android:gravity="center" android:gravity="center"
...@@ -198,7 +232,8 @@ ...@@ -198,7 +232,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_weight="4" android:layout_marginRight="@dimen/all_margin"
android:layout_weight="5"
android:ems="10" android:ems="10"
android:gravity="center" android:gravity="center"
android:maxLength="5" android:maxLength="5"
...@@ -207,12 +242,6 @@ ...@@ -207,12 +242,6 @@
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
android:visibility="gone"/> android:visibility="gone"/>
<TextView
android:id="@+id/ns_vip_level"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
/>
</LinearLayout> </LinearLayout>
<View <View
...@@ -220,7 +249,8 @@ ...@@ -220,7 +249,8 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View> android:background="@color/gray1"
android:visibility="gone"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -234,7 +264,7 @@ ...@@ -234,7 +264,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="获取方式:" android:text="获取方式:"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -244,12 +274,14 @@ ...@@ -244,12 +274,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="5" android:layout_weight="5"
android:checkedButton="@id/rd_gettype_all" android:checkedButton="@id/rd_gettype_all"
android:orientation="horizontal"> android:orientation="vertical">
<RadioButton <RadioButton
android:id="@+id/rd_gettype_all" android:id="@+id/rd_gettype_all"
android:layout_width="0dp" android:layout_width="90dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_margin="@dimen/all_padding"
android:layout_marginLeft="@dimen/all_margin"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg" android:background="@drawable/selector_checkbox_bg"
android:button="@null" android:button="@null"
...@@ -260,8 +292,9 @@ ...@@ -260,8 +292,9 @@
<RadioButton <RadioButton
android:id="@+id/rd_gettype_category" android:id="@+id/rd_gettype_category"
android:layout_width="0dp" android:layout_width="90dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_margin="@dimen/all_padding"
android:layout_marginLeft="@dimen/all_margin" android:layout_marginLeft="@dimen/all_margin"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg" android:background="@drawable/selector_checkbox_bg"
...@@ -273,8 +306,9 @@ ...@@ -273,8 +306,9 @@
<RadioButton <RadioButton
android:id="@+id/rd_gettype_shop" android:id="@+id/rd_gettype_shop"
android:layout_width="0dp" android:layout_width="90dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_margin="@dimen/all_padding"
android:layout_marginLeft="@dimen/all_margin" android:layout_marginLeft="@dimen/all_margin"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg" android:background="@drawable/selector_checkbox_bg"
...@@ -314,7 +348,7 @@ ...@@ -314,7 +348,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="积分比例:" android:text="积分比例:"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -336,7 +370,9 @@ ...@@ -336,7 +370,9 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin"
android:layout_weight="2" android:layout_weight="2"
android:gravity="right"
android:text="元一个积分" android:text="元一个积分"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -347,7 +383,8 @@ ...@@ -347,7 +383,8 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View> android:background="@color/gray1"
android:visibility="gone"></View>
<LinearLayout <LinearLayout
...@@ -362,7 +399,7 @@ ...@@ -362,7 +399,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding_left_right"
android:text="有效期限:" android:text="有效期限:"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -384,7 +421,9 @@ ...@@ -384,7 +421,9 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin"
android:layout_weight="2" android:layout_weight="2"
android:gravity="right"
android:text="个月" android:text="个月"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
...@@ -405,7 +444,6 @@ ...@@ -405,7 +444,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <LinearLayout
...@@ -508,7 +546,8 @@ ...@@ -508,7 +546,8 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View> android:background="@color/gray1"
android:visibility="gone"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -554,7 +593,8 @@ ...@@ -554,7 +593,8 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View> android:background="@color/gray1"
android:visibility="gone"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -649,17 +689,7 @@ ...@@ -649,17 +689,7 @@
android:background="@color/gray1"></View> android:background="@color/gray1"></View>
</LinearLayout> </LinearLayout>
</ScrollView>
<Button
android:id="@+id/btn_add"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/all_margin"
android:background="@color/red_guanyu"
android:onClick="@{OnClickListener}"
android:text="确定"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ 1ae349a1
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<dimen name="all_tiny_size">9sp</dimen> <dimen name="all_tiny_size">9sp</dimen>
<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_padding_left_right">15dp</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>
<dimen name="all_text_size_super_big">25sp</dimen> <dimen name="all_text_size_super_big">25sp</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