Downgrade kotlin
This commit is contained in:
@@ -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'
|
||||
|
||||
@@ -20,7 +20,7 @@ abstract class GroupleRepository : RemoteMangaRepository() {
|
||||
offset: Int,
|
||||
query: String?,
|
||||
sortOrder: SortOrder?,
|
||||
tag: MangaTag?,
|
||||
tag: MangaTag?
|
||||
): List<Manga> {
|
||||
val domain = conf.getDomain(defaultDomain)
|
||||
val doc = when {
|
||||
|
||||
@@ -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<ReaderState>(EXTRA_STATE)
|
||||
?: intent.getParcelableExtra<ReaderState>(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
|
||||
}
|
||||
|
||||
@@ -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<WebtoonImageView>(R.id.ssiv)
|
||||
}
|
||||
|
||||
fun dispatchVerticalScroll(dy: Int) = target.dispatchVerticalScroll(dy)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
10
build.gradle
10
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'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user