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
463e8b66
Commit
463e8b66
authored
Jan 30, 2018
by
陈前
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
头部UI
parent
b43bb15b
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
58 additions
and
45 deletions
+58
-45
app/src/main/res/layout/activity_ms.xml
app/src/main/res/layout/activity_ms.xml
+3
-2
app/src/main/res/layout/activity_payment.xml
app/src/main/res/layout/activity_payment.xml
+3
-2
app/src/main/res/layout/activity_settle.xml
app/src/main/res/layout/activity_settle.xml
+3
-2
app/src/main/res/layout/activity_sssku.xml
app/src/main/res/layout/activity_sssku.xml
+4
-3
app/src/main/res/layout/activity_store.xml
app/src/main/res/layout/activity_store.xml
+8
-4
app/src/main/res/layout/fragment_bale_edit.xml
app/src/main/res/layout/fragment_bale_edit.xml
+3
-3
app/src/main/res/layout/fragment_bale_index.xml
app/src/main/res/layout/fragment_bale_index.xml
+3
-3
app/src/main/res/layout/fragment_bale_seach.xml
app/src/main/res/layout/fragment_bale_seach.xml
+4
-4
app/src/main/res/layout/fragment_bale_seach_shop.xml
app/src/main/res/layout/fragment_bale_seach_shop.xml
+4
-4
app/src/main/res/layout/fragment_send_ticker_vip.xml
app/src/main/res/layout/fragment_send_ticker_vip.xml
+14
-14
app/src/main/res/layout/title_pop.xml
app/src/main/res/layout/title_pop.xml
+9
-4
No files found.
app/src/main/res/layout/activity_ms.xml
View file @
463e8b66
...
...
@@ -24,12 +24,13 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:padding=
"@dimen/all_margin"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_padding"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
...
...
app/src/main/res/layout/activity_payment.xml
View file @
463e8b66
...
...
@@ -13,12 +13,13 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:padding=
"@dimen/all_margin"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_padding"
android:src=
"@mipmap/back_white"
/>
<TextView
...
...
app/src/main/res/layout/activity_settle.xml
View file @
463e8b66
...
...
@@ -24,12 +24,13 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:padding=
"@dimen/all_margin"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_padding"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
...
...
app/src/main/res/layout/activity_sssku.xml
View file @
463e8b66
...
...
@@ -28,12 +28,13 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:padding=
"@dimen/all_margin"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_padding"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
...
...
@@ -82,7 +83,7 @@
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:padding=
"@dimen/all_
margin
"
android:padding=
"@dimen/all_
padding
"
android:src=
"@mipmap/click_down"
android:visibility=
"@{titleMode==6?View.VISIBLE:View.GONE}"
app:layout_constraintRight_toRightOf=
"parent"
/>
...
...
app/src/main/res/layout/activity_store.xml
View file @
463e8b66
...
...
@@ -45,12 +45,13 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:padding=
"@dimen/all_margin"
android:paddingEnd=
"@dimen/all_margin"
android:paddingStart=
"@dimen/all_padding"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
...
...
@@ -80,12 +81,15 @@
<ImageButton
android:id=
"@+id/btn_scan"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/all_margin"
android:layout_height=
"match_parent"
android:layout_marginStart=
"@dimen/all_spacing"
android:background=
"@color/transparent"
android:contentDescription=
"@string/store_scan"
android:foreground=
"?android:attr/actionBarItemBackground"
android:paddingEnd=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:src=
"@mipmap/but_sweep_yard"
android:visibility=
"@{titleMode>1?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf=
"parent"
...
...
app/src/main/res/layout/fragment_bale_edit.xml
View file @
463e8b66
...
...
@@ -28,20 +28,20 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:onClick=
"@{OnClickListener}"
android:padding=
"@dimen/all_
margin
"
android:padding=
"@dimen/all_
padding
"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<LinearLayout
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_marginEnd=
"@dimen/all_
margin
"
android:layout_marginEnd=
"@dimen/all_
padding
"
android:gravity=
"center|left"
app:layout_constraintBottom_toTopOf=
"parent"
app:layout_constraintLeft_toRightOf=
"@id/btn_back"
...
...
app/src/main/res/layout/fragment_bale_index.xml
View file @
463e8b66
...
...
@@ -31,20 +31,20 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:onClick=
"@{OnClickListener}"
android:padding=
"@dimen/all_
margin
"
android:padding=
"@dimen/all_
padding
"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<LinearLayout
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_marginEnd=
"@dimen/all_
margin
"
android:layout_marginEnd=
"@dimen/all_
padding
"
android:gravity=
"center|left"
app:layout_constraintBottom_toTopOf=
"parent"
app:layout_constraintLeft_toRightOf=
"@id/btn_back"
...
...
app/src/main/res/layout/fragment_bale_seach.xml
View file @
463e8b66
...
...
@@ -36,20 +36,20 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:onClick=
"@{OnClickListener}"
android:padding=
"@dimen/all_
margin
"
android:padding=
"@dimen/all_
padding
"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<LinearLayout
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_marginEnd=
"@dimen/all_
margin
"
android:layout_marginEnd=
"@dimen/all_
padding
"
android:gravity=
"center|left"
app:layout_constraintBottom_toTopOf=
"parent"
app:layout_constraintLeft_toRightOf=
"@id/btn_back"
...
...
@@ -60,7 +60,7 @@
android:id=
"@+id/et_keyword"
style=
"@style/searchBarEditor"
android:layout_width=
"0dp"
android:layout_marginEnd=
"@dimen/all_
spac
ing"
android:layout_marginEnd=
"@dimen/all_
padd
ing"
android:layout_weight=
"1"
android:background=
"@drawable/shape_gray_r1"
android:clickable=
"true"
...
...
app/src/main/res/layout/fragment_bale_seach_shop.xml
View file @
463e8b66
...
...
@@ -34,20 +34,20 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"match_parent"
android:background=
"?attr/actionBarItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:onClick=
"@{OnClickListener}"
android:padding=
"@dimen/all_
margin
"
android:padding=
"@dimen/all_
padding
"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<LinearLayout
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_marginEnd=
"@dimen/all_
margin
"
android:layout_marginEnd=
"@dimen/all_
padding
"
android:gravity=
"center"
app:layout_constraintBottom_toTopOf=
"parent"
app:layout_constraintLeft_toRightOf=
"@id/btn_back"
...
...
@@ -58,7 +58,7 @@
android:id=
"@+id/et_keyword"
style=
"@style/searchBarEditor"
android:layout_width=
"0dp"
android:layout_marginEnd=
"@dimen/all_
spac
ing"
android:layout_marginEnd=
"@dimen/all_
padd
ing"
android:layout_weight=
"1"
android:focusable=
"true"
android:hint=
"@string/store_search_hint"
...
...
app/src/main/res/layout/fragment_send_ticker_vip.xml
View file @
463e8b66
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<data>
<import
type=
"android.view.View"
/>
<import
type=
"android.view.View"
/>
<variable
name=
"empty"
type=
"boolean"
/>
type=
"boolean"
/>
<variable
name=
"OnClickListener"
type=
"com.xingdata.zzdpos.util.OnClickListener"
/>
type=
"com.xingdata.zzdpos.util.OnClickListener"
/>
<variable
name=
"titleMode"
type=
"int"
/>
type=
"int"
/>
</data>
<LinearLayout
...
...
@@ -29,7 +29,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:layout_gravity=
"bottom"
android:background=
"@color/gray_huanggai"
/>
android:background=
"@color/gray_huanggai"
/>
<android.support.constraint.ConstraintLayout
android:layout_width=
"match_parent"
...
...
@@ -38,15 +38,15 @@
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"
@dimen/title_heigh
t"
android:layout_width=
"
wrap_conten
t"
android:layout_height=
"match_parent"
android:background=
"?attr/selectableItemBackground"
android:contentDescription=
"@string/all_go_back"
android:gravity=
"center"
android:onClick=
"@{OnClickListener}"
android:padding=
"@dimen/all_
margin
"
android:padding=
"@dimen/all_
padding
"
android:src=
"@mipmap/back_black"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<LinearLayout
android:layout_width=
"0dp"
...
...
@@ -67,7 +67,7 @@
android:maxLength=
"11"
android:textColor=
"@color/black_likui"
android:textColorHint=
"@color/gray_huanggai"
android:textSize=
"@dimen/all_text_size_low"
/>
android:textSize=
"@dimen/all_text_size_low"
/>
</LinearLayout>
...
...
@@ -77,7 +77,7 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_gravity=
"bottom"
android:background=
"@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf=
"parent"
/>
app:layout_constraintBottom_toBottomOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
<View
...
...
@@ -85,18 +85,18 @@
android:layout_height=
"@dimen/all_line_width"
android:layout_marginBottom=
"@dimen/all_margin"
android:background=
"@color/gray_huanggai"
android:visibility=
"@{empty?View.GONE:View.VISIBLE}"
/>
android:visibility=
"@{empty?View.GONE:View.VISIBLE}"
/>
<View
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/all_line_width"
android:background=
"@color/gray_huanggai"
/>
android:background=
"@color/gray_huanggai"
/>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/rl_vip"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
android:layout_height=
"match_parent"
/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title_pop.xml
View file @
463e8b66
...
...
@@ -12,8 +12,11 @@
android:id=
"@+id/iv_back"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:background=
"@mipmap/go_back"
android:padding=
"@dimen/all_padding"
/>
android:layout_alignParentLeft=
"true"
android:background=
"@color/transparent"
android:paddingEnd=
"@dimen/all_bounced_padding"
android:paddingStart=
"@dimen/all_padding"
android:src=
"@mipmap/go_back"
/>
<TextView
android:id=
"@+id/tv_title"
...
...
@@ -29,8 +32,10 @@
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_alignParentRight=
"true"
android:background=
"@mipmap/pop_menu"
android:padding=
"@dimen/all_padding"
/>
android:background=
"@color/transparent"
android:paddingEnd=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:src=
"@mipmap/pop_menu"
/>
</RelativeLayout>
...
...
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