diff --git a/app/build.gradle b/app/build.gradle index a275c740..41aff091 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ android { minSdkVersion 16 targetSdkVersion 29 versionCode 32 - versionName "4.3-beta1" + versionName "4.3-beta1-hotfix1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true @@ -60,27 +60,26 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation "androidx.biometric:biometric:1.0.1" implementation 'com.android.support:multidex:1.0.3' implementation "com.daimajia.swipelayout:library:1.2.0@aar" - implementation 'com.google.android.material:material:1.2.0-alpha03' + implementation 'com.google.android.material:material:1.2.0-alpha04' implementation 'com.google.firebase:firebase-core:17.2.2' implementation 'com.google.firebase:firebase-perf:19.0.5' implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' implementation 'com.github.arimorty:floatingsearchview:2.1.1' implementation 'com.github.clans:fab:1.6.4' - implementation 'com.github.bumptech.glide:glide:4.9.0' - implementation ("com.github.bumptech.glide:recyclerview-integration:4.9.0") { + implementation 'com.github.bumptech.glide:glide:4.10.0' + implementation ("com.github.bumptech.glide:recyclerview-integration:4.10.0") { transitive = false } - implementation "com.squareup.okhttp3:okhttp:4.3.1" implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation 'com.andrognito.patternlockview:patternlockview:1.0.0' implementation "ru.noties.markwon:core:${markwonVersion}" - kapt 'com.github.bumptech.glide:compiler:4.9.0' + kapt 'com.github.bumptech.glide:compiler:4.10.0' testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test:rules:1.2.0' diff --git a/app/release/output.json b/app/release/output.json index 0d9cdd3c..59883138 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":32,"versionName":"4.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":32,"versionName":"4.3-hotfix1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/common.kt b/libpupil/src/main/java/xyz/quaver/hitomi/common.kt index 82327704..7901fbef 100644 --- a/libpupil/src/main/java/xyz/quaver/hitomi/common.kt +++ b/libpupil/src/main/java/xyz/quaver/hitomi/common.kt @@ -17,20 +17,19 @@ package xyz.quaver.hitomi import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonConfiguration import kotlinx.serialization.list import java.net.URL const val protocol = "https:" -fun getGalleryInfo(galleryID: Int): List { - return Json(JsonConfiguration.Stable).parse( +@Suppress("EXPERIMENTAL_API_USAGE") +fun getGalleryInfo(galleryID: Int) = + Json.nonstrict.parse( GalleryInfo.serializer().list, Regex("""\[.+]""").find( URL("$protocol//$domain/galleries/$galleryID.js").readText() )?.value ?: "[]" ) -} //common.js var adapose = false diff --git a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt index d464e0f4..9500513e 100644 --- a/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt +++ b/libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt @@ -17,7 +17,6 @@ package xyz.quaver.hiyobi import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonConfiguration import kotlinx.serialization.list import org.jsoup.Jsoup import xyz.quaver.hitomi.GalleryInfo @@ -64,7 +63,8 @@ fun getReader(galleryID: Int) : Reader { val title = Jsoup.connect(reader).get().title() - val galleryInfo = Json(JsonConfiguration.Stable).parse( + @Suppress("EXPERIMENTAL_API_USAGE") + val galleryInfo = Json.parse( GalleryInfo.serializer().list, with(URL(url).openConnection() as HttpsURLConnection) { setRequestProperty("User-Agent", user_agent)