Skip to content

T
TangKuPos
Commit 11465d72 authored by 王海's avatar 王海
Browse files
Options

修改样式

parent d1419b6e
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 32 deletions
app/src/main/res/drawable/radio_select.xml
View file @ 11465d72
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!--被按压时-->
<item android:color="@color/blue" android:drawable="@drawable/radio_shape_item" android:state_checked="true"/>
<item android:color="@color/black_baozheng" android:drawable="@drawable/radio_shape_item" android:state_checked="true"/>
<!--普通状态，这里在stroke中通过dashWidth和dashGap设置边线为虚线-->
<item android:color="@color/black" android:state_checked="false">
......
app/src/main/res/drawable/radio_shape_item.xml
View file @ 11465d72
......@@ -9,7 +9,7 @@
<solid android:color="@android:color/transparent"/>
<stroke
android:width="2dp"
android:color="@color/blue"/>
android:color="@color/red_guanyu"/>
</shape>
</item>
......
app/src/main/res/drawable/singleline_white_gray.xml 0 → 100644
View file @ 11465d72
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/gray_huanggai"/>
</shape>
</item>
<item android:bottom="1dp">
<shape>
<solid android:color="@color/white"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_integral.xml
View file @ 11465d72
......@@ -13,7 +13,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack"
android:background="@color/white"
tools:context="com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity">
<include
......@@ -21,12 +21,44 @@
layout="@layout/title"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/ll_menu"
android:background="@drawable/singleline_white_gray"
app:layout_constraintBottom_toTopOf="@id/btn_add"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="@integer/all_top_weight"/>
<LinearLayout
android:id="@+id/btn_add"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/singleline_white_gray"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@id/ll_menu"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ic_title"
app:layout_constraintVertical_weight="@integer/all_top_weight">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/but_add"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_padding"
android:text="添加获取规则"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/text_three_title"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_menu"
android:layout_width="0dp"
......@@ -39,15 +71,14 @@
app:layout_constraintBottom_toBottomOf="@id/cl_bottom"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ic_title"
app:layout_constraintTop_toBottomOf="@id/btn_add"
app:layout_constraintVertical_weight="2.5">
<RadioGroup
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="8.0"
android:checkedButton="@id/rb_get"
android:gravity="center_vertical"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
......@@ -85,19 +116,7 @@
android:textSize="@dimen/et_textsize"/>
</RadioGroup>
<Button
android:id="@+id/btn_add"
android:layout_width="0dp"
android:layout_height="@dimen/fragment_store_et_height"
android:layout_weight="1"
android:background="@drawable/selector_navy_blue"
android:drawableLeft="@mipmap/bindingcounter_addcounter_befor"
android:onClick="@{OnClickListener}"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="添加获取规则"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
......
app/src/main/res/layout/activity_return_ticket.xml
View file @ 11465d72
......@@ -18,7 +18,7 @@
<include
android:id="@+id/ic_title"
layout="@layout/title"
layout="@layout/title_appback"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/ll_menu"
......
app/src/main/res/layout/fragment_binding_counter.xml
View file @ 11465d72
......@@ -16,7 +16,7 @@
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
layout="@layout/title_appback"/>
<LinearLayout
......
app/src/main/res/layout/fragment_choice_store.xml
View file @ 11465d72
......@@ -16,7 +16,7 @@
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
layout="@layout/title_appback"/>
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_create_store.xml
View file @ 11465d72
......@@ -16,7 +16,7 @@
<include
android:id="@+id/ic_title"
layout="@layout/title"></include>
layout="@layout/title_appback"></include>
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_input_password.xml
View file @ 11465d72
......@@ -16,7 +16,7 @@
android:gravity="center"
android:orientation="vertical">
<include android:id="@+id/ic_title" layout="@layout/title"/>
<include android:id="@+id/ic_title" layout="@layout/title_appback"/>
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_sms_code.xml
View file @ 11465d72
......@@ -15,7 +15,7 @@
android:background="@color/appBack"
android:orientation="vertical">
<include android:id="@+id/ic_title" layout="@layout/title"></include>
<include android:id="@+id/ic_title" layout="@layout/title_appback"></include>
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/title.xml
View file @ 11465d72
......@@ -12,8 +12,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/singleline"
android:layout_height="@dimen/title_height"
android:background="@drawable/singleline_white_gray"
android:orientation="horizontal">
......@@ -24,7 +24,7 @@
android:gravity="center"
android:onClick="@{onClickListener}"
android:padding="16dp"
android:src="@mipmap/back_white"/>
android:src="@mipmap/back_black"/>
<TextView
android:id="@+id/tv_title"
......@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="标题"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"
android:textStyle="bold"/>
......
app/src/main/res/layout/title_appback.xml 0 → 100644
View file @ 11465d72
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:background="@drawable/singleline"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/title_height"
android:layout_height="match_parent"
android:gravity="center"
android:onClick="@{onClickListener}"
android:padding="16dp"
android:src="@mipmap/back_white"/>
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="标题"
android:textColor="@color/white"
android:textSize="@dimen/text_secondary_title"
android:textStyle="bold"/>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ 11465d72
......@@ -15,13 +15,14 @@
<dimen name="all_text_size_big">22sp</dimen>
<dimen name="all_text_size_super_big">25sp</dimen>
<dimen name="all_margin_left">15dp</dimen>
<dimen name="title_height">50dp</dimen>
<dimen name="title_height">65dp</dimen>
<dimen name="small_text_size">13sp</dimen>
<dimen name="big_text_size">18sp</dimen>
<dimen name="sbig_text_size">25sp</dimen>
<integer name="all_top_weight">2</integer>
<integer name="all_content_weight">25</integer>
<!--RADIUS-->
<!--RADIUS-->
<dimen name="card_radius_medium">14dp</dimen>
<!--PADDING-->
<dimen name="padding_big">24dp</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