Commit 2bfdee92 authored by 王海's avatar 王海

修改logo

parent 245d56ed
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
android:orientation="horizontal"> android:orientation="horizontal">
<View <View
android:layout_width="@dimen/all_line_width" android:layout_width="1dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/blue"></View> android:background="@mipmap/line"></View>
<TextView <TextView
android:id="@+id/tv_getsms" android:id="@+id/tv_getsms"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<variable <variable
name="onClickListener" name="onClickListener"
type="android.view.View.OnClickListener" /> type="android.view.View.OnClickListener"/>
</data> </data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
...@@ -16,33 +16,34 @@ ...@@ -16,33 +16,34 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/white"
android:orientation="horizontal"> android:orientation="horizontal">
<include <include
android:id="@+id/title_search" android:id="@+id/title_search"
layout="@layout/title_search" layout="@layout/title_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1"/>
<ImageView <ImageView
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/swipe_card_bg" /> android:background="@mipmap/swipe_card_bg"/>
<ImageView <ImageView
android:id="@+id/onScan" android:id="@+id/onScan"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/scan_bg" android:background="@mipmap/scan_bg"
android:onClick="@{onClickListener}" /> android:onClick="@{onClickListener}"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5" android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" /> android:background="@color/line1"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="本店会员" /> android:text="本店会员"/>
<TextView <TextView
android:id="@+id/vip_count_add_today_title" android:id="@+id/vip_count_add_today_title"
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="今日新增" /> android:text="今日新增"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:textSize="22sp" android:textSize="22sp"
android:textStyle="bold" /> android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/vip_count_add_today" android:id="@+id/vip_count_add_today"
...@@ -94,7 +95,7 @@ ...@@ -94,7 +95,7 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:textSize="22sp" android:textSize="22sp"
android:textStyle="bold" /> android:textStyle="bold"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_margin="5dp" android:layout_margin="5dp"
android:background="@mipmap/add_bg" /> android:background="@mipmap/add_bg"/>
<TextView <TextView
style="@style/default_blacktext_bigstyle" style="@style/default_blacktext_bigstyle"
...@@ -126,7 +127,7 @@ ...@@ -126,7 +127,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="添加会员" android:text="添加会员"
android:textColor="@color/deep_red" android:textColor="@color/deep_red"
android:textSize="22sp" /> android:textSize="22sp"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -134,7 +135,7 @@ ...@@ -134,7 +135,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5" android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" /> android:background="@color/line1"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -169,7 +170,7 @@ ...@@ -169,7 +170,7 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/vipRecyclerView" android:id="@+id/vipRecyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"/>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<dimen name="et_width">270dp</dimen> <dimen name="et_width">270dp</dimen>
<dimen name="et_height">44dp</dimen> <dimen name="et_height">44dp</dimen>
<dimen name="et_textsize">16sp</dimen> <dimen name="et_textsize">16sp</dimen>
<dimen name="et_padding">12dp</dimen> <dimen name="et_padding">10dp</dimen>
<dimen name="et_margin_logo">44dp</dimen> <dimen name="et_margin_logo">44dp</dimen>
<dimen name="et_margin_edittext">20dp</dimen> <dimen name="et_margin_edittext">20dp</dimen>
<dimen name="drop_down_margin_right_et">20dp</dimen> <dimen name="drop_down_margin_right_et">20dp</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