Commit 10703f05 authored by 王海's avatar 王海

修改bug

parent 1a61ae0c
This diff is collapsed.
...@@ -39,14 +39,15 @@ ...@@ -39,14 +39,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_nickname" android:text="@string/login_createstorefragment_tv_nickname"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
...@@ -66,19 +67,12 @@ ...@@ -66,19 +67,12 @@
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_nickname" android:id="@+id/et_nickname"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_nickname_hint" android:hint="@string/login_createstorefragment_et_nickname_hint"
android:lines="1" android:lines="1"
android:maxLength="11" android:maxLength="11"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -86,30 +80,24 @@ ...@@ -86,30 +80,24 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storename" android:text="@string/login_createstorefragment_tv_storename"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textStyle="bold"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_storename" android:id="@+id/et_storename"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_storename_hint" android:hint="@string/login_createstorefragment_et_storename_hint"
android:lines="1" android:lines="1"
android:maxLength="11" android:maxLength="11"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -159,7 +147,7 @@ ...@@ -159,7 +147,7 @@
<TextView <TextView
android:id="@+id/tv_storeaddress" android:id="@+id/tv_storeaddress"
android:layout_width="@dimen/et_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/transparent_border" android:background="@drawable/transparent_border"
android:drawableRight="@mipmap/createstore_drop_down" android:drawableRight="@mipmap/createstore_drop_down"
...@@ -188,7 +176,7 @@ ...@@ -188,7 +176,7 @@
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/tv_storedetailedaddress" android:id="@+id/tv_storedetailedaddress"
android:layout_width="@dimen/et_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/transparent_border" android:background="@drawable/transparent_border"
android:ems="15" android:ems="15"
......
...@@ -55,16 +55,15 @@ ...@@ -55,16 +55,15 @@
<Button <Button
android:id="@+id/btn_next" android:id="@+id/btn_next"
style="@style/view_base" style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo" android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next" android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white" />
android:textSize="@dimen/et_textsize"/>
<RelativeLayout <RelativeLayout
style="@style/view_base" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo"> android:layout_marginTop="@dimen/et_margin_logo">
<TextView <TextView
...@@ -72,6 +71,7 @@ ...@@ -72,6 +71,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="已有账号 >" android:text="已有账号 >"
android:textColor="@color/white"/> android:textColor="@color/white"/>
......
...@@ -80,13 +80,11 @@ ...@@ -80,13 +80,11 @@
<Button <Button
android:id="@+id/btn_next" android:id="@+id/btn_next"
style="@style/view_base" style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo" android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next" android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white" />
android:textSize="@dimen/et_textsize"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -97,8 +95,8 @@ ...@@ -97,8 +95,8 @@
android:id="@+id/tv_existing_account" android:id="@+id/tv_existing_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="已有账号 >" android:text="已有账号 >"
android:textColor="@color/white"/> android:textColor="@color/white"/>
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<style name="view_base" parent="android:ButtonBar"> <style name="view_base" parent="android:ButtonBar">
<item name="android:layout_height">@dimen/et_height</item> <item name="android:layout_height">@dimen/et_height</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center</item>
<item name="android:layout_marginLeft">@dimen/all_margin_left</item> <item name="android:layout_marginLeft">@dimen/all_margin_left</item>
<item name="android:layout_marginRight">@dimen/all_margin_left</item> <item name="android:layout_marginRight">@dimen/all_margin_left</item>
</style> </style>
...@@ -282,8 +282,16 @@ ...@@ -282,8 +282,16 @@
<item name=" android:background">@drawable/transparent_border</item> <item name=" android:background">@drawable/transparent_border</item>
<item name="android:padding">@dimen/et_padding</item> <item name="android:padding">@dimen/et_padding</item>
<item name=" android:saveEnabled">false</item> <item name=" android:saveEnabled">false</item>
<item name="android:gravity">center|left</item>
<item name="android:textSize">@dimen/et_textsize</item> <item name="android:textSize">@dimen/et_textsize</item>
<item name="android:textColorHint">@color/hint</item> <item name="android:textColorHint">@color/hint</item>
</style> </style>
<style name="button" parent="view_base">
<item name=" android:background">@drawable/red_border</item>
<item name=" android:saveEnabled">false</item>
<item name="android:textSize">@dimen/et_textsize</item>
<item name=" android:textColor">@color/white</item>
<item name="android:textColorHint">@color/hint</item>
</style>
</resources> </resources>
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