null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update kotlin + compilesdk

Browse source 
sdk to 32
kotlin to 1.6.20
This commit is contained in:
Jays2Kings 2022-04-26 19:45:30 -04:00
parent 7cbdbaa416
commit f70b844b24
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -741,7 +741,7 @@ class LibraryController(
} }
hopperGravity = gravityPref hopperGravity = gravityPref
val gestureDetector = GestureDetectorCompat(activity, LibraryGestureDetector(this)) val gestureDetector = GestureDetectorCompat(binding.root.context, LibraryGestureDetector(this))
with(binding.roundedCategoryHopper) { with(binding.roundedCategoryHopper) {
listOf(categoryHopperLayout, upCategory, downCategory, categoryButton).forEach { listOf(categoryHopperLayout, upCategory, downCategory, categoryButton).forEach {
it.setOnTouchListener { _, event -> it.setOnTouchListener { _, event ->

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

@ -1029,7 +1029,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
} }
override fun dispatchTouchEvent(ev: MotionEvent?): Boolean { override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
gestureDetector?.onTouchEvent(ev) ev?.let { gestureDetector?.onTouchEvent(it) }
if (ev?.action == MotionEvent.ACTION_DOWN) { if (ev?.action == MotionEvent.ACTION_DOWN) {
if (snackBar != null && snackBar!!.isShown) { if (snackBar != null && snackBar!!.isShown) {
val sRect = Rect() val sRect = Rect()

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -341,8 +341,8 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
return true return true
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
val splitItem = menu?.findItem(R.id.action_shift_double_page) val splitItem = menu.findItem(R.id.action_shift_double_page)
splitItem?.isVisible = ((viewer as? PagerViewer)?.config?.doublePages ?: false) && !canShowSplitAtBottom() splitItem?.isVisible = ((viewer as? PagerViewer)?.config?.doublePages ?: false) && !canShowSplitAtBottom()
binding.chaptersSheet.shiftPageButton.isVisible = ((viewer as? PagerViewer)?.config?.doublePages ?: false) && canShowSplitAtBottom() binding.chaptersSheet.shiftPageButton.isVisible = ((viewer as? PagerViewer)?.config?.doublePages ?: false) && canShowSplitAtBottom()
(viewer as? PagerViewer)?.config?.let { config -> (viewer as? PagerViewer)?.config?.let { config ->

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

@ -92,7 +92,7 @@ open class WebViewActivity : BaseWebViewActivity() {
return true return true
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean { override fun onPrepareOptionsMenu(menu: Menu): Boolean {
val backItem = binding.toolbar.menu.findItem(R.id.action_web_back) val backItem = binding.toolbar.menu.findItem(R.id.action_web_back)
val forwardItem = binding.toolbar.menu.findItem(R.id.action_web_forward) val forwardItem = binding.toolbar.menu.findItem(R.id.action_web_forward)
backItem?.isEnabled = binding.webview.canGoBack() backItem?.isEnabled = binding.webview.canGoBack()

2
app/src/main/java/eu/kanade/tachiyomi/util/system/LocaleHelper.kt
View file

@ -38,7 +38,7 @@ object LocaleHelper {
LocaleListCompat.getAdjustedDefault()[0] LocaleListCompat.getAdjustedDefault()[0]
} else { } else {
getLocale(lang) getLocale(lang)
} } ?: Locale.getDefault()
return locale.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) } return locale.getDisplayName(locale).replaceFirstChar { it.uppercase(locale) }
} }

4
buildSrc/src/main/kotlin/Dependencies.kt
View file

@ -18,7 +18,7 @@ object Versions {
const val gradleVersions = "0.29.0" const val gradleVersions = "0.29.0"
const val injekt = "65b0440" const val injekt = "65b0440"
const val junit = "4.13" const val junit = "4.13"
const val kotlin = "1.6.10" const val kotlin = "1.6.20"
const val kotson = "2.5.0" const val kotson = "2.5.0"
const val mockito = "1.10.19" const val mockito = "1.10.19"
const val moshi = "1.9.3" const val moshi = "1.9.3"
@ -48,7 +48,7 @@ object LegacyPluginClassPath {
} }
object AndroidVersions { object AndroidVersions {
const val compileSdk = 31 const val compileSdk = 32
const val minSdk = 23 const val minSdk = 23
const val targetSdk = 30 const val targetSdk = 30
const val versionCode = 87 const val versionCode = 87