Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump dependencies

Browse Source 
(cherry picked from commit 7e4c45858f6fd2309f8ca07e1e4c4798ab87b764)

# 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -108,7 +108,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = compose.versions.compose.get()
kotlinCompilerExtensionVersion = compose.versions.compiler.get()
}
compileOptions {

3
app/src/main/java/eu/kanade/data/TransactionContext.kt
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,
),
)
}

6
app/src/main/java/eu/kanade/presentation/components/Chip.kt
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,
)
}
}

3
app/src/main/java/eu/kanade/presentation/util/Scrollbar.kt
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) {

3
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHeaderHolder.kt
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)
}
}

2
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
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() {

3
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
View File

@ -34,7 +34,8 @@ class ReaderSettingsSheet(
behavior.halfExpandedRatio = 0.25f
val filterTabIndex = getTabViews().indexOf(colorFilterSettings)
binding.tabs.addOnTabSelectedListener(object : SimpleTabSelectedListener() {
binding.tabs.addOnTabSelectedListener(
object : SimpleTabSelectedListener() {
override fun onTabSelected(tab: TabLayout.Tab?) {
val isFilterTab = tab?.position == filterTabIndex

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt
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

3
app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiBottomNavigationView.kt
View File

@ -86,7 +86,8 @@ class TachiyomiBottomNavigationView @JvmOverloads constructor(
.setInterpolator(interpolator)
.setDuration(duration)
.applySystemAnimatorScale(context)
.setListener(object : AnimatorListenerAdapter() {
.setListener(
object : AnimatorListenerAdapter() {
override fun onAnimationEnd(animation: Animator) {
currentAnimator = null
postInvalidate()

3
app/src/main/java/eu/kanade/tachiyomi/widget/preference/ThemesPreference.kt
View File

@ -37,7 +37,8 @@ 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() {
recycler?.addOnScrollListener(
object : RecyclerView.OnScrollListener() {
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
super.onScrolled(recyclerView, dx, dy)
lastScrollPosition = recyclerView.computeHorizontalScrollOffset()

3
app/src/main/java/eu/kanade/tachiyomi/widget/sheet/BottomSheetViewPager.kt
View File

@ -45,7 +45,8 @@ class BottomSheetViewPager @JvmOverloads constructor(
}
init {
addOnPageChangeListener(object : SimpleOnPageChangeListener() {
addOnPageChangeListener(
object : SimpleOnPageChangeListener() {
override fun onPageSelected(position: Int) {
requestLayout()
}

4
gradle/androidx.versions.toml
View File

@ -1,6 +1,6 @@
[versions]
agp_version = "7.2.1"
lifecycle_version = "2.5.0-rc02"
lifecycle_version = "2.5.0"
[libraries]
annotation = "androidx.annotation:annotation:1.4.0"
@ -10,7 +10,7 @@ constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
corektx = "androidx.core:core-ktx:1.8.0"
splashscreen = "androidx.core:core-splashscreen:1.0.0-alpha02"
recyclerview = "androidx.recyclerview:recyclerview:1.3.0-alpha02"
recyclerview = "androidx.recyclerview:recyclerview:1.3.0-beta01"
swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
viewpager = "androidx.viewpager:viewpager:1.1.0-alpha01"

7
gradle/compose.versions.toml
View File

@ -1,7 +1,8 @@
[versions]
compose = "1.2.0-rc02"
compiler = "1.2.0"
compose = "1.3.0-alpha01"
accompanist = "0.24.12-rc"
material3 = "1.0.0-alpha13"
material3 = "1.0.0-alpha14"
[libraries]
activity = "androidx.activity:activity-compose:1.6.0-alpha05"
@ -13,7 +14,7 @@ ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" }
material3-core = { module = "androidx.compose.material3:material3", version.ref = "material3" }
material3-windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3" }
material3-adapter = "com.google.android.material:compose-theme-adapter-3:1.0.12"
material3-adapter = "com.google.android.material:compose-theme-adapter-3:1.0.13"
material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanist" }

2
gradle/kotlinx.versions.toml
View File

@ -1,5 +1,5 @@
[versions]
kotlin_version = "1.6.21"
kotlin_version = "1.7.0"
coroutines_version = "1.6.3"
serialization_version = "1.3.3"

2
gradle/libs.versions.toml
View File

@ -111,5 +111,5 @@ conductor = ["conductor-core", "conductor-viewpager", "conductor-support-prefere
shizuku = ["shizuku-api", "shizuku-provider"]
[plugins]
kotlinter = { id = "org.jmailen.kotlinter", version = "3.10.0"}
kotlinter = { id = "org.jmailen.kotlinter", version = "3.11.1" }
versionsx = { id = "com.github.ben-manes.versions", version = "0.42.0" }