pull/2016/head
kunfei 3 years ago
parent 41cf681a3b
commit f3cf58a563
  1. 6
      app/build.gradle
  2. 2
      app/src/main/java/io/legado/app/base/BaseActivity.kt
  3. 4
      app/src/main/java/io/legado/app/lib/theme/TintHelper.kt
  4. 2
      app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
  5. 2
      app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
  6. 2
      app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
  7. 2
      app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageActivity.kt
  8. 2
      app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
  9. 4
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
  10. 4
      app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt
  11. 6
      app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
  12. 4
      app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@ -159,8 +159,8 @@ dependencies {
//androidX //androidX
implementation('androidx.core:core-ktx:1.8.0') implementation('androidx.core:core-ktx:1.8.0')
implementation('androidx.appcompat:appcompat:1.4.2') implementation('androidx.appcompat:appcompat:1.4.2')
implementation('androidx.activity:activity-ktx:1.4.0') implementation('androidx.activity:activity-ktx:1.5.0')
implementation('androidx.fragment:fragment-ktx:1.4.1') implementation('androidx.fragment:fragment-ktx:1.5.0')
implementation('androidx.preference:preference-ktx:1.2.0') implementation('androidx.preference:preference-ktx:1.2.0')
implementation('androidx.constraintlayout:constraintlayout:2.1.4') implementation('androidx.constraintlayout:constraintlayout:2.1.4')
implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0') implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0')
@ -178,7 +178,7 @@ dependencies {
//compose //compose
// Integration with activities // Integration with activities
implementation 'androidx.activity:activity-compose:1.4.0' implementation 'androidx.activity:activity-compose:1.5.0'
// Compose Material Design // Compose Material Design
implementation 'androidx.compose.material:material:1.1.1' implementation 'androidx.compose.material:material:1.1.1'
// Animations // Animations

@ -78,7 +78,7 @@ abstract class BaseActivity<VB : ViewBinding>(
observeLiveBus() observeLiveBus()
} }
override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration?) { override fun onMultiWindowModeChanged(isInMultiWindowMode: Boolean, newConfig: Configuration) {
super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig) super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig)
findViewById<TitleBar>(R.id.title_bar) findViewById<TitleBar>(R.id.title_bar)
?.onMultiWindowModeChanged(isInMultiWindowMode, fullScreen) ?.onMultiWindowModeChanged(isInMultiWindowMode, fullScreen)

@ -414,7 +414,7 @@ object TintHelper {
fun createTintedDrawable(drawable: Drawable?, @ColorInt color: Int): Drawable? { fun createTintedDrawable(drawable: Drawable?, @ColorInt color: Int): Drawable? {
var drawable1: Drawable? = drawable ?: return null var drawable1: Drawable? = drawable ?: return null
drawable1 = DrawableCompat.wrap(drawable1!!.mutate()) drawable1 = DrawableCompat.wrap(drawable1!!.mutate())
DrawableCompat.setTintMode(drawable1!!, PorterDuff.Mode.SRC_IN) DrawableCompat.setTintMode(drawable1, PorterDuff.Mode.SRC_IN)
DrawableCompat.setTint(drawable1, color) DrawableCompat.setTint(drawable1, color)
return drawable1 return drawable1
} }
@ -424,7 +424,7 @@ object TintHelper {
fun createTintedDrawable(drawable: Drawable?, sl: ColorStateList): Drawable? { fun createTintedDrawable(drawable: Drawable?, sl: ColorStateList): Drawable? {
var drawable1: Drawable? = drawable ?: return null var drawable1: Drawable? = drawable ?: return null
drawable1 = DrawableCompat.wrap(drawable1!!.mutate()) drawable1 = DrawableCompat.wrap(drawable1!!.mutate())
DrawableCompat.setTintList(drawable1!!, sl) DrawableCompat.setTintList(drawable1, sl)
return drawable1 return drawable1
} }

@ -172,7 +172,7 @@ class EpubFile(var book: Book) {
} }
if (!endFragmentId.isNullOrBlank() && endFragmentId != startFragmentId) { if (!endFragmentId.isNullOrBlank() && endFragmentId != startFragmentId) {
body.getElementById(endFragmentId)?.run { body.getElementById(endFragmentId)?.run {
nextElementSiblings()?.remove() nextElementSiblings().remove()
remove() remove()
} }
} }

@ -93,7 +93,7 @@ class AudioPlayActivity :
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
this.menu = menu this.menu = menu
upMenu() upMenu()
return super.onPrepareOptionsMenu(menu) return super.onPrepareOptionsMenu(menu)

@ -83,7 +83,7 @@ class CacheActivity : VMBaseActivity<ActivityCacheBookBinding, CacheViewModel>()
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
this.menu = menu this.menu = menu
upMenu() upMenu()
return super.onPrepareOptionsMenu(menu) return super.onPrepareOptionsMenu(menu)

@ -75,7 +75,7 @@ class BookshelfManageActivity :
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
this.menu = menu this.menu = menu
upMenu() upMenu()
return super.onPrepareOptionsMenu(menu) return super.onPrepareOptionsMenu(menu)

@ -222,7 +222,7 @@ class ReadBookActivity : BaseReadBookActivity(),
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
this.menu = menu this.menu = menu
upMenu() upMenu()
return super.onPrepareOptionsMenu(menu) return super.onPrepareOptionsMenu(menu)

@ -118,8 +118,8 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
groupMenu = menu?.findItem(R.id.menu_group)?.subMenu groupMenu = menu.findItem(R.id.menu_group)?.subMenu
groupMenu?.findItem(R.id.action_sort)?.subMenu groupMenu?.findItem(R.id.action_sort)?.subMenu
?.setGroupCheckable(R.id.menu_group_sort, true, true) ?.setGroupCheckable(R.id.menu_group_sort, true, true)
upGroupMenu() upGroupMenu()

@ -118,8 +118,8 @@ class ReplaceRuleActivity : VMBaseActivity<ActivityReplaceRuleBinding, ReplaceRu
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
groupMenu = menu?.findItem(R.id.menu_group)?.subMenu groupMenu = menu.findItem(R.id.menu_group)?.subMenu
upGroupMenu() upGroupMenu()
return super.onPrepareOptionsMenu(menu) return super.onPrepareOptionsMenu(menu)
} }

@ -78,9 +78,9 @@ class ReadRssActivity : VMBaseActivity<ActivityRssReadBinding, ReadRssViewModel>
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
starMenuItem = menu?.findItem(R.id.menu_rss_star) starMenuItem = menu.findItem(R.id.menu_rss_star)
ttsMenuItem = menu?.findItem(R.id.menu_aloud) ttsMenuItem = menu.findItem(R.id.menu_aloud)
upStarMenu() upStarMenu()
return super.onPrepareOptionsMenu(menu) return super.onPrepareOptionsMenu(menu)
} }

@ -103,8 +103,8 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
return super.onCompatCreateOptionsMenu(menu) return super.onCompatCreateOptionsMenu(menu)
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
groupMenu = menu?.findItem(R.id.menu_group)?.subMenu groupMenu = menu.findItem(R.id.menu_group)?.subMenu
upGroupMenu() upGroupMenu()
return super.onPrepareOptionsMenu(menu) return super.onPrepareOptionsMenu(menu)
} }

Loading…
Cancel
Save