1.4.2

update deps

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>

.idea/gradle.xml

@@ -7,14 +7,13 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -31,7 +31,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
     buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "top.fumiama.copymanga"
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 12
         versionName '1.4.2'
         resConfigs "zh", "zh-rCN"
@@ -42,6 +42,15 @@ android {
         }*/
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
     viewBinding {
         enabled = true
     }
@@ -51,16 +60,13 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.8.0'
-    //implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    //implementation 'com.google.android.material:material:1.2.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     implementation 'com.google.code.gson:gson:2.8.9'
-    //implementation 'com.liaoinstan.springview:library:1.7.0'
 }

app/src/main/assets/h.js

@@ -19,14 +19,20 @@ if (typeof (loaded) == "undefined"){
                 window.scroll({ top: document.body.scrollHeight, left: 0, behavior: 'smooth' });
                 setTimeout(() => {
                     window.scroll({ top: document.body.scrollHeight, left: 0, behavior: 'smooth' });
-                    var imglist = document.getElementsByClassName("container-fluid comicContent")[0].getElementsByTagName("li");
+                    setTimeout(() => {
-                    var nextChapter = document.getElementsByClassName("comicContent-next")[0].getElementsByTagName("a")[0].href;
+                        window.scroll({ top: document.body.scrollHeight, left: 0, behavior: 'smooth' });
-                    var prevChapter = document.getElementsByClassName("comicContent-prev")[1].getElementsByTagName("a")[0].href;
+                        setTimeout(() => {
-                    if(nextChapter == location.href) nextChapter = "null";
+                            window.scroll({ top: document.body.scrollHeight, left: 0, behavior: 'smooth' });
-                    if(prevChapter == location.href) prevChapter = "null";
+                            var imglist = document.getElementsByClassName("container-fluid comicContent")[0].getElementsByTagName("li");
-                    var liststr = document.title.split(" - ")[1] + " " + location.href.substring(location.href.lastIndexOf("/")+1) + "\n" + nextChapter + "\n" + prevChapter;
+                            var nextChapter = document.getElementsByClassName("comicContent-next")[0].getElementsByTagName("a")[0].href;
-                    for(var i = 0; i < imglist.length; i++) liststr += "\n" + imglist[i].getElementsByTagName("img")[0].dataset.src;
+                            var prevChapter = document.getElementsByClassName("comicContent-prev")[1].getElementsByTagName("a")[0].href;
-                    GM.loadChapter(liststr);
+                            if(nextChapter == location.href) nextChapter = "null";
+                            if(prevChapter == location.href) prevChapter = "null";
+                            var liststr = document.title.split(" - ")[1] + " " + location.href.substring(location.href.lastIndexOf("/")+1) + "\n" + nextChapter + "\n" + prevChapter;
+                            for(var i = 0; i < imglist.length; i++) liststr += "\n" + imglist[i].getElementsByTagName("img")[0].dataset.src;
+                            GM.loadChapter(liststr);
+                        }, 500);
+                    }, 500);
                 }, 500);
             }, 500);
         } else {

app/src/main/java/top/fumiama/copymanga/activity/DlActivity.kt

@@ -50,7 +50,6 @@ class DlActivity : Activity() {
     private lateinit var mangaDlTools: MangaDlTools
     var multiSelect = false
 
-    @ExperimentalStdlibApi
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -105,7 +104,6 @@ class DlActivity : Activity() {
         handler.sendEmptyMessage(8)     //set dl card color to blue
     }
 
-    @ExperimentalStdlibApi
     @SuppressLint("SetTextI18n")
     fun setLayouts() {
         ttitle.text = comicName
@@ -184,7 +182,6 @@ class DlActivity : Activity() {
         if(!(jsonFile.exists() && intent.getBooleanExtra("callFromDlList", false))) json?.let { jsonFile.writeText(it) }
     }
 
-    @ExperimentalStdlibApi
     private fun downloadChapterPages(i: ChapterToggleButton) {
         mangaDlTools.onDownloadedListener =
             object : MangaDlTools.OnDownloadedListener {

app/src/main/java/top/fumiama/copymanga/activity/ViewMangaActivity.kt

@@ -73,7 +73,6 @@ class ViewMangaActivity : Activity() {
             field = getPageNumber()
         }
 
-    @ExperimentalStdlibApi
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -121,7 +120,6 @@ class ViewMangaActivity : Activity() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) window.setDecorFitsSystemWindows(false)
     }
 
-    @ExperimentalStdlibApi
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         var flag = false
         if(volTurnPage) when(keyCode) {

app/src/main/java/top/fumiama/copymanga/handler/DlHandler.kt

@@ -19,7 +19,6 @@ class DlHandler(activity: DlActivity, looper: Looper) : Handler(looper) {
     private var size = 0
     private var refreshSize = true
 
-    @ExperimentalStdlibApi
     @SuppressLint("SetTextI18n")
     override fun handleMessage(msg: Message) {
         super.handleMessage(msg)

app/src/main/java/top/fumiama/copymanga/tool/PagesManager.kt

@@ -12,13 +12,10 @@ class PagesManager(w: WeakReference<ViewMangaActivity>) {
     val v = w.get()
     private var isEndL = false
     private var isEndR = false
-    @ExperimentalStdlibApi
     fun toPreviousPage(){ toPage(v?.r2l==true) }
-    @ExperimentalStdlibApi
     fun toNextPage(){ toPage(v?.r2l!=true) }
     private fun judgePrevious() = v?.pageNum?:0 > 1
     private fun judgeNext() = v?.pageNum?:0 < v?.count?:0
-    @ExperimentalStdlibApi
     private fun toPage(goNext:Boolean){
         if (v?.clicked == false) {
             if (if(goNext)judgeNext() else judgePrevious()) {

app/src/main/java/top/fumiama/copymanga/view/ScaleImageView.kt

@@ -640,7 +640,6 @@ class ScaleImageView : ImageView {
      *
      * 在onTouchEvent末尾被执行.
      */
-    @ExperimentalStdlibApi
     private val mGestureDetector =
         GestureDetector(this.context, object : SimpleOnGestureListener() {
             override fun onFling(
@@ -697,7 +696,6 @@ class ScaleImageView : ImageView {
     private val isBig: Boolean
         get() = getMatrixScale(mOuterMatrix)[0] > 1f
 
-    @ExperimentalStdlibApi
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
         super.onTouchEvent(event)

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip