From 1c18d317f8e8ca2e8449a33134181fa92f170675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
<41315874+fumiama@users.noreply.github.com>
Date: Tue, 18 Oct 2022 00:50:10 +0800
Subject: [PATCH] =?UTF-8?q?2.0.beta13=201.=20=E8=A7=A3=E5=86=B3=E4=B8=80?=
=?UTF-8?q?=E4=BA=9B=E9=97=AA=E9=80=80=202.=20=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=203.=20=E5=8D=87=E7=BA=A7ABI=204.?=
=?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dgradle=E7=96=91=E9=9A=BE=E6=9D=82=E7=97=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/jarRepositories.xml | 5 ++
README.md | 63 +++++++++++++++++++
app/build.gradle | 13 ++--
.../top/fumiama/copymanga/MainActivity.kt | 1 +
app/src/main/res/layout/fragment_settings.xml | 6 +-
build.gradle | 8 ++-
gradle/wrapper/gradle-wrapper.properties | 2 +-
7 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2370474..35ffc9d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 04d1d90..68b0449 100644
--- a/README.md
+++ b/README.md
@@ -42,3 +42,66 @@
### 未实现功能
未在上表列出的官方`APP`的其他功能。
+
+### 预览
+#### 浅色模式
+
+
+
+  |
+  |
+  |
+  |
+
+
+ | 主页 |
+ 详情 |
+ 阅读 |
+ 标签 |
+
+
+
+
+  |
+  |
+  |
+  |
+
+
+ | 分类 |
+ 下载 |
+ 正在下载 |
+ 抽屉 |
+
+
+
+#### 深色模式
+
+
+
+  |
+  |
+  |
+  |
+
+
+ | 主页 |
+ 详情 |
+ 阅读 |
+ 标签 |
+
+
+
+
+  |
+  |
+  |
+  |
+
+
+ | 分类 |
+ 下载 |
+ 正在下载 |
+ 抽屉 |
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 787153d..e79e187 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,9 +9,9 @@ android {
applicationId 'top.fumiama.copymanga'
minSdkVersion 23
targetSdkVersion 33
- versionCode 24
- versionName '2.0.beta12'
- resConfigs "zh", "zh-rCN"
+ versionCode 25
+ versionName '2.0.beta13'
+ resConfigs 'zh', 'zh-rCN'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -34,8 +34,8 @@ android {
}*/
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = '11'
@@ -52,7 +52,6 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -69,7 +68,7 @@ dependencies {
implementation 'com.to.aboomy:pager2banner:1.0.1'
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.6'
+ implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.github.vovaksenov99:OverscrollableScrollView:1.0'
implementation 'com.liaoinstan.springview:library:1.7.0'
implementation 'com.github.zawadz88.materialpopupmenu:material-popup-menu:4.0.1'
diff --git a/app/src/main/java/top/fumiama/copymanga/MainActivity.kt b/app/src/main/java/top/fumiama/copymanga/MainActivity.kt
index 5414bd6..7599749 100644
--- a/app/src/main/java/top/fumiama/copymanga/MainActivity.kt
+++ b/app/src/main/java/top/fumiama/copymanga/MainActivity.kt
@@ -123,6 +123,7 @@ class MainActivity : AppCompatActivity() {
return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
}
+ @Deprecated("Deprecated in Java")
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (resultCode == RESULT_OK) when (requestCode) {
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 80f7c69..dcbbf62 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,6 +1,4 @@
-
-
-
\ No newline at end of file
+
diff --git a/build.gradle b/build.gradle
index 2874ddb..828834d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.7.10'
repositories {
google()
jcenter()
mavenCentral()
+ mavenCentral()
maven { url 'https://maven.google.com' }
maven { url "https://jitpack.io" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.2'
+ classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
@@ -21,10 +22,11 @@ allprojects {
repositories {
google()
jcenter()
+ mavenCentral()
maven { url "https://jitpack.io" }
}
}
task clean(type: Delete) {
delete rootProject.buildDir
-}
\ No newline at end of file
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0195666..d5ef843 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip