优化

app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt

@@ -5,7 +5,7 @@ import io.legado.app.R
 import io.legado.app.base.BaseActivity
 import io.legado.app.utils.getViewModel
 import kotlinx.android.synthetic.main.activity_config.*
-import kotlinx.android.synthetic.main.view_titlebar.*
+import kotlinx.android.synthetic.main.view_title_bar.*
 
 class ConfigActivity : BaseActivity<ConfigViewModel>() {
     override val viewModel: ConfigViewModel

app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt

@@ -5,7 +5,7 @@ import android.view.Menu
 import android.view.View
 import io.legado.app.R
 import io.legado.app.base.BaseFragment
-import kotlinx.android.synthetic.main.view_titlebar.*
+import kotlinx.android.synthetic.main.view_title_bar.*
 
 class BookshelfFragment : BaseFragment(R.layout.fragment_bookshelf) {
 

app/src/main/java/io/legado/app/ui/main/booksource/BookSourceFragment.kt

@@ -19,7 +19,7 @@ import io.legado.app.data.entities.BookSource
 import io.legado.app.help.ItemTouchCallback
 import io.legado.app.ui.sourceedit.SourceEditActivity
 import kotlinx.android.synthetic.main.fragment_book_source.*
-import kotlinx.android.synthetic.main.view_titlebar.*
+import kotlinx.android.synthetic.main.view_title_bar.*
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.jetbrains.anko.startActivity

app/src/main/java/io/legado/app/ui/main/findbook/FindBookFragment.kt

@@ -6,7 +6,7 @@ import android.view.MenuItem
 import android.view.View
 import io.legado.app.R
 import io.legado.app.base.BaseFragment
-import kotlinx.android.synthetic.main.view_titlebar.*
+import kotlinx.android.synthetic.main.view_title_bar.*
 
 class FindBookFragment : BaseFragment(R.layout.fragment_find_book) {
 

app/src/main/java/io/legado/app/ui/main/myconfig/MyConfigFragment.kt

@@ -7,7 +7,7 @@ import android.view.View
 import io.legado.app.R
 import io.legado.app.base.BaseFragment
 import io.legado.app.ui.search.SearchActivity
-import kotlinx.android.synthetic.main.view_titlebar.*
+import kotlinx.android.synthetic.main.view_title_bar.*
 import org.jetbrains.anko.startActivity
 
 class MyConfigFragment : BaseFragment(R.layout.fragment_my_config) {

app/src/main/java/io/legado/app/ui/widget/SearchBar.kt

@@ -0,0 +1,204 @@
+package io.legado.app.ui.widget
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.Menu
+import android.view.View
+import androidx.annotation.ColorInt
+import androidx.annotation.StyleRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.core.graphics.drawable.DrawableCompat
+import com.google.android.material.appbar.AppBarLayout
+import io.legado.app.R
+import io.legado.app.lib.theme.DrawableUtils
+import io.legado.app.lib.theme.ThemeStore
+import io.legado.app.lib.theme.getPrimaryTextColor
+import io.legado.app.lib.theme.isDarkTheme
+import io.legado.app.utils.getStatusBarHeight
+import org.jetbrains.anko.bottomPadding
+import org.jetbrains.anko.topPadding
+
+class SearchBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, attrs) {
+
+    val toolbar: Toolbar
+    val menu: Menu
+        get() = toolbar.menu
+
+    var title: CharSequence?
+        get() = toolbar.title
+        set(title) {
+            toolbar.title = title
+        }
+
+    var subtitle: CharSequence?
+        get() = toolbar.subtitle
+        set(subtitle) {
+            toolbar.subtitle = subtitle
+        }
+
+    private val displayHomeAsUp: Boolean
+    private val navigationIconTint: ColorStateList?
+    private val navigationIconTintMode: Int
+    private val attachToActivity: Boolean
+
+    init {
+        inflate(context, R.layout.view_search_bar, this)
+        setBackgroundColor(ThemeStore.primaryColor(context))
+        toolbar = findViewById(R.id.toolbar)
+        val a = context.obtainStyledAttributes(
+            attrs, R.styleable.TitleBar,
+            R.attr.titleBarStyle, 0
+        )
+        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
+                this.navigationContentDescription = navigationContentDescription
+            }
+
+            if (a.hasValue(R.styleable.TitleBar_titleTextAppearance)) {
+                this.setTitleTextAppearance(context, a.getResourceId(R.styleable.TitleBar_titleTextAppearance, 0))
+            }
+
+            if (a.hasValue(R.styleable.TitleBar_titleTextColor)) {
+                this.setTitleTextColor(a.getColor(R.styleable.TitleBar_titleTextColor, -0x1))
+            }
+
+            if (a.hasValue(R.styleable.TitleBar_subtitleTextAppearance)) {
+                this.setSubtitleTextAppearance(context, a.getResourceId(R.styleable.TitleBar_subtitleTextAppearance, 0))
+            }
+
+            if (a.hasValue(R.styleable.TitleBar_subtitleTextColor)) {
+                this.setSubtitleTextColor(a.getColor(R.styleable.TitleBar_subtitleTextColor, -0x1))
+            }
+
+            if (!titleText.isNullOrBlank()) {
+                this.title = titleText
+            }
+
+            if (!subtitleText.isNullOrBlank()) {
+                this.subtitle = subtitleText
+            }
+        }
+
+        if (a.getBoolean(R.styleable.TitleBar_fitStatusBar, true)) {
+            topPadding = context.getStatusBarHeight()
+        }
+
+        if (a.getBoolean(R.styleable.TitleBar_fitNavigationBar, false)) {
+            bottomPadding = context.getStatusBarHeight()
+        }
+
+        a.recycle()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        if (attachToActivity) {
+            attachToActivity(context)
+        }
+        wrapAppTheme()
+    }
+
+    fun setNavigationOnClickListener(clickListener: ((View) -> Unit)) {
+        toolbar.setNavigationOnClickListener(clickListener)
+    }
+
+    fun setTitle(titleId: Int) {
+        toolbar.setTitle(titleId)
+    }
+
+    fun setSubTitle(subtitleId: Int) {
+        toolbar.setSubtitle(subtitleId)
+    }
+
+    fun setTitleTextColor(@ColorInt color: Int) {
+        toolbar.setTitleTextColor(color)
+    }
+
+    fun setTitleTextAppearance(@StyleRes resId: Int) {
+        toolbar.setTitleTextAppearance(context, resId)
+    }
+
+    fun setSubTitleTextColor(@ColorInt color: Int) {
+        toolbar.setSubtitleTextColor(color)
+    }
+
+    fun setSubTitleTextAppearance(@StyleRes resId: Int) {
+        toolbar.setSubtitleTextAppearance(context, resId)
+    }
+
+    private fun wrapAppTheme() {
+        val primaryTextColor = context.getPrimaryTextColor(context.isDarkTheme())
+        DrawableUtils.setTint(toolbar.overflowIcon, primaryTextColor)
+        toolbar.setTitleTextColor(primaryTextColor)
+
+        if (navigationIconTint != null) {
+            wrapDrawableTint(toolbar.navigationIcon, navigationIconTint, navigationIconTintMode)
+        } else {
+            wrapDrawableTint(toolbar.navigationIcon, ColorStateList.valueOf(primaryTextColor), navigationIconTintMode)
+        }
+    }
+
+    private fun attachToActivity(context: Context) {
+        val activity = getCompatActivity(context)
+        activity?.let {
+            it.setSupportActionBar(toolbar)
+            it.supportActionBar?.setDisplayHomeAsUpEnabled(displayHomeAsUp)
+        }
+    }
+
+    private fun getCompatActivity(context: Context?): AppCompatActivity? {
+        if (context == null) return null
+        return when (context) {
+            is AppCompatActivity -> context
+            is androidx.appcompat.view.ContextThemeWrapper -> getCompatActivity(context.baseContext)
+            is android.view.ContextThemeWrapper -> getCompatActivity(context.baseContext)
+            else -> null
+        }
+    }
+
+    private fun wrapDrawableTint(drawable: Drawable?, tintList: ColorStateList?, tintMode: Int) {
+        if (drawable == null || tintList == null) return
+        val wrappedDrawable = DrawableCompat.wrap(drawable.mutate())
+        DrawableCompat.setTintList(wrappedDrawable, tintList)
+        DrawableCompat.setTintMode(wrappedDrawable, intToMode(tintMode))
+    }
+
+    private fun intToMode(`val`: Int): PorterDuff.Mode {
+        when (`val`) {
+            0 -> return PorterDuff.Mode.CLEAR
+            1 -> return PorterDuff.Mode.SRC
+            2 -> return PorterDuff.Mode.DST
+            3 -> return PorterDuff.Mode.SRC_OVER
+            4 -> return PorterDuff.Mode.DST_OVER
+            5 -> return PorterDuff.Mode.SRC_IN
+            6 -> return PorterDuff.Mode.DST_IN
+            7 -> return PorterDuff.Mode.SRC_OUT
+            8 -> return PorterDuff.Mode.DST_OUT
+            9 -> return PorterDuff.Mode.SRC_ATOP
+            10 -> return PorterDuff.Mode.DST_ATOP
+            11 -> return PorterDuff.Mode.XOR
+            16 -> return PorterDuff.Mode.DARKEN
+            17 -> return PorterDuff.Mode.LIGHTEN
+            13 -> return PorterDuff.Mode.MULTIPLY
+            14 -> return PorterDuff.Mode.SCREEN
+            12 -> return PorterDuff.Mode.ADD
+            15 -> return PorterDuff.Mode.OVERLAY
+            else -> return PorterDuff.Mode.CLEAR
+        }
+    }
+}

app/src/main/java/io/legado/app/ui/widget/TitleBar.kt

@@ -46,7 +46,7 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
     private val attachToActivity: Boolean
 
     init {
-        inflate(context, R.layout.view_titlebar, this)
+        inflate(context, R.layout.view_title_bar, this)
         setBackgroundColor(ThemeStore.primaryColor(context))
         toolbar = findViewById(R.id.toolbar)
         val a = context.obtainStyledAttributes(

app/src/main/res/layout/fragment_book_source.xml

@@ -6,7 +6,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <io.legado.app.ui.widget.TitleBar
+    <io.legado.app.ui.widget.SearchBar
             android:id="@+id/title_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/layout/view_search_bar.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.Toolbar
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?attr/actionBarStyle"
+        app:popupTheme="@style/AppTheme.PopupOverlay">
+
+    <androidx.appcompat.widget.SearchView
+            android:id="@+id/search_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:defaultQueryHint="搜索"/>
+
+</androidx.appcompat.widget.Toolbar>