Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王海
TangKuPos
Commits
10703f05
Commit
10703f05
authored
Dec 21, 2017
by
王海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
1a61ae0c
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37506 additions
and
37 deletions
+37506
-37
app/src/main/assets/province.json
app/src/main/assets/province.json
+37475
-0
app/src/main/res/layout/fragment_create_store.xml
app/src/main/res/layout/fragment_create_store.xml
+14
-26
app/src/main/res/layout/fragment_input_password.xml
app/src/main/res/layout/fragment_input_password.xml
+5
-5
app/src/main/res/layout/fragment_sms_code.xml
app/src/main/res/layout/fragment_sms_code.xml
+3
-5
app/src/main/res/values/styles.xml
app/src/main/res/values/styles.xml
+9
-1
No files found.
app/src/main/assets/province.json
0 → 100644
View file @
10703f05
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/fragment_create_store.xml
View file @
10703f05
...
...
@@ -39,14 +39,15 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:orientation=
"
horizont
al"
>
android:orientation=
"
vertic
al"
>
<TextView
android:layout_width=
"
@dimen/item_title_width
"
android:layout_width=
"
match_parent
"
android:layout_height=
"wrap_content"
android:padding=
"@dimen/et_padding"
android:text=
"@string/login_createstorefragment_tv_nickname"
android:textColor=
"@color/white"
/>
android:textColor=
"@color/white"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_nickname"
...
...
@@ -66,19 +67,12 @@
<com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id=
"@+id/et_nickname"
android:layout_width=
"@dimen/et_width"
android:layout_height=
"wrap_content"
android:background=
"@drawable/transparent_border"
style=
"@style/editText"
android:ems=
"10"
android:gravity=
"center_vertical"
android:hint=
"@string/login_createstorefragment_et_nickname_hint"
android:lines=
"1"
android:maxLength=
"11"
android:padding=
"@dimen/et_padding"
android:saveEnabled=
"false"
android:singleLine=
"true"
android:textColorHint=
"@color/hint"
android:textSize=
"@dimen/et_textsize"
/>
android:singleLine=
"true"
/>
</LinearLayout>
<LinearLayout
...
...
@@ -86,30 +80,24 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/item_title_margin"
android:gravity=
"center"
android:orientation=
"
horizont
al"
>
android:orientation=
"
vertic
al"
>
<TextView
android:layout_width=
"
@dimen/item_title_width
"
android:layout_width=
"
match_parent
"
android:layout_height=
"wrap_content"
android:padding=
"@dimen/et_padding"
android:text=
"@string/login_createstorefragment_tv_storename"
android:textColor=
"@color/white"
/>
android:textColor=
"@color/white"
android:textStyle=
"bold"
/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id=
"@+id/et_storename"
android:layout_width=
"@dimen/et_width"
android:layout_height=
"wrap_content"
android:background=
"@drawable/transparent_border"
style=
"@style/editText"
android:ems=
"10"
android:gravity=
"center_vertical"
android:hint=
"@string/login_createstorefragment_et_storename_hint"
android:lines=
"1"
android:maxLength=
"11"
android:padding=
"@dimen/et_padding"
android:saveEnabled=
"false"
android:singleLine=
"true"
android:textColorHint=
"@color/hint"
android:textSize=
"@dimen/et_textsize"
/>
android:singleLine=
"true"
/>
</LinearLayout>
<LinearLayout
...
...
@@ -159,7 +147,7 @@
<TextView
android:id=
"@+id/tv_storeaddress"
android:layout_width=
"
@dimen/et_width
"
android:layout_width=
"
match_parent
"
android:layout_height=
"wrap_content"
android:background=
"@drawable/transparent_border"
android:drawableRight=
"@mipmap/createstore_drop_down"
...
...
@@ -188,7 +176,7 @@
<com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id=
"@+id/tv_storedetailedaddress"
android:layout_width=
"
@dimen/et_width
"
android:layout_width=
"
match_parent
"
android:layout_height=
"wrap_content"
android:background=
"@drawable/transparent_border"
android:ems=
"15"
...
...
app/src/main/res/layout/fragment_input_password.xml
View file @
10703f05
...
...
@@ -55,16 +55,15 @@
<Button
android:id=
"@+id/btn_next"
style=
"@style/
view_base
"
style=
"@style/
button
"
android:layout_marginTop=
"@dimen/et_margin_logo"
android:background=
"@drawable/blue_border"
android:onClick=
"@{onClickListener}"
android:text=
"@string/login_smscodefragment_btn_next"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
/>
/>
<RelativeLayout
style=
"@style/view_base"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/et_margin_logo"
>
<TextView
...
...
@@ -72,6 +71,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"@dimen/all_margin_left"
android:onClick=
"@{onClickListener}"
android:text=
"已有账号 >"
android:textColor=
"@color/white"
/>
...
...
app/src/main/res/layout/fragment_sms_code.xml
View file @
10703f05
...
...
@@ -80,13 +80,11 @@
<Button
android:id=
"@+id/btn_next"
style=
"@style/
view_base
"
style=
"@style/
button
"
android:layout_marginTop=
"@dimen/et_margin_logo"
android:background=
"@drawable/blue_border"
android:onClick=
"@{onClickListener}"
android:text=
"@string/login_smscodefragment_btn_next"
android:textColor=
"@color/white"
android:textSize=
"@dimen/et_textsize"
/>
/>
<RelativeLayout
android:layout_width=
"match_parent"
...
...
@@ -97,8 +95,8 @@
android:id=
"@+id/tv_existing_account"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/all_margin_left"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"@dimen/all_margin_left"
android:onClick=
"@{onClickListener}"
android:text=
"已有账号 >"
android:textColor=
"@color/white"
/>
...
...
app/src/main/res/values/styles.xml
View file @
10703f05
...
...
@@ -273,7 +273,7 @@
<style
name=
"view_base"
parent=
"android:ButtonBar"
>
<item
name=
"android:layout_height"
>
@dimen/et_height
</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_marginRight"
>
@dimen/all_margin_left
</item>
</style>
...
...
@@ -282,8 +282,16 @@
<item
name=
" android:background"
>
@drawable/transparent_border
</item>
<item
name=
"android:padding"
>
@dimen/et_padding
</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:textColorHint"
>
@color/hint
</item>
</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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment