k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化代码

Browse Source
pull/32/head
Invinciblelee 6 years ago
parent 100b3d2216
commit cd211f87a9
7 changed files with 92 additions and 66 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 37
      app/src/main/java/io/legado/app/base/BaseActivity.kt
  2. 24
      app/src/main/java/io/legado/app/lib/theme/DrawableUtils.kt
  3. 5
      app/src/main/java/io/legado/app/ui/main/MainActivity.kt
  4. 11
      app/src/main/java/io/legado/app/ui/widget/TitleBar.kt
  5. 7
      app/src/main/res/menu/main.xml
  6. 70
      app/src/main/res/values/attrs.xml
  7. 2
      app/src/main/res/values/styles.xml

37
app/src/main/java/io/legado/app/base/BaseActivity.kt
Unescape View File

@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.menu.MenuBuilder
import androidx.appcompat.view.menu.MenuItemImpl import androidx.appcompat.view.menu.MenuItemImpl
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
@ -30,17 +31,29 @@ abstract class BaseActivity<VM : ViewModel> : AppCompatActivity() {
} }
/** override fun onCreateOptionsMenu(menu: Menu?): Boolean {
* 设置MENU图标颜色 return menu?.let {
*/ if (it is MenuBuilder) {
override fun onCreateOptionsMenu(menu: Menu): Boolean { it.setOptionalIconsVisible(true)
val primaryTextColor = getPrimaryTextColor(ColorUtils.isColorLight(ThemeStore.primaryColor(this)))
val defaultTextColor = ContextCompat.getColor(this, R.color.tv_text_default)
for (i in 0 until menu.size()) {
(menu.getItem(i) as MenuItemImpl).let {//overflow：展开的item
DrawableUtils.setTint(it.icon, if (it.requiresOverflow()) defaultTextColor else primaryTextColor)
} }
} val bool = onCompatCreateOptionsMenu(it)
val primaryTextColor = getPrimaryTextColor(ColorUtils.isColorLight(ThemeStore.primaryColor(this)))
val defaultTextColor = ContextCompat.getColor(this, R.color.tv_text_default)
for (i in 0 until menu.size()) {
(menu.getItem(i) as MenuItemImpl).let { item ->
//overflow：展开的item
DrawableUtils.setTint(
item.icon,
if (item.requiresOverflow()) defaultTextColor else primaryTextColor
)
}
}
bool
} ?: super.onCreateOptionsMenu(menu)
}
open fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
return super.onCreateOptionsMenu(menu) return super.onCreateOptionsMenu(menu)
} }
@ -74,7 +87,7 @@ abstract class BaseActivity<VM : ViewModel> : AppCompatActivity() {
// return super.onMenuOpened(featureId, menu) // return super.onMenuOpened(featureId, menu)
// } // }
override fun onOptionsItemSelected(item: MenuItem?): Boolean { final override fun onOptionsItemSelected(item: MenuItem?): Boolean {
item?.let { item?.let {
if (it.itemId == android.R.id.home) { if (it.itemId == android.R.id.home) {
supportFinishAfterTransition() supportFinishAfterTransition()
@ -85,7 +98,7 @@ abstract class BaseActivity<VM : ViewModel> : AppCompatActivity() {
} }
open fun onCompatOptionsItemSelected(item: MenuItem): Boolean { open fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
return true return super.onOptionsItemSelected(item)
} }
protected fun initTheme() { protected fun initTheme() {

24
app/src/main/java/io/legado/app/lib/theme/DrawableUtils.kt
Unescape View File

@ -26,18 +26,22 @@ object DrawableUtils {
return TransitionDrawable(drawables) return TransitionDrawable(drawables)
} }
fun setTintList(drawable: Drawable, tint: ColorStateList, tintMode: PorterDuff.Mode = PorterDuff.Mode.SRC_ATOP) { fun setTintList(drawable: Drawable?, tint: ColorStateList, tintMode: PorterDuff.Mode = PorterDuff.Mode.SRC_ATOP) {
val wrappedDrawable = DrawableCompat.wrap(drawable) drawable?.let {
wrappedDrawable.mutate() val wrappedDrawable = DrawableCompat.wrap(it)
DrawableCompat.setTintMode(wrappedDrawable, tintMode) wrappedDrawable.mutate()
DrawableCompat.setTintList(wrappedDrawable, tint) DrawableCompat.setTintMode(wrappedDrawable, tintMode)
DrawableCompat.setTintList(wrappedDrawable, tint)
}
} }
fun setTint(drawable: Drawable, @ColorInt tint: Int, tintMode: PorterDuff.Mode = PorterDuff.Mode.SRC_ATOP) { fun setTint(drawable: Drawable?, @ColorInt tint: Int, tintMode: PorterDuff.Mode = PorterDuff.Mode.SRC_ATOP) {
val wrappedDrawable = DrawableCompat.wrap(drawable) drawable?.let {
wrappedDrawable.mutate() val wrappedDrawable = DrawableCompat.wrap(it)
DrawableCompat.setTintMode(wrappedDrawable, tintMode) wrappedDrawable.mutate()
DrawableCompat.setTint(wrappedDrawable, tint) DrawableCompat.setTintMode(wrappedDrawable, tintMode)
DrawableCompat.setTint(wrappedDrawable, tint)
}
} }
} }

5
app/src/main/java/io/legado/app/ui/main/MainActivity.kt
Unescape View File

@ -51,10 +51,9 @@ class MainActivity : BaseActivity<MainViewModel>(), NavigationView.OnNavigationI
} }
} }
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
// Inflate the menu; this adds items to the action bar if it is present.
menuInflater.inflate(R.menu.main, menu) menuInflater.inflate(R.menu.main, menu)
return true return super.onCompatCreateOptionsMenu(menu)
} }
override fun onCompatOptionsItemSelected(item: MenuItem): Boolean { override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {

11
app/src/main/java/io/legado/app/ui/widget/TitleBar.kt
Unescape View File

@ -33,6 +33,8 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
toolbar.subtitle = subtitle toolbar.subtitle = subtitle
} }
private val mDisplayHomeAsUp: Boolean
init { init {
inflate(context, R.layout.view_titlebar, this) inflate(context, R.layout.view_titlebar, this)
toolbar = findViewById(R.id.toolbar) toolbar = findViewById(R.id.toolbar)
@ -44,14 +46,15 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
val navigationContentDescription = a.getText(R.styleable.TitleBar_navigationContentDescription) val navigationContentDescription = a.getText(R.styleable.TitleBar_navigationContentDescription)
val navigationIconTint = a.getColorStateList(R.styleable.TitleBar_navigationIconTint) val navigationIconTint = a.getColorStateList(R.styleable.TitleBar_navigationIconTint)
val navigationIconTintMode = a.getInt(R.styleable.TitleBar_navigationIconTintMode, 9) val navigationIconTintMode = a.getInt(R.styleable.TitleBar_navigationIconTintMode, 9)
val showNavigationIcon = a.getBoolean(R.styleable.TitleBar_showNavigationIcon, true)
val attachToActivity = a.getBoolean(R.styleable.TitleBar_attachToActivity, true) val attachToActivity = a.getBoolean(R.styleable.TitleBar_attachToActivity, true)
val titleText = a.getString(R.styleable.TitleBar_title) val titleText = a.getString(R.styleable.TitleBar_title)
val subtitleText = a.getString(R.styleable.TitleBar_subtitle) val subtitleText = a.getString(R.styleable.TitleBar_subtitle)
mDisplayHomeAsUp = a.getBoolean(R.styleable.TitleBar_displayHomeAsUp, true)
toolbar.apply { toolbar.apply {
if (showNavigationIcon) { navigationIcon?.let {
this.navigationIcon = navigationIcon this.navigationIcon = it
this.navigationContentDescription = navigationContentDescription this.navigationContentDescription = navigationContentDescription
wrapDrawableTint(this.navigationIcon, navigationIconTint, navigationIconTintMode) wrapDrawableTint(this.navigationIcon, navigationIconTint, navigationIconTintMode)
} }
@ -120,7 +123,7 @@ class TitleBar(context: Context, attrs: AttributeSet?) : AppBarLayout(context, a
val activity = getCompatActivity(context) val activity = getCompatActivity(context)
activity?.let { activity?.let {
activity.setSupportActionBar(toolbar) activity.setSupportActionBar(toolbar)
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true) activity.supportActionBar?.setDisplayHomeAsUpEnabled(mDisplayHomeAsUp)
} }
} }

7
app/src/main/res/menu/main.xml
Unescape View File

@ -5,4 +5,11 @@
android:title="@string/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
app:showAsAction="never"/> app:showAsAction="never"/>
<item android:id="@+id/action_test"
android:title="测试"
android:icon="@drawable/ic_search"
android:orderInCategory="100"
app:showAsAction="never"/>
</menu> </menu>

70
app/src/main/res/values/attrs.xml
Unescape View File

@ -2,47 +2,47 @@
<resources> <resources>
<declare-styleable name="TitleBar"> <declare-styleable name="TitleBar">
<attr name="title" /> <attr name="title"/>
<attr name="subtitle" /> <attr name="subtitle"/>
<attr name="titleTextAppearance" /> <attr name="titleTextAppearance"/>
<attr name="titleTextColor" /> <attr name="titleTextColor"/>
<attr name="subtitleTextAppearance" /> <attr name="subtitleTextAppearance"/>
<attr name="subtitleTextColor" /> <attr name="subtitleTextColor"/>
<attr name="attachToActivity" format="boolean" /> <attr name="attachToActivity" format="boolean"/>
<attr name="showNavigationIcon" format="boolean" /> <attr name="displayHomeAsUp" format="boolean"/>
<attr name="navigationIcon" format="reference" /> <attr name="navigationIcon" format="reference"/>
<attr name="navigationContentDescription" format="reference|string" /> <attr name="navigationContentDescription" format="reference|string"/>
<attr name="navigationIconTint" format="color|reference" /> <attr name="navigationIconTint" format="color|reference"/>
<attr name="navigationIconTintMode" format="enum"> <attr name="navigationIconTintMode" format="enum">
<enum name="clear" value="0" /> <enum name="clear" value="0"/>
<enum name="src" value="1" /> <enum name="src" value="1"/>
<enum name="dst" value="2" /> <enum name="dst" value="2"/>
<enum name="src_over" value="3" /> <enum name="src_over" value="3"/>
<enum name="dst_over" value="4" /> <enum name="dst_over" value="4"/>
<enum name="src_in" value="5" /> <enum name="src_in" value="5"/>
<enum name="dst_in" value="6" /> <enum name="dst_in" value="6"/>
<enum name="src_out" value="7" /> <enum name="src_out" value="7"/>
<enum name="dst_out" value="8" /> <enum name="dst_out" value="8"/>
<enum name="src_atop" value="9" /> <enum name="src_atop" value="9"/>
<enum name="dst_atop" value="10" /> <enum name="dst_atop" value="10"/>
<enum name="xor" value="11" /> <enum name="xor" value="11"/>
<enum name="darken" value="16" /> <enum name="darken" value="16"/>
<enum name="lighten" value="17" /> <enum name="lighten" value="17"/>
<enum name="multiply" value="13" /> <enum name="multiply" value="13"/>
<enum name="screen" value="14" /> <enum name="screen" value="14"/>
<enum name="add" value="12" /> <enum name="add" value="12"/>
<enum name="overlay" value="15" /> <enum name="overlay" value="15"/>
</attr> </attr>
</declare-styleable> </declare-styleable>
<attr name="titleBarStyle" format="reference" /> <attr name="titleBarStyle" format="reference"/>
<declare-styleable name="DynamicFrameLayout"> <declare-styleable name="DynamicFrameLayout">
<attr name="errorSrc" format="reference" /> <attr name="errorSrc" format="reference"/>
<attr name="emptySrc" format="reference" /> <attr name="emptySrc" format="reference"/>
<attr name="errorActionDescription" format="string|reference" /> <attr name="errorActionDescription" format="string|reference"/>
<attr name="emptyActionDescription" format="string|reference" /> <attr name="emptyActionDescription" format="string|reference"/>
<attr name="emptyDescription" format="string|reference" /> <attr name="emptyDescription" format="string|reference"/>
</declare-styleable> </declare-styleable>
<declare-styleable name="RefreshProgressBar"> <declare-styleable name="RefreshProgressBar">

2
app/src/main/res/values/styles.xml
Unescape View File

@ -25,13 +25,13 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Base.AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="Base.AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowTranslucentStatus">true</item>
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="actionOverflowMenuStyle">@style/Style.PopupMenu</item> <item name="actionOverflowMenuStyle">@style/Style.PopupMenu</item>
<item name="android:itemTextAppearance">@style/Style.MenuItemText</item> <item name="android:itemTextAppearance">@style/Style.MenuItemText</item>
<item name="android:popupMenuStyle">@style/Style.PopupMenu</item> <item name="android:popupMenuStyle">@style/Style.PopupMenu</item>
<item name="android:windowTranslucentStatus">true</item>
</style> </style>
<style name="AppTheme.AppBarOverlay.Light" parent="ThemeOverlay.AppCompat.Light"> <style name="AppTheme.AppBarOverlay.Light" parent="ThemeOverlay.AppCompat.Light">

Write Preview
Loading…
Cancel
Save