mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-25 06:11:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
jmir1 2021-07-13 15:26:39 +02:00
commit 5ef5372b10
5 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -200,7 +200,7 @@ dependencies {
implementation("com.github.junrar:junrar:7.4.0")
// HTML parser
implementation("org.jsoup:jsoup:1.13.1")
implementation("org.jsoup:jsoup:1.14.1")
// Database
implementation("androidx.sqlite:sqlite-ktx:2.1.0")
@ -220,7 +220,7 @@ dependencies {
implementation("com.github.inorichi.injekt:injekt-core:65b0440")
// Image library
val coilVersion = "1.2.1"
val coilVersion = "1.3.0"
implementation("io.coil-kt:coil:$coilVersion")
implementation("io.coil-kt:coil-gif:$coilVersion")

11
app/src/main/java/eu/kanade/tachiyomi/ui/anime/AnimeController.kt
View file

@ -287,6 +287,8 @@ class AnimeController :
episodesAdapter?.fastScroller = binding.fastScroller
actionFabScrollListener = actionFab?.shrinkOnScroll(episodeRecycler)
// Initially set FAB invisible; will become visible if unseen episodes are present
actionFab?.isVisible = false
binding.swipeRefresh.refreshes()
.onEach {
@ -350,8 +352,6 @@ class AnimeController :
}
)
}
} else {
view?.context?.toast(R.string.no_next_episode)
}
}
}
@ -884,8 +884,11 @@ class AnimeController :
}
val context = view?.context
if (context != null && episodes.any { it.seen }) {
actionFab?.text = context.getString(R.string.action_resume)
if (context != null) {
actionFab?.isVisible = episodes.any { !it.seen }
if (episodes.any { it.seen }) {
actionFab?.text = context.getString(R.string.action_resume)
}
}
}

2
app/src/main/java/eu/kanade/tachiyomi/ui/main/DeepLinkActivity.kt
View file

@ -10,7 +10,7 @@ class DeepLinkActivity : Activity() {
super.onCreate(savedInstanceState)
intent.apply {
flags = flags or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
flags = flags or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
setClass(applicationContext, MainActivity::class.java)
}
startActivity(intent)

11
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
View file

@ -270,6 +270,8 @@ class MangaController :
chaptersAdapter?.fastScroller = binding.fastScroller
actionFabScrollListener = actionFab?.shrinkOnScroll(chapterRecycler)
// Initially set FAB invisible; will become visible if unread chapters are present
actionFab?.isVisible = false
binding.swipeRefresh.refreshes()
.onEach {
@ -333,8 +335,6 @@ class MangaController :
}
)
}
} else {
view?.context?.toast(R.string.no_next_chapter)
}
}
}
@ -775,8 +775,11 @@ class MangaController :
}
val context = view?.context
if (context != null && chapters.any { it.read }) {
actionFab?.text = context.getString(R.string.action_resume)
if (context != null) {
actionFab?.isVisible = chapters.any { !it.read }
if (chapters.any { it.read }) {
actionFab?.text = context.getString(R.string.action_resume)
}
}
}

1
app/src/main/res/values/themes.xml
View file

@ -117,6 +117,7 @@
<style name="Theme.Tachiyomi.YinYang">
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_yinyang</item>
<item name="colorOnPrimary">@color/color_on_secondary_yinyang</item>
<item name="colorOnSecondary">@color/color_on_secondary_yinyang</item>
<item name="colorTertiary">@color/color_on_secondary_yinyang</item>
<item name="colorOnTertiary">@color/accent_yinyang</item>