diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml new file mode 100644 index 0000000..2ef7d90 --- /dev/null +++ b/.idea/dictionaries/default_user.xml @@ -0,0 +1,8 @@ + + + + ranobe + tabbar + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b46144..0897082 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,15 @@ diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..b1077fb --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 6957712..0899b82 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -32,7 +32,7 @@ - + diff --git a/app/.gitignore b/app/.gitignore index 956c004..d40c529 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,2 +1,4 @@ /build -/release \ No newline at end of file +/release +/debug +/signing.properties diff --git a/app/build.gradle b/app/build.gradle index f971115..abdfe04 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,17 +1,19 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' +} android { - compileSdkVersion 32 - buildToolsVersion "30.0.2" - defaultConfig { - applicationId "top.fumiama.copymanga" + compileSdk 34 + applicationId "top.fumiama.copymangaweb" minSdkVersion 23 - targetSdkVersion 32 - versionCode 12 - versionName '1.4.3' + //noinspection OldTargetApi + targetSdkVersion 34 + versionCode 13 + versionName '1.5.0' resConfigs "zh", "zh-rCN" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -19,27 +21,38 @@ android { signingConfigs { release { - storeFile file('../../../OneDrive/swc/developer/android_key/open_key') - storePassword 'fumiama' - keyAlias 'default' - keyPassword 'fumiama' - v1SigningEnabled true - v2SigningEnabled true + enableV1Signing true + enableV2Signing true + enableV3Signing true + enableV4Signing true + } + debug { + enableV1Signing true + enableV2Signing true + enableV3Signing true + enableV4Signing true } } - buildTypes { release { minifyEnabled true shrinkResources true + vcsInfo.include false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } - /*debug{ + /*winrelease {r minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' }*/ + debug{ + //minifyEnabled true + //shrinkResources true + //vcsInfo.include false + //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.debug + } } compileOptions { @@ -54,19 +67,43 @@ android { viewBinding { enabled = true } + bundle{ + density{ + enableSplit = true + } + language{ + enableSplit = false + } + } + namespace 'top.fumiama.copymangaweb' +} + +Properties props = new Properties() +def propFile = file('signing.properties') +if (propFile.canRead()){ + props.load(new FileInputStream(propFile)) + + if (props!=null && props.containsKey('STORE_FILE') && props.containsKey('STORE_PASSWORD') && + props.containsKey('KEY_ALIAS') && props.containsKey('KEY_PASSWORD')) { + + android.signingConfigs.debug.storeFile = file(props['STORE_FILE']) + android.signingConfigs.debug.storePassword = props['STORE_PASSWORD'] + android.signingConfigs.debug.keyAlias = props['KEY_ALIAS'] + android.signingConfigs.debug.keyPassword = props['KEY_PASSWORD'] + } } 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.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.viewpager2:viewpager2:1.0.0' + implementation 'androidx.viewpager2:viewpager2:1.1.0' 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' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + implementation 'com.github.bumptech.glide:glide:4.16.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0' + implementation 'com.google.code.gson:gson:2.13.1' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 44100e9..df96321 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -44,7 +44,7 @@ #-keep class com.google.gson.stream.** { *; } # Application classes that will be serialized/deserialized over Gson --keep public class top.fumiama.copymanga.data.* { *; } +-keep public class top.fumiama.copymangaweb.data.* { *; } # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) diff --git a/app/src/androidTest/java/top/fumiama/copymanga/ExampleInstrumentedTest.kt b/app/src/androidTest/java/top/fumiama/copymangaweb/ExampleInstrumentedTest.kt similarity index 95% rename from app/src/androidTest/java/top/fumiama/copymanga/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/top/fumiama/copymangaweb/ExampleInstrumentedTest.kt index 5b6eb95..41a7af6 100644 --- a/app/src/androidTest/java/top/fumiama/copymanga/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/top/fumiama/copymangaweb/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga +package top.fumiama.copymangaweb import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a3a3ec6..23d17c8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/app/src/main/assets/i.js b/app/src/main/assets/i.js index 77ab9ef..7de5a41 100644 --- a/app/src/main/assets/i.js +++ b/app/src/main/assets/i.js @@ -3,13 +3,19 @@ if (typeof (loaded) == "undefined") { var loaded = true; var invoke = { preUrl: "", + hideRanobeTab: function () { + var tabs = document.getElementsByClassName("van-tabbar-item"); + for (i = 0; i < tabs.length; i++) { + if (tabs[i].innerText == "輕小說") tabs[i].style = "display: none;"; + } + }, + hideRanobeRack: function () { + var tabs = document.getElementsByClassName("van-tabs van-tabs--line"); + if (tabs.length) tabs[0].hidden = true; + }, pinTitle: function () { - /*document.getElementsByClassName("van-button__content")[2].click();*/ - document.getElementsByClassName("indexTitle")[0].style.position = "fixed"; - document.getElementsByClassName("indexTitle")[0].style.zIndex = 999; - document.getElementsByClassName("indexTitle")[0].style.width = document.body.clientWidth - 18 + "px"; - document.getElementsByClassName("copySwiper")[0].style.marginTop = "56px"; - document.getElementsByClassName("indexTitle")[0].style.marginTop = "-56px"; + var game = document.getElementsByName("exchange"); + if (game.length) game[0].hidden = true; }, notCallGM: function (url) { if (this.preUrl == url) return false; @@ -35,10 +41,20 @@ if (typeof (loaded) == "undefined") { function modify() { var url = location.href; GM.hideFab(); - if (url.endsWith("/index")) invoke.pinTitle(); + if (url.endsWith("/index")) { + invoke.pinTitle(); + invoke.hideRanobeTab(); + } + else if (url.endsWith("/bookrack")) { + invoke.hideRanobeTab(); + invoke.hideRanobeRack(); + } else if (url.indexOf("/comicContent/") > 0) setTimeout(function () { invoke.loadChapter() }, 1000); else if (url.indexOf("/details/comic/") > 0) GM.loadComic(url); - else if (url.indexOf("/personal") > 0) GM.enterProfile(); + else if (url.indexOf("/personal") > 0) { + invoke.hideRanobeTab(); + GM.enterProfile(); + } } modify(); invoke.urlChangeListener(modify); diff --git a/app/src/main/java/top/fumiama/copymanga/activity/DlActivity.kt b/app/src/main/java/top/fumiama/copymangaweb/activity/DlActivity.kt similarity index 94% rename from app/src/main/java/top/fumiama/copymanga/activity/DlActivity.kt rename to app/src/main/java/top/fumiama/copymangaweb/activity/DlActivity.kt index f9b9b4e..846cbe4 100644 --- a/app/src/main/java/top/fumiama/copymanga/activity/DlActivity.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/activity/DlActivity.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.activity +package top.fumiama.copymangaweb.activity import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -18,18 +18,18 @@ import kotlinx.android.synthetic.main.line_caption.view.* import kotlinx.android.synthetic.main.line_horizonal.view.* import kotlinx.android.synthetic.main.widget_downloadbar.* import kotlinx.android.synthetic.main.widget_titlebar.* -import top.fumiama.copymanga.R -import top.fumiama.copymanga.activity.MainActivity.Companion.mh -import top.fumiama.copymanga.data.ComicStructure -import top.fumiama.copymanga.databinding.ActivityDlBinding -import top.fumiama.copymanga.handler.DlHandler -import top.fumiama.copymanga.tool.MangaDlTools -import top.fumiama.copymanga.tool.MangaDlTools.Companion.wmdlt -import top.fumiama.copymanga.tool.ToolsBox -import top.fumiama.copymanga.view.ChapterToggleButton -import top.fumiama.copymanga.view.LazyScrollView -import top.fumiama.copymanga.web.JSHidden -import top.fumiama.copymanga.web.WebChromeClient +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.activity.MainActivity.Companion.mh +import top.fumiama.copymangaweb.data.ComicStructure +import top.fumiama.copymangaweb.databinding.ActivityDlBinding +import top.fumiama.copymangaweb.handler.DlHandler +import top.fumiama.copymangaweb.tool.MangaDlTools +import top.fumiama.copymangaweb.tool.MangaDlTools.Companion.wmdlt +import top.fumiama.copymangaweb.tool.ToolsBox +import top.fumiama.copymangaweb.view.ChapterToggleButton +import top.fumiama.copymangaweb.view.LazyScrollView +import top.fumiama.copymangaweb.web.JSHidden +import top.fumiama.copymangaweb.web.WebChromeClient import java.io.File import java.lang.Thread.sleep import java.lang.ref.WeakReference diff --git a/app/src/main/java/top/fumiama/copymanga/activity/DlListActivity.kt b/app/src/main/java/top/fumiama/copymangaweb/activity/DlListActivity.kt similarity index 97% rename from app/src/main/java/top/fumiama/copymanga/activity/DlListActivity.kt rename to app/src/main/java/top/fumiama/copymangaweb/activity/DlListActivity.kt index af2e286..fc11767 100644 --- a/app/src/main/java/top/fumiama/copymanga/activity/DlListActivity.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/activity/DlListActivity.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.activity +package top.fumiama.copymangaweb.activity import android.app.Activity import android.app.AlertDialog @@ -9,9 +9,9 @@ import android.widget.ArrayAdapter import android.widget.Toast import kotlinx.android.synthetic.main.activity_dlist.* import kotlinx.android.synthetic.main.widget_titlebar.* -import top.fumiama.copymanga.R -import top.fumiama.copymanga.databinding.ActivityDlistBinding -import top.fumiama.copymanga.handler.DlLHandler +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.databinding.ActivityDlistBinding +import top.fumiama.copymangaweb.handler.DlLHandler import java.io.File import java.util.regex.Pattern import java.util.zip.ZipInputStream diff --git a/app/src/main/java/top/fumiama/copymanga/activity/MainActivity.kt b/app/src/main/java/top/fumiama/copymangaweb/activity/MainActivity.kt similarity index 89% rename from app/src/main/java/top/fumiama/copymanga/activity/MainActivity.kt rename to app/src/main/java/top/fumiama/copymangaweb/activity/MainActivity.kt index 3f44c9c..a632d6f 100644 --- a/app/src/main/java/top/fumiama/copymanga/activity/MainActivity.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/activity/MainActivity.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.activity +package top.fumiama.copymangaweb.activity import android.annotation.SuppressLint import android.app.Activity @@ -10,15 +10,14 @@ import android.view.View import android.webkit.ValueCallback import android.webkit.WebView import kotlinx.android.synthetic.main.activity_main.* -import top.fumiama.copymanga.R -import top.fumiama.copymanga.databinding.ActivityMainBinding -import top.fumiama.copymanga.handler.MainHandler -import top.fumiama.copymanga.tool.SetDraggable -import top.fumiama.copymanga.tool.ToolsBox -import top.fumiama.copymanga.view.JSWebView -import top.fumiama.copymanga.web.JS -import top.fumiama.copymanga.web.JSHidden -import top.fumiama.copymanga.web.WebChromeClient +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.databinding.ActivityMainBinding +import top.fumiama.copymangaweb.handler.MainHandler +import top.fumiama.copymangaweb.tool.SetDraggable +import top.fumiama.copymangaweb.tool.ToolsBox +import top.fumiama.copymangaweb.web.JS +import top.fumiama.copymangaweb.web.JSHidden +import top.fumiama.copymangaweb.web.WebChromeClient import java.lang.ref.WeakReference class MainActivity: Activity() { diff --git a/app/src/main/java/top/fumiama/copymanga/activity/ViewMangaActivity.kt b/app/src/main/java/top/fumiama/copymangaweb/activity/ViewMangaActivity.kt similarity index 97% rename from app/src/main/java/top/fumiama/copymanga/activity/ViewMangaActivity.kt rename to app/src/main/java/top/fumiama/copymangaweb/activity/ViewMangaActivity.kt index 56c003c..ede6ae9 100644 --- a/app/src/main/java/top/fumiama/copymanga/activity/ViewMangaActivity.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/activity/ViewMangaActivity.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.activity +package top.fumiama.copymangaweb.activity import android.animation.ObjectAnimator import android.annotation.SuppressLint @@ -24,12 +24,12 @@ import kotlinx.android.synthetic.main.widget_infodrawer.* import kotlinx.android.synthetic.main.widget_infodrawer.view.* import kotlinx.android.synthetic.main.widget_titlebar.* import kotlinx.android.synthetic.main.widget_viewmangainfo.* -import top.fumiama.copymanga.R -import top.fumiama.copymanga.activity.MainActivity.Companion.wm -import top.fumiama.copymanga.databinding.ActivityViewmangaBinding -import top.fumiama.copymanga.handler.TimeThread -import top.fumiama.copymanga.tool.PropertiesTools -import top.fumiama.copymanga.tool.ToolsBox +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.activity.MainActivity.Companion.wm +import top.fumiama.copymangaweb.databinding.ActivityViewmangaBinding +import top.fumiama.copymangaweb.handler.TimeThread +import top.fumiama.copymangaweb.tool.PropertiesTools +import top.fumiama.copymangaweb.tool.ToolsBox import java.io.File import java.lang.ref.WeakReference import java.text.SimpleDateFormat diff --git a/app/src/main/java/top/fumiama/copymanga/data/ComicStructure.java b/app/src/main/java/top/fumiama/copymangaweb/data/ComicStructure.java similarity index 82% rename from app/src/main/java/top/fumiama/copymanga/data/ComicStructure.java rename to app/src/main/java/top/fumiama/copymangaweb/data/ComicStructure.java index 42719f6..2e36ab3 100644 --- a/app/src/main/java/top/fumiama/copymanga/data/ComicStructure.java +++ b/app/src/main/java/top/fumiama/copymangaweb/data/ComicStructure.java @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.data; +package top.fumiama.copymangaweb.data; public class ComicStructure { public String name; diff --git a/app/src/main/java/top/fumiama/copymanga/handler/DlHandler.kt b/app/src/main/java/top/fumiama/copymangaweb/handler/DlHandler.kt similarity index 95% rename from app/src/main/java/top/fumiama/copymanga/handler/DlHandler.kt rename to app/src/main/java/top/fumiama/copymangaweb/handler/DlHandler.kt index a0d5fa4..f436f68 100644 --- a/app/src/main/java/top/fumiama/copymanga/handler/DlHandler.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/handler/DlHandler.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.handler +package top.fumiama.copymangaweb.handler import android.annotation.SuppressLint import android.os.Handler @@ -7,9 +7,9 @@ import android.os.Message import android.widget.Toast import android.widget.ToggleButton import kotlinx.android.synthetic.main.widget_downloadbar.* -import top.fumiama.copymanga.R -import top.fumiama.copymanga.activity.DlActivity -import top.fumiama.copymanga.tool.MangaDlTools.Companion.wmdlt +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.activity.DlActivity +import top.fumiama.copymangaweb.tool.MangaDlTools.Companion.wmdlt import java.lang.ref.WeakReference class DlHandler(activity: DlActivity, looper: Looper) : Handler(looper) { diff --git a/app/src/main/java/top/fumiama/copymanga/handler/DlLHandler.kt b/app/src/main/java/top/fumiama/copymangaweb/handler/DlLHandler.kt similarity index 84% rename from app/src/main/java/top/fumiama/copymanga/handler/DlLHandler.kt rename to app/src/main/java/top/fumiama/copymangaweb/handler/DlLHandler.kt index d5d02c0..9aae211 100644 --- a/app/src/main/java/top/fumiama/copymanga/handler/DlLHandler.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/handler/DlLHandler.kt @@ -1,9 +1,9 @@ -package top.fumiama.copymanga.handler +package top.fumiama.copymangaweb.handler import android.os.Handler import android.os.Looper import android.os.Message -import top.fumiama.copymanga.activity.DlListActivity +import top.fumiama.copymangaweb.activity.DlListActivity import java.io.File import java.lang.ref.WeakReference diff --git a/app/src/main/java/top/fumiama/copymanga/handler/MainHandler.kt b/app/src/main/java/top/fumiama/copymangaweb/handler/MainHandler.kt similarity index 89% rename from app/src/main/java/top/fumiama/copymanga/handler/MainHandler.kt rename to app/src/main/java/top/fumiama/copymangaweb/handler/MainHandler.kt index e7f4ab9..fb95458 100644 --- a/app/src/main/java/top/fumiama/copymanga/handler/MainHandler.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/handler/MainHandler.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.handler +package top.fumiama.copymangaweb.handler import android.animation.ObjectAnimator import android.content.Intent @@ -7,10 +7,10 @@ import android.os.Looper import android.os.Message import android.view.View import kotlinx.android.synthetic.main.activity_main.* -import top.fumiama.copymanga.activity.DlActivity.Companion.json -import top.fumiama.copymanga.activity.MainActivity.Companion.wm -import top.fumiama.copymanga.activity.ViewMangaActivity -import top.fumiama.copymanga.tool.MangaDlTools.Companion.wmdlt +import top.fumiama.copymangaweb.activity.DlActivity.Companion.json +import top.fumiama.copymangaweb.activity.MainActivity.Companion.wm +import top.fumiama.copymangaweb.activity.ViewMangaActivity +import top.fumiama.copymangaweb.tool.MangaDlTools.Companion.wmdlt class MainHandler(looper: Looper):Handler(looper) { var saveUrlsOnly = false diff --git a/app/src/main/java/top/fumiama/copymanga/handler/TimeThread.kt b/app/src/main/java/top/fumiama/copymangaweb/handler/TimeThread.kt similarity index 90% rename from app/src/main/java/top/fumiama/copymanga/handler/TimeThread.kt rename to app/src/main/java/top/fumiama/copymangaweb/handler/TimeThread.kt index 270785e..19dce96 100644 --- a/app/src/main/java/top/fumiama/copymanga/handler/TimeThread.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/handler/TimeThread.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.handler +package top.fumiama.copymangaweb.handler import android.os.Handler diff --git a/app/src/main/java/top/fumiama/copymanga/tool/DownloadTools.kt b/app/src/main/java/top/fumiama/copymangaweb/tool/DownloadTools.kt similarity index 96% rename from app/src/main/java/top/fumiama/copymanga/tool/DownloadTools.kt rename to app/src/main/java/top/fumiama/copymangaweb/tool/DownloadTools.kt index 5d4d3a2..130eb44 100644 --- a/app/src/main/java/top/fumiama/copymanga/tool/DownloadTools.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/tool/DownloadTools.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.tool +package top.fumiama.copymangaweb.tool import android.util.Log import java.net.HttpURLConnection diff --git a/app/src/main/java/top/fumiama/copymanga/tool/MangaDlTools.kt b/app/src/main/java/top/fumiama/copymangaweb/tool/MangaDlTools.kt similarity index 95% rename from app/src/main/java/top/fumiama/copymanga/tool/MangaDlTools.kt rename to app/src/main/java/top/fumiama/copymangaweb/tool/MangaDlTools.kt index 1d3b26d..b3ff842 100644 --- a/app/src/main/java/top/fumiama/copymanga/tool/MangaDlTools.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/tool/MangaDlTools.kt @@ -1,7 +1,7 @@ -package top.fumiama.copymanga.tool +package top.fumiama.copymangaweb.tool -import top.fumiama.copymanga.R -import top.fumiama.copymanga.activity.DlActivity +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.activity.DlActivity import kotlinx.android.synthetic.main.activity_dl.* import java.io.File import java.lang.Thread.sleep diff --git a/app/src/main/java/top/fumiama/copymanga/tool/PagesManager.kt b/app/src/main/java/top/fumiama/copymangaweb/tool/PagesManager.kt similarity index 94% rename from app/src/main/java/top/fumiama/copymanga/tool/PagesManager.kt rename to app/src/main/java/top/fumiama/copymangaweb/tool/PagesManager.kt index 6780b51..22af4a3 100644 --- a/app/src/main/java/top/fumiama/copymanga/tool/PagesManager.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/tool/PagesManager.kt @@ -1,10 +1,10 @@ -package top.fumiama.copymanga.tool +package top.fumiama.copymangaweb.tool import android.content.Intent import android.widget.Toast import kotlinx.android.synthetic.main.activity_main.* -import top.fumiama.copymanga.activity.MainActivity.Companion.wm -import top.fumiama.copymanga.activity.ViewMangaActivity +import top.fumiama.copymangaweb.activity.MainActivity.Companion.wm +import top.fumiama.copymangaweb.activity.ViewMangaActivity import java.io.File import java.lang.ref.WeakReference diff --git a/app/src/main/java/top/fumiama/copymanga/tool/PropertiesTools.kt b/app/src/main/java/top/fumiama/copymangaweb/tool/PropertiesTools.kt similarity index 97% rename from app/src/main/java/top/fumiama/copymanga/tool/PropertiesTools.kt rename to app/src/main/java/top/fumiama/copymangaweb/tool/PropertiesTools.kt index 64d4957..46d7859 100644 --- a/app/src/main/java/top/fumiama/copymanga/tool/PropertiesTools.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/tool/PropertiesTools.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.tool +package top.fumiama.copymangaweb.tool //PropertiesTools.kt //created by fumiama 20200724 import android.util.Log diff --git a/app/src/main/java/top/fumiama/copymanga/tool/SetDraggable.kt b/app/src/main/java/top/fumiama/copymangaweb/tool/SetDraggable.kt similarity index 98% rename from app/src/main/java/top/fumiama/copymanga/tool/SetDraggable.kt rename to app/src/main/java/top/fumiama/copymangaweb/tool/SetDraggable.kt index c3b13da..32b584e 100644 --- a/app/src/main/java/top/fumiama/copymanga/tool/SetDraggable.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/tool/SetDraggable.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.tool +package top.fumiama.copymangaweb.tool import android.content.Context import android.view.MotionEvent diff --git a/app/src/main/java/top/fumiama/copymanga/tool/ToolsBox.kt b/app/src/main/java/top/fumiama/copymangaweb/tool/ToolsBox.kt similarity index 96% rename from app/src/main/java/top/fumiama/copymanga/tool/ToolsBox.kt rename to app/src/main/java/top/fumiama/copymangaweb/tool/ToolsBox.kt index d4d1219..9dd16c1 100644 --- a/app/src/main/java/top/fumiama/copymanga/tool/ToolsBox.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/tool/ToolsBox.kt @@ -1,16 +1,14 @@ -package top.fumiama.copymanga.tool +package top.fumiama.copymangaweb.tool import android.app.Activity import android.app.AlertDialog import android.content.Context import android.net.ConnectivityManager import android.net.NetworkCapabilities -import android.util.Log import android.widget.Toast -import top.fumiama.copymanga.R +import top.fumiama.copymangaweb.R import java.lang.ref.WeakReference import java.util.* -import java.util.regex.Pattern import kotlin.math.sqrt class ToolsBox(w: WeakReference) { diff --git a/app/src/main/java/top/fumiama/copymanga/view/ChapterToggleButton.kt b/app/src/main/java/top/fumiama/copymangaweb/view/ChapterToggleButton.kt similarity index 95% rename from app/src/main/java/top/fumiama/copymanga/view/ChapterToggleButton.kt rename to app/src/main/java/top/fumiama/copymangaweb/view/ChapterToggleButton.kt index 8e221e3..4bca82f 100644 --- a/app/src/main/java/top/fumiama/copymanga/view/ChapterToggleButton.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/view/ChapterToggleButton.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.view +package top.fumiama.copymangaweb.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/top/fumiama/copymanga/view/JSWebView.kt b/app/src/main/java/top/fumiama/copymangaweb/view/JSWebView.kt similarity index 89% rename from app/src/main/java/top/fumiama/copymanga/view/JSWebView.kt rename to app/src/main/java/top/fumiama/copymangaweb/view/JSWebView.kt index b65ebff..679f1aa 100644 --- a/app/src/main/java/top/fumiama/copymanga/view/JSWebView.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/view/JSWebView.kt @@ -1,12 +1,11 @@ -package top.fumiama.copymanga.view +package top.fumiama.copymangaweb.view import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet import android.util.Log import android.webkit.WebView -import top.fumiama.copymanga.web.WebViewClient -import kotlin.reflect.KClass +import top.fumiama.copymangaweb.web.WebViewClient @SuppressLint("JavascriptInterface") class JSWebView : WebView { diff --git a/app/src/main/java/top/fumiama/copymanga/view/LazyScrollView.kt b/app/src/main/java/top/fumiama/copymangaweb/view/LazyScrollView.kt similarity index 97% rename from app/src/main/java/top/fumiama/copymanga/view/LazyScrollView.kt rename to app/src/main/java/top/fumiama/copymangaweb/view/LazyScrollView.kt index d585bad..f490982 100644 --- a/app/src/main/java/top/fumiama/copymanga/view/LazyScrollView.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/view/LazyScrollView.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.view +package top.fumiama.copymangaweb.view import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/top/fumiama/copymanga/view/ScaleImageView.kt b/app/src/main/java/top/fumiama/copymangaweb/view/ScaleImageView.kt similarity index 99% rename from app/src/main/java/top/fumiama/copymanga/view/ScaleImageView.kt rename to app/src/main/java/top/fumiama/copymangaweb/view/ScaleImageView.kt index d342656..c63bd86 100644 --- a/app/src/main/java/top/fumiama/copymanga/view/ScaleImageView.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/view/ScaleImageView.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.view +package top.fumiama.copymangaweb.view import android.animation.ValueAnimator import android.animation.ValueAnimator.AnimatorUpdateListener @@ -14,8 +14,8 @@ import android.view.GestureDetector import android.view.GestureDetector.SimpleOnGestureListener import android.view.MotionEvent import android.widget.ImageView -import top.fumiama.copymanga.activity.ViewMangaActivity -import top.fumiama.copymanga.tool.PagesManager +import top.fumiama.copymangaweb.activity.ViewMangaActivity +import top.fumiama.copymangaweb.tool.PagesManager import java.lang.ref.WeakReference import java.util.* import kotlin.math.sqrt @@ -643,7 +643,7 @@ class ScaleImageView : ImageView { private val mGestureDetector = GestureDetector(this.context, object : SimpleOnGestureListener() { override fun onFling( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float diff --git a/app/src/main/java/top/fumiama/copymanga/web/JS.kt b/app/src/main/java/top/fumiama/copymangaweb/web/JS.kt similarity index 77% rename from app/src/main/java/top/fumiama/copymanga/web/JS.kt rename to app/src/main/java/top/fumiama/copymangaweb/web/JS.kt index e43508f..8765ea0 100644 --- a/app/src/main/java/top/fumiama/copymanga/web/JS.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/web/JS.kt @@ -1,11 +1,10 @@ -package top.fumiama.copymanga.web +package top.fumiama.copymangaweb.web import android.util.Log import android.webkit.JavascriptInterface -import top.fumiama.copymanga.R -import top.fumiama.copymanga.activity.MainActivity.Companion.mh -import top.fumiama.copymanga.activity.MainActivity.Companion.wm -import top.fumiama.copymanga.activity.ViewMangaActivity +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.activity.MainActivity.Companion.mh +import top.fumiama.copymangaweb.activity.MainActivity.Companion.wm class JS { @JavascriptInterface diff --git a/app/src/main/java/top/fumiama/copymanga/web/JSHidden.kt b/app/src/main/java/top/fumiama/copymangaweb/web/JSHidden.kt similarity index 76% rename from app/src/main/java/top/fumiama/copymanga/web/JSHidden.kt rename to app/src/main/java/top/fumiama/copymangaweb/web/JSHidden.kt index af7bf13..205a8f3 100644 --- a/app/src/main/java/top/fumiama/copymanga/web/JSHidden.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/web/JSHidden.kt @@ -1,9 +1,9 @@ -package top.fumiama.copymanga.web +package top.fumiama.copymangaweb.web import android.util.Log import android.webkit.JavascriptInterface -import top.fumiama.copymanga.activity.DlActivity -import top.fumiama.copymanga.activity.MainActivity.Companion.mh +import top.fumiama.copymangaweb.activity.DlActivity +import top.fumiama.copymangaweb.activity.MainActivity.Companion.mh class JSHidden { @JavascriptInterface diff --git a/app/src/main/java/top/fumiama/copymanga/web/WebChromeClient.kt b/app/src/main/java/top/fumiama/copymangaweb/web/WebChromeClient.kt similarity index 88% rename from app/src/main/java/top/fumiama/copymanga/web/WebChromeClient.kt rename to app/src/main/java/top/fumiama/copymangaweb/web/WebChromeClient.kt index fa2a03e..cd17430 100644 --- a/app/src/main/java/top/fumiama/copymanga/web/WebChromeClient.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/web/WebChromeClient.kt @@ -1,10 +1,10 @@ -package top.fumiama.copymanga.web +package top.fumiama.copymangaweb.web import android.net.Uri import android.webkit.* import android.webkit.WebChromeClient -import top.fumiama.copymanga.activity.MainActivity.Companion.mh -import top.fumiama.copymanga.activity.MainActivity.Companion.wm +import top.fumiama.copymangaweb.activity.MainActivity.Companion.mh +import top.fumiama.copymangaweb.activity.MainActivity.Companion.wm class WebChromeClient:WebChromeClient() { override fun onProgressChanged(view: WebView?, newProgress: Int) { diff --git a/app/src/main/java/top/fumiama/copymanga/web/WebViewClient.kt b/app/src/main/java/top/fumiama/copymangaweb/web/WebViewClient.kt similarity index 89% rename from app/src/main/java/top/fumiama/copymanga/web/WebViewClient.kt rename to app/src/main/java/top/fumiama/copymangaweb/web/WebViewClient.kt index b3887a6..348dbc9 100644 --- a/app/src/main/java/top/fumiama/copymanga/web/WebViewClient.kt +++ b/app/src/main/java/top/fumiama/copymangaweb/web/WebViewClient.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga.web +package top.fumiama.copymangaweb.web import android.content.Context import android.graphics.Bitmap @@ -7,9 +7,8 @@ import android.util.Log import android.webkit.* import android.webkit.WebViewClient import android.widget.Toast -import top.fumiama.copymanga.R -import top.fumiama.copymanga.activity.MainActivity.Companion.mh -import top.fumiama.copymanga.activity.MainActivity.Companion.wm +import top.fumiama.copymangaweb.R +import top.fumiama.copymangaweb.activity.MainActivity.Companion.wm class WebViewClient(private val context: Context, jsFileName: String):WebViewClient() { private val js = context.assets.open(jsFileName).readBytes().decodeToString() diff --git a/app/src/main/res/layout/activity_dl.xml b/app/src/main/res/layout/activity_dl.xml index b8d1df3..a0d9adf 100644 --- a/app/src/main/res/layout/activity_dl.xml +++ b/app/src/main/res/layout/activity_dl.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="#FCFCFF"> - - - + - - diff --git a/app/src/main/res/layout/button_tbutton.xml b/app/src/main/res/layout/button_tbutton.xml index e5223df..40a22e4 100644 --- a/app/src/main/res/layout/button_tbutton.xml +++ b/app/src/main/res/layout/button_tbutton.xml @@ -1,5 +1,5 @@ - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 86489e3..4c942db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,8 @@ 拷贝漫画 - https://copymanga.net/h5/init - https://www.copymanga.net - https://www.copymanga.net/comic + https://www.copy20.com + https://www.copy20.com + https://www.copy20.com/comic Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.75 Safari/537.36 Edg/86.0.622.38 diff --git a/app/src/test/java/top/fumiama/copymanga/ExampleUnitTest.kt b/app/src/test/java/top/fumiama/copymangaweb/ExampleUnitTest.kt similarity index 90% rename from app/src/test/java/top/fumiama/copymanga/ExampleUnitTest.kt rename to app/src/test/java/top/fumiama/copymangaweb/ExampleUnitTest.kt index 36c022e..08db100 100644 --- a/app/src/test/java/top/fumiama/copymanga/ExampleUnitTest.kt +++ b/app/src/test/java/top/fumiama/copymangaweb/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package top.fumiama.copymanga +package top.fumiama.copymangaweb import org.junit.Test diff --git a/build.gradle b/build.gradle index 87cd618..33274a9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.31' + ext.kotlin_version = "$cm_kotlin_version" repositories { + gradlePluginPortal() google() - jcenter() + mavenCentral() + maven { url 'https://maven.google.com' } + maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:8.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -17,10 +20,11 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() + maven { url "https://jitpack.io" } } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 98ee989..26f80b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,4 +19,8 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -android.enableR8.fullMode=true \ No newline at end of file +android.enableR8.fullMode=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false +cm_kotlin_version=1.7.10 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd4f9ee..9b0e40c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 14 16:47:38 CST 2020 +#Fri Sep 04 18:15:43 CST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3fc2f4b..e230c77 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,8 @@ +pluginManagement { + plugins { + id 'kotlin-android' version "$cm_kotlin_version" + } +} + include ':app' rootProject.name = "拷贝漫画" \ No newline at end of file