up titlebar

pull/32/head
Invinciblelee 6 years ago
commit 895618ddf4
  1. 12
      app/src/main/java/io/legado/app/ui/widget/TitleBar.kt
  2. 2
      app/src/main/res/values/styles.xml

@ -53,16 +53,16 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
attrs, R.styleable.TitleBar, attrs, R.styleable.TitleBar,
R.attr.titleBarStyle, 0 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) navigationIconTint = a.getColorStateList(R.styleable.TitleBar_navigationIconTint)
navigationIconTintMode = a.getInt(R.styleable.TitleBar_navigationIconTintMode, 9) navigationIconTintMode = a.getInt(R.styleable.TitleBar_navigationIconTintMode, 9)
attachToActivity = a.getBoolean(R.styleable.TitleBar_attachToActivity, true) attachToActivity = a.getBoolean(R.styleable.TitleBar_attachToActivity, true)
displayHomeAsUp = a.getBoolean(R.styleable.TitleBar_displayHomeAsUp, 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 { toolbar.apply {
navigationIcon?.let { navigationIcon?.let {
this.navigationIcon = it this.navigationIcon = it
@ -103,8 +103,6 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
} }
a.recycle() a.recycle()
} }
override fun onAttachedToWindow() { override fun onAttachedToWindow() {

@ -43,8 +43,6 @@
<item name="colorAccent">@color/md_grey_100</item> <item name="colorAccent">@color/md_grey_100</item>
</style> </style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
<item name="overlapAnchor">false</item> <item name="overlapAnchor">false</item>
<item name="colorAccent">@color/md_grey_900</item> <item name="colorAccent">@color/md_grey_900</item>

Loading…
Cancel
Save