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
9b4fef38
Commit
9b4fef38
authored
Sep 07, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix SHQCLIENT-1501 返回按钮icon资源冲突
parent
c6be79c1
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
9 additions
and
10 deletions
+9
-10
ActivityExt.kt
...rc/main/java/com/yidian/bcommon/extensions/ActivityExt.kt
+1
-2
CommonTopBarView.kt
...c/main/java/com/yidian/bcommon/widget/CommonTopBarView.kt
+1
-1
bcommon_icon_back.webp
...ommon/src/main/res/drawable-xxhdpi/bcommon_icon_back.webp
+0
-0
bcommon_icon_back_white.webp
...src/main/res/drawable-xxhdpi/bcommon_icon_back_white.webp
+0
-0
icon_launcher_bg.png
...BCommon/src/main/res/drawable-xxhdpi/icon_launcher_bg.png
+0
-0
activity_public_web_view.xml
.../BCommon/src/main/res/layout/activity_public_web_view.xml
+1
-1
layout_common_toolbar.xml
...Lib/BCommon/src/main/res/layout/layout_common_toolbar.xml
+1
-1
layout_toolbar_menu.xml
...onLib/BCommon/src/main/res/layout/layout_toolbar_menu.xml
+1
-1
OrderListActivity.kt
...om/yidian/shenghuoquan/buserorder/ui/OrderListActivity.kt
+1
-1
border_activity_order_list.xml
...rOrder/src/main/res/layout/border_activity_order_list.xml
+1
-1
CommonWebViewActivity.kt
...n/shenghuoquan/bxbirdbusiness/ui/CommonWebViewActivity.kt
+2
-2
No files found.
CommonLib/BCommon/src/main/java/com/yidian/bcommon/extensions/ActivityExt.kt
View file @
9b4fef38
...
...
@@ -6,7 +6,6 @@ import android.widget.TextView
import
androidx.appcompat.app.AppCompatActivity
import
androidx.appcompat.widget.Toolbar
import
com.yidian.bcommon.R
import
com.yidian.xpage.XPageManager
fun
Activity
.
hideKeyBoard
():
Boolean
{
val
mInputMethodManager
=
getSystemService
(
Activity
.
INPUT_METHOD_SERVICE
)
as
InputMethodManager
...
...
@@ -24,7 +23,7 @@ fun AppCompatActivity.initTitleBar(toolbar: Toolbar, textView: TextView, title:
it
.
setDisplayHomeAsUpEnabled
(
true
)
it
.
setDisplayShowHomeEnabled
(
true
)
}
toolbar
.
setNavigationIcon
(
R
.
drawable
.
icon_back
)
toolbar
.
setNavigationIcon
(
R
.
drawable
.
bcommon_
icon_back
)
toolbar
.
setNavigationOnClickListener
{
onBackPressed
()
}
...
...
CommonLib/BCommon/src/main/java/com/yidian/bcommon/widget/CommonTopBarView.kt
View file @
9b4fef38
...
...
@@ -78,7 +78,7 @@ class CommonTopBarView @JvmOverloads constructor(
viewBinding
.
ivBack
.
setImageResource
(
typeArray
.
getResourceId
(
R
.
styleable
.
CommonTopBarView_CommonTopBarView_back_img
,
R
.
drawable
.
icon_back
R
.
drawable
.
bcommon_
icon_back
)
)
// 设置横向内边距
...
...
CommonLib/BCommon/src/main/res/drawable-xxhdpi/icon_back.webp
→
CommonLib/BCommon/src/main/res/drawable-xxhdpi/
bcommon_
icon_back.webp
View file @
9b4fef38
File moved
CommonLib/BCommon/src/main/res/drawable-xxhdpi/icon_back_white.webp
→
CommonLib/BCommon/src/main/res/drawable-xxhdpi/
bcommon_
icon_back_white.webp
View file @
9b4fef38
File moved
CommonLib/BCommon/src/main/res/drawable-xxhdpi/icon_launcher_bg.png
deleted
100644 → 0
View file @
c6be79c1
71.3 KB
CommonLib/BCommon/src/main/res/layout/activity_public_web_view.xml
View file @
9b4fef38
...
...
@@ -24,7 +24,7 @@
android:paddingStart=
"@dimen/dp15"
android:paddingEnd=
"@dimen/dp15"
app:layout_scrollFlags=
"scroll|enterAlways"
app:navigationIcon=
"@drawable/icon_back"
>
app:navigationIcon=
"@drawable/
bcommon_
icon_back"
>
<TextView
android:id=
"@+id/tv_title"
...
...
CommonLib/BCommon/src/main/res/layout/layout_common_toolbar.xml
View file @
9b4fef38
...
...
@@ -23,7 +23,7 @@
android:paddingStart=
"@dimen/dp15"
android:paddingEnd=
"@dimen/dp15"
app:layout_scrollFlags=
"scroll|enterAlways"
app:navigationIcon=
"@drawable/icon_back"
>
app:navigationIcon=
"@drawable/
bcommon_
icon_back"
>
<TextView
android:id=
"@+id/tv_title"
...
...
CommonLib/BCommon/src/main/res/layout/layout_toolbar_menu.xml
View file @
9b4fef38
...
...
@@ -14,7 +14,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:padding=
"@dimen/dp5"
android:src=
"@drawable/icon_back"
android:src=
"@drawable/
bcommon_
icon_back"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
...
...
Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/ui/OrderListActivity.kt
View file @
9b4fef38
...
...
@@ -33,7 +33,7 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
override
fun
initView
()
{
initTitleBar
(
binding
.
orderListToolbar
,
binding
.
tvTitle
,
"参与的"
)
SystemBarUtils
.
setStatusBarTextColorBlack
(
this
)
binding
.
orderListToolbar
.
setNavigationIcon
(
R
.
drawable
.
icon_back
)
binding
.
orderListToolbar
.
setNavigationIcon
(
R
.
drawable
.
bcommon_
icon_back
)
initRecycleView
()
initClickEvent
()
}
...
...
Components/BUserOrder/src/main/res/layout/border_activity_order_list.xml
View file @
9b4fef38
...
...
@@ -21,7 +21,7 @@
android:paddingStart=
"@dimen/dp15"
android:paddingEnd=
"@dimen/dp15"
app:layout_scrollFlags=
"scroll|enterAlways"
app:navigationIcon=
"@drawable/icon_back"
app:navigationIcon=
"@drawable/
bcommon_
icon_back"
android:background=
"#FFFFFF"
>
<TextView
android:id=
"@+id/tv_title"
...
...
Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/ui/CommonWebViewActivity.kt
View file @
9b4fef38
...
...
@@ -89,13 +89,13 @@ class CommonWebViewActivity : BaseMvvmActivity<XbridActivityCommonWebViewBinding
when
(
pageName
)
{
XBirdPageConstants
.
FIGHT_ORDER_HOME_PAGE
->
{
binding
.
commonTopBar
.
setTitleTextColor
(
ContextCompat
.
getColor
(
this
,
R
.
color
.
white
))
binding
.
commonTopBar
.
setBackImageResource
(
R
.
drawable
.
icon_back_white
)
binding
.
commonTopBar
.
setBackImageResource
(
R
.
drawable
.
bcommon_
icon_back_white
)
binding
.
commonTopBar
.
setStatusBarColor
(
ContextCompat
.
getColor
(
this
,
R
.
color
.
color_FD7823
))
binding
.
commonTopBar
.
setBgColor
(
R
.
color
.
color_FD7823
)
}
else
->
{
binding
.
commonTopBar
.
setTitleTextColor
(
ContextCompat
.
getColor
(
this
,
R
.
color
.
color_333333
))
binding
.
commonTopBar
.
setBackImageResource
(
R
.
drawable
.
icon_back
)
binding
.
commonTopBar
.
setBackImageResource
(
R
.
drawable
.
bcommon_
icon_back
)
binding
.
commonTopBar
.
setBgColor
(
R
.
color
.
transparent
)
}
}
...
...
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