Commit 9b4fef38 authored by yinjiacheng's avatar yinjiacheng

fix SHQCLIENT-1501 返回按钮icon资源冲突

parent c6be79c1
......@@ -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()
}
......
......@@ -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
)
)
// 设置横向内边距
......
......@@ -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"
......
......@@ -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"
......
......@@ -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" />
......
......@@ -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()
}
......
......@@ -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"
......
......@@ -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)
}
}
......
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