diff --git a/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt b/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt index ef567ba0a..3191f43a7 100644 --- a/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/TitleBar.kt @@ -53,16 +53,16 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a attrs, R.styleable.TitleBar, R.attr.titleBarStyle, 0 ) - val navigationIcon = a.getDrawable(R.styleable.TitleBar_navigationIcon) - val navigationContentDescription = a.getText(R.styleable.TitleBar_navigationContentDescription) - val titleText = a.getString(R.styleable.TitleBar_title) - val subtitleText = a.getString(R.styleable.TitleBar_subtitle) - navigationIconTint = a.getColorStateList(R.styleable.TitleBar_navigationIconTint) navigationIconTintMode = a.getInt(R.styleable.TitleBar_navigationIconTintMode, 9) attachToActivity = a.getBoolean(R.styleable.TitleBar_attachToActivity, true) displayHomeAsUp = a.getBoolean(R.styleable.TitleBar_displayHomeAsUp, true) + val navigationIcon = a.getDrawable(R.styleable.TitleBar_navigationIcon) + val navigationContentDescription = a.getText(R.styleable.TitleBar_navigationContentDescription) + val titleText = a.getString(R.styleable.TitleBar_title) + val subtitleText = a.getString(R.styleable.TitleBar_subtitle) + toolbar.apply { navigationIcon?.let { this.navigationIcon = it @@ -103,8 +103,6 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a } a.recycle() - - } override fun onAttachedToWindow() { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8dbf324cb..6958f71fe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -43,8 +43,6 @@ @color/md_grey_100 -