Bump dependencies

(cherry picked from commit 7e4c45858f6fd2309f8ca07e1e4c4798ab87b764)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

app/build.gradle.kts

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

app/src/main/java/eu/kanade/data/TransactionContext.kt

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -10,9 +10,9 @@ data class ReaderChapter(val chapter: Chapter) {
     var state: State =
         State.Wait
         set(value) {
-                field = value
+            field = value
-                stateRelay.call(value)
+            stateRelay.call(value)
-            }
+        }
 
     private val stateRelay by lazy { BehaviorRelay.create(state) }
 

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

@@ -34,27 +34,28 @@ class ReaderSettingsSheet(
         behavior.halfExpandedRatio = 0.25f
 
         val filterTabIndex = getTabViews().indexOf(colorFilterSettings)
-        binding.tabs.addOnTabSelectedListener(object : SimpleTabSelectedListener() {
+        binding.tabs.addOnTabSelectedListener(
-            override fun onTabSelected(tab: TabLayout.Tab?) {
+            object : SimpleTabSelectedListener() {
-                val isFilterTab = tab?.position == filterTabIndex
+                override fun onTabSelected(tab: TabLayout.Tab?) {
+                    val isFilterTab = tab?.position == filterTabIndex
 
-                // Remove dimmed backdrop so color filter changes can be previewed
+                    // Remove dimmed backdrop so color filter changes can be previewed
-                backgroundDimAnimator.run {
+                    backgroundDimAnimator.run {
-                    if (isFilterTab) {
+                        if (isFilterTab) {
-                        if (animatedFraction < 1f) {
+                            if (animatedFraction < 1f) {
-                            start()
+                                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

@@ -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

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

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

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

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

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

gradle/androidx.versions.toml

@@ -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"
 

gradle/compose.versions.toml

@@ -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" }

gradle/kotlinx.versions.toml

@@ -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"
 
@@ -12,11 +12,11 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
 
 serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_version" }
 serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization_version" }
-serialization-gradle = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version"}
+serialization-gradle = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" }
 
 [bundles]
 coroutines = ["coroutines-core", "coroutines-android"]
 serialization = ["serialization-json", "serialization-protobuf"]
 
 [plugins]
-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version"}
+android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin_version" }

gradle/libs.versions.toml

@@ -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"}
+versionsx = { id = "com.github.ben-manes.versions", version = "0.42.0" }