Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
bp
ShenghuoquanBusiness
Commits
59db592b
Commit
59db592b
authored
Sep 09, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 清除按钮icon资源冲突
parent
25cdbf72
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
11 additions
and
11 deletions
+11
-11
bcommon_icon_clear.png
...ommon/src/main/res/drawable-xxhdpi/bcommon_icon_clear.png
+0
-0
commodity_activity_category_search.xml
...rc/main/res/layout/commodity_activity_category_search.xml
+1
-1
activity_store_edit.xml
...ManagerCenter/src/main/res/layout/activity_store_edit.xml
+2
-2
activity_withdraw.xml
.../BManagerCenter/src/main/res/layout/activity_withdraw.xml
+1
-1
fragment_life_account_business_license_auth.xml
...es/layout/fragment_life_account_business_license_auth.xml
+1
-1
layout_activity_service_product_addr_search.xml
...es/layout/layout_activity_service_product_addr_search.xml
+1
-1
view_life_account_auth_business_info_edit.xml
.../res/layout/view_life_account_auth_business_info_edit.xml
+1
-1
view_life_account_auth_identity_info_edit.xml
.../res/layout/view_life_account_auth_identity_info_edit.xml
+1
-1
view_life_account_auth_image.xml
...nter/src/main/res/layout/view_life_account_auth_image.xml
+1
-1
activity_login.xml
Components/BSetting/src/main/res/layout/activity_login.xml
+1
-1
border_view_pickup_point_search.xml
...r/src/main/res/layout/border_view_pickup_point_search.xml
+1
-1
No files found.
CommonLib/BCommon/src/main/res/drawable-xxhdpi/icon_clear.png
→
CommonLib/BCommon/src/main/res/drawable-xxhdpi/
bcommon_
icon_clear.png
View file @
59db592b
File moved
Components/BGoods/src/main/res/layout/commodity_activity_category_search.xml
View file @
59db592b
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
android:layout_marginStart=
"@dimen/dp10"
android:layout_marginStart=
"@dimen/dp10"
android:layout_marginEnd=
"@dimen/dp12"
android:layout_marginEnd=
"@dimen/dp12"
android:onClick=
"@{() -> vm.toClear()}"
android:onClick=
"@{() -> vm.toClear()}"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
app:isShow=
"@{!vm.searchKeyword.empty}"
app:isShow=
"@{!vm.searchKeyword.empty}"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
Components/BManagerCenter/src/main/res/layout/activity_store_edit.xml
View file @
59db592b
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
android:layout_width=
"@dimen/dp24"
android:layout_width=
"@dimen/dp24"
android:layout_height=
"@dimen/dp24"
android:layout_height=
"@dimen/dp24"
android:layout_marginEnd=
"@dimen/dp10"
android:layout_marginEnd=
"@dimen/dp10"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
...
@@ -138,7 +138,7 @@
...
@@ -138,7 +138,7 @@
android:layout_width=
"@dimen/dp24"
android:layout_width=
"@dimen/dp24"
android:layout_height=
"@dimen/dp24"
android:layout_height=
"@dimen/dp24"
android:layout_marginEnd=
"@dimen/dp10"
android:layout_marginEnd=
"@dimen/dp10"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
...
...
Components/BManagerCenter/src/main/res/layout/activity_withdraw.xml
View file @
59db592b
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
android:padding=
"@dimen/dp10"
android:padding=
"@dimen/dp10"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
...
...
Components/BManagerCenter/src/main/res/layout/fragment_life_account_business_license_auth.xml
View file @
59db592b
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
android:layout_height=
"23dp"
android:layout_height=
"23dp"
android:layout_marginTop=
"2dp"
android:layout_marginTop=
"2dp"
android:layout_marginEnd=
"2dp"
android:layout_marginEnd=
"2dp"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
...
...
Components/BManagerCenter/src/main/res/layout/layout_activity_service_product_addr_search.xml
View file @
59db592b
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
android:layout_alignEnd=
"@id/et_search_key"
android:layout_alignEnd=
"@id/et_search_key"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_marginEnd=
"@dimen/dp10"
android:layout_marginEnd=
"@dimen/dp10"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</RelativeLayout>
</RelativeLayout>
...
...
Components/BManagerCenter/src/main/res/layout/view_life_account_auth_business_info_edit.xml
View file @
59db592b
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
android:id=
"@+id/iv_clear"
android:id=
"@+id/iv_clear"
android:layout_width=
"23dp"
android:layout_width=
"23dp"
android:layout_height=
"23dp"
android:layout_height=
"23dp"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"@id/et_content"
app:layout_constraintBottom_toBottomOf=
"@id/et_content"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
Components/BManagerCenter/src/main/res/layout/view_life_account_auth_identity_info_edit.xml
View file @
59db592b
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
android:id=
"@+id/iv_clear"
android:id=
"@+id/iv_clear"
android:layout_width=
"23dp"
android:layout_width=
"23dp"
android:layout_height=
"23dp"
android:layout_height=
"23dp"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
...
...
Components/BManagerCenter/src/main/res/layout/view_life_account_auth_image.xml
View file @
59db592b
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
android:layout_height=
"23dp"
android:layout_height=
"23dp"
android:layout_marginTop=
"2dp"
android:layout_marginTop=
"2dp"
android:layout_marginEnd=
"2dp"
android:layout_marginEnd=
"2dp"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintEnd_toEndOf=
"@id/iv_content"
app:layout_constraintEnd_toEndOf=
"@id/iv_content"
app:layout_constraintTop_toTopOf=
"@id/iv_content"
/>
app:layout_constraintTop_toTopOf=
"@id/iv_content"
/>
...
...
Components/BSetting/src/main/res/layout/activity_login.xml
View file @
59db592b
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:padding=
"@dimen/dp10"
android:padding=
"@dimen/dp10"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
...
...
Components/BUserOrder/src/main/res/layout/border_view_pickup_point_search.xml
View file @
59db592b
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
android:layout_width=
"@dimen/dp24"
android:layout_width=
"@dimen/dp24"
android:layout_height=
"@dimen/dp24"
android:layout_height=
"@dimen/dp24"
android:onClick=
"@{() -> vm.clearSearch()}"
android:onClick=
"@{() -> vm.clearSearch()}"
android:src=
"@drawable/icon_clear"
android:src=
"@drawable/
bcommon_
icon_clear"
android:visibility=
"@{etSearch.text.length() > 0 ? View.VISIBLE : View.GONE}"
android:visibility=
"@{etSearch.text.length() > 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
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