diff --git a/app/build.gradle b/app/build.gradle index 10edf9d61..ab5af80ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.3.0-rc01' implementation 'androidx.fragment:fragment-ktx:1.2.4' implementation 'androidx.appcompat:appcompat:1.2.0-beta01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta5' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01' implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha03' implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01' diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt index 169cd12e3..b70289e17 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt @@ -20,7 +20,7 @@ abstract class GroupleRepository : RemoteMangaRepository() { offset: Int, query: String?, sortOrder: SortOrder?, - tag: MangaTag?, + tag: MangaTag? ): List { val domain = conf.getDomain(defaultDomain) val doc = when { diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt index af8bc33a4..8c126a293 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/ReaderActivity.kt @@ -66,8 +66,9 @@ class ReaderActivity : BaseFullscreenActivity(), ReaderView, ChaptersDialog.OnCh toolbar_bottom.inflateMenu(R.menu.opt_reader_bottom) toolbar_bottom.setOnMenuItemClickListener(::onOptionsItemSelected) - state = savedInstanceState?.getParcelable(EXTRA_STATE) - ?: intent.getParcelableExtra(EXTRA_STATE) + @Suppress("RemoveExplicitTypeArguments") + state = savedInstanceState?.getParcelable(EXTRA_STATE) + ?: intent.getParcelableExtra(EXTRA_STATE) ?: let { Toast.makeText(this, R.string.error_occurred, Toast.LENGTH_SHORT).show() finish() @@ -224,13 +225,11 @@ class ReaderActivity : BaseFullscreenActivity(), ReaderView, ChaptersDialog.OnCh setUiIsVisible(!appbar_top.isVisible) } GridTouchHelper.AREA_TOP, - GridTouchHelper.AREA_LEFT, - -> if (isTapSwitchEnabled) { + GridTouchHelper.AREA_LEFT -> if (isTapSwitchEnabled) { reader?.switchPageBy(-1) } GridTouchHelper.AREA_BOTTOM, - GridTouchHelper.AREA_RIGHT, - -> if (isTapSwitchEnabled) { + GridTouchHelper.AREA_RIGHT -> if (isTapSwitchEnabled) { reader?.switchPageBy(1) } } @@ -268,15 +267,13 @@ class ReaderActivity : BaseFullscreenActivity(), ReaderView, ChaptersDialog.OnCh KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_PAGE_DOWN, KeyEvent.KEYCODE_DPAD_DOWN, - KeyEvent.KEYCODE_DPAD_RIGHT, - -> { + KeyEvent.KEYCODE_DPAD_RIGHT -> { reader?.switchPageBy(1) true } KeyEvent.KEYCODE_PAGE_UP, KeyEvent.KEYCODE_DPAD_UP, - KeyEvent.KEYCODE_DPAD_LEFT, - -> { + KeyEvent.KEYCODE_DPAD_LEFT -> { reader?.switchPageBy(-1) true } diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/reader/wetoon/WebtoonFrameLayout.kt b/app/src/main/java/org/koitharu/kotatsu/ui/reader/wetoon/WebtoonFrameLayout.kt index 9d6ce8365..2ba743b90 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/reader/wetoon/WebtoonFrameLayout.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/reader/wetoon/WebtoonFrameLayout.kt @@ -9,8 +9,8 @@ class WebtoonFrameLayout @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : FrameLayout(context, attrs, defStyleAttr) { - private val target: WebtoonImageView by lazy { - findViewById(R.id.ssiv) + private val target by lazy { + findViewById(R.id.ssiv) } fun dispatchVerticalScroll(dy: Int) = target.dispatchVerticalScroll(dy) diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt b/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt index c333fcafc..bf05c9cc2 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/MangaShortcut.kt @@ -61,7 +61,7 @@ class MangaShortcut(private val manga: Manga) { private suspend fun buildShortcutInfo( context: Context, - manga: Manga, + manga: Manga ): ShortcutInfoCompat.Builder { val icon = safe { val size = getIconSize(context) diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt index 18ae3ed0f..02dc03d56 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt @@ -84,7 +84,7 @@ fun View.disableFor(timeInMillis: Long) { fun View.showPopupMenu( @MenuRes menuRes: Int, onPrepare: ((Menu) -> Unit)? = null, - onItemClick: (MenuItem) -> Boolean, + onItemClick: (MenuItem) -> Boolean ) { val menu = PopupMenu(context, this) menu.inflate(menuRes) diff --git a/build.gradle b/build.gradle index 209fec629..1b7a78987 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4-M1" + ext.kotlin_version = "1.3.72" repositories { google() jcenter() - maven { - url 'https://dl.bintray.com/kotlin/kotlin-eap' - } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0-alpha08' + classpath 'com.android.tools.build:gradle:4.1.0-alpha09' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -24,9 +21,6 @@ allprojects { maven { url 'https://jitpack.io' } - maven { - url 'https://dl.bintray.com/kotlin/kotlin-eap' - } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 70aa6bb91..200f2e0d5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Sat May 09 10:22:49 EEST 2020 +#Sun May 10 11:33:24 EEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME