admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump dependencies

Browse Source 
(cherry picked from commit 7e4c45858f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
This commit is contained in:
arkon
2022-06-29 22:45:11 -04:00
committed by Jobobby04
parent 98b27c1e78
commit 858c3b5a0a
21 changed files with 69 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/data/TransactionContext.kt
+2 -1
View File
@@ -116,7 +116,8 @@ private suspend fun CoroutineDispatcher.acquireTransactionThread(
// Couldn't acquire a thread, cancel coroutine.
continuation.cancel(
IllegalStateException(
"Unable to acquire a thread to perform the database transaction.", ex,
"Unable to acquire a thread to perform the database transaction.",
ex,
),
)
}
app/src/main/java/eu/kanade/data/exh/MergedMangaReferenceMapper.kt
+1 -1
View File
@@ -13,7 +13,7 @@ val mergedMangaReferenceMapper = {
mergeUrl: String,
mangaId: Long?,
mangaUrl: String,
mangaSourceId: Long, ->
mangaSourceId: Long, ->
MergedMangaReference(
id = id,
isInfoManga = isInfoManga,
app/src/main/java/eu/kanade/presentation/components/Chip.kt
+4 -2
View File
@@ -219,7 +219,8 @@ private fun ChipContent(
avatar()
} else if (leadingIcon != null) {
CompositionLocalProvider(
LocalContentColor provides leadingIconColor, content = leadingIcon,
LocalContentColor provides leadingIconColor,
content = leadingIcon,
)
}
Spacer(Modifier.width(HorizontalElementsPadding))
@@ -227,7 +228,8 @@ private fun ChipContent(
Spacer(Modifier.width(HorizontalElementsPadding))
if (trailingIcon != null) {
CompositionLocalProvider(
LocalContentColor provides trailingIconColor, content = trailingIcon,
LocalContentColor provides trailingIconColor,
content = trailingIcon,
)
}
}
app/src/main/java/eu/kanade/presentation/util/Scrollbar.kt
+2 -1
View File
@@ -88,7 +88,8 @@ private fun Modifier.drawScrollbar(
reverseScrolling: Boolean,
positionOffset: Float,
): Modifier = drawScrollbar(
orientation, reverseScrolling,
orientation,
reverseScrolling,
) { reverseDirection, atEnd, thickness, color, alpha ->
val layoutInfo = state.layoutInfo
val viewportSize = if (orientation == Orientation.Horizontal) {
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupChapter.kt
+1 -1
View File
@@ -49,7 +49,7 @@ val backupChapterMapper = {
chapterNumber: Float,
source_order: Long,
dateFetch: Long,
dateUpload: Long, ->
dateUpload: Long, ->
BackupChapter(
url = url,
name = name,
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupMergedMangaReference.kt
+1 -1
View File
@@ -46,7 +46,7 @@ val backupMergedMangaReferenceMapper = {
mergeUrl: String,
_: Long?,
mangaUrl: String,
mangaSourceId: Long, ->
mangaSourceId: Long, ->
BackupMergedMangaReference(
isInfoManga = isInfoManga,
getChapterUpdates = getChapterUpdates,
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt
+1 -1
View File
@@ -19,7 +19,7 @@ val backupSavedSearchMapper = {
source: Long,
name: String,
query: String?,
filtersJson: String?, ->
filtersJson: String?, ->
BackupSavedSearch(
source = source,
name = name,
app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupTracking.kt
+1 -1
View File
@@ -62,7 +62,7 @@ val backupTrackMapper = {
score: Float,
remoteUrl: String,
startDate: Long,
finishDate: Long, ->
finishDate: Long, ->
BackupTracking(
syncId = syncId.toInt(),
mediaId = mediaId,
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHeaderHolder.kt
+1 -2
View File
@@ -28,8 +28,7 @@ class DownloadHeaderHolder(view: View, adapter: FlexibleAdapter<*>) : Expandable
override fun onItemReleased(position: Int) {
super.onItemReleased(position)
binding.container.isDragged = false
mAdapter as DownloadAdapter
mAdapter.expandAll()
mAdapter.downloadItemListener.onItemReleased(position)
(mAdapter as DownloadAdapter).downloadItemListener.onItemReleased(position)
}
}
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+1 -1
View File
@@ -527,7 +527,7 @@ class MainActivity : BaseActivity() {
// Binding sometimes isn't actually instantiated yet somehow
nav?.setOnItemSelectedListener(null)
binding?.toolbar.setNavigationOnClickListener(null)
binding?.toolbar?.setNavigationOnClickListener(null)
}
override fun onBackPressed() {
app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderChapter.kt
+3 -3
View File
@@ -10,9 +10,9 @@ data class ReaderChapter(val chapter: Chapter) {
var state: State =
State.Wait
set(value) {
field = value
stateRelay.call(value)
}
field = value
stateRelay.call(value)
}
private val stateRelay by lazy { BehaviorRelay.create(state) }
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
+18 -17
View File
@@ -34,27 +34,28 @@ class ReaderSettingsSheet(
behavior.halfExpandedRatio = 0.25f
val filterTabIndex = getTabViews().indexOf(colorFilterSettings)
binding.tabs.addOnTabSelectedListener(object : SimpleTabSelectedListener() {
override fun onTabSelected(tab: TabLayout.Tab?) {
val isFilterTab = tab?.position == filterTabIndex
binding.tabs.addOnTabSelectedListener(
object : SimpleTabSelectedListener() {
override fun onTabSelected(tab: TabLayout.Tab?) {
val isFilterTab = tab?.position == filterTabIndex
// Remove dimmed backdrop so color filter changes can be previewed
backgroundDimAnimator.run {
if (isFilterTab) {
if (animatedFraction < 1f) {
start()
// Remove dimmed backdrop so color filter changes can be previewed
backgroundDimAnimator.run {
if (isFilterTab) {
if (animatedFraction < 1f) {
start()
}
} else if (animatedFraction > 0f) {
reverse()
}
} else if (animatedFraction > 0f) {
reverse()
}
// Hide toolbars
if (activity.menuVisible != !isFilterTab) {
activity.setMenuVisibility(!isFilterTab)
}
}
// Hide toolbars
if (activity.menuVisible != !isFilterTab) {
activity.setMenuVisibility(!isFilterTab)
}
}
},
},
)
if (showColorFilterSettings) {
app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
+1 -1
View File
@@ -65,7 +65,7 @@ class ClearDatabaseController :
adapter = FlexibleAdapter<ClearDatabaseSourceItem>(null, this, true)
binding.recycler.adapter = adapter
binding.recycler.layoutManager = LinearLayoutManager(activity)
binding.recycler.layoutManager = LinearLayoutManager(view.context)
binding.recycler.setHasFixedSize(true)
adapter?.fastScroller = binding.fastScroller
recycler = binding.recycler
app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt
+7 -6
View File
@@ -86,12 +86,13 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor(
.setInterpolator(interpolator)
.setDuration(duration)
.applySystemAnimatorScale(context)
.setListener(object : AnimatorListenerAdapter() {
override fun onAnimationEnd(animation: Animator) {
currentAnimator = null
postInvalidate()
}
},
.setListener(
object : AnimatorListenerAdapter() {
override fun onAnimationEnd(animation: Animator) {
currentAnimator = null
postInvalidate()
}
},
)
}
app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreference.kt
+7 -6
View File
@@ -37,12 +37,13 @@ class ThemesPreference @JvmOverloads constructor(context: Context, attrs: Attrib
recycler?.adapter = adapter
// Retain scroll position on activity recreate after changing theme
recycler?.addOnScrollListener(object : RecyclerView.OnScrollListener() {
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
super.onScrolled(recyclerView, dx, dy)
lastScrollPosition = recyclerView.computeHorizontalScrollOffset()
}
},
recycler?.addOnScrollListener(
object : RecyclerView.OnScrollListener() {
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
super.onScrolled(recyclerView, dx, dy)
lastScrollPosition = recyclerView.computeHorizontalScrollOffset()
}
},
)
lastScrollPosition?.let { scrollToOffset(it) }
}
app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BottomSheetViewPager.kt
+6 -5
View File
@@ -45,11 +45,12 @@ class BottomSheetViewPager @JvmOverloads constructor(
}
init {
addOnPageChangeListener(object : SimpleOnPageChangeListener() {
override fun onPageSelected(position: Int) {
requestLayout()
}
},
addOnPageChangeListener(
object : SimpleOnPageChangeListener() {
override fun onPageSelected(position: Int) {
requestLayout()
}
},
)
}
}