merge

.github/ISSUE_TEMPLATE/-------feature-request.md

@@ -0,0 +1,20 @@
+---
+name: 功能申请 / Feature request
+about: 有个想法 / Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**这个功能是用来解决问题的吗？ / Is your feature request related to a problem? Please describe.**
+描述这个问题。
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**描述你想要的解决方法 / Describe the solution you'd like**
+描述应通过何种行为来解决这个问题。
+A clear and concise description of what you want to happen.
+
+**备注 / Additional context**
+还有别的想说的吗？
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/bug------bug-report.md

@@ -0,0 +1,41 @@
+---
+name: Bug 反馈 / Bug report
+about: 出问题了 / Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**简略描述 / Describe the bug**
+大概说下是什么问题。
+A clear and concise description of what the bug is.
+
+**如何重现 / To Reproduce**
+重现的步骤：
+1. 打开什么什么
+2. 点击什么什么
+3. 出现什么什么问题
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**预期行为 / Expected behavior**
+应该是什么样子的？
+A clear and concise description of what you expected to happen.
+
+**截图 / Screenshots**
+能截图的话就发截图，请注意风序良俗。
+If applicable, add screenshots to help explain your problem.
+
+**设备型号与 Android 版本 / Device model and Android version**
+ - 设备型号：【比如 Pixel 6 XXXL】
+ - Android 版本：【比如 Android 12.1】
+ - Device model: [e.g. Pixel 6 XXXL]
+ - Android version: [e.g. Android 12.1]
+
+**备注 / Additional context**
+还有什么想说的？
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/sad-panda----------slow-download-speed.md

@@ -0,0 +1,11 @@
+---
+name: Sad Panda / 下载太慢 / Slow download speed
+about: 所有其他问题 / All other questions
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+加入我们的 Telegram 群组，[https://t.me/ehviewer](https://t.me/ehviewer)。温柔[大小]姐姐手把手帮你解决问题。
+Join our Telegram group, [https://t.me/ehviewer](https://t.me/ehviewer). Administrators will help you solve the problem.

.gitignore

@@ -6,3 +6,5 @@
 *.iml
 .idea
 /captures
+release
+google-services.json

README.md

@@ -1,3 +1,7 @@
+# DEPRECATED
+
+[![Telegram](https://img.shields.io/badge/chat-Telegram-blue.svg)](https://t.me/ehviewer)
+
 # EhViewer
 
 ![Icon](art/launcher_icon-web.png)
@@ -31,6 +35,13 @@ Linux
 The apk is in app\build\outputs\apk
 
 
+# Download
+
+[下载](https://github.com/seven332/EhViewer/releases)
+
+[Download](https://github.com/seven332/EhViewer/releases)
+
+
 # Thanks
 
 本项目受到了诸多开源项目的帮助
@@ -55,7 +66,7 @@ Here is the libraries
 
 # License
 
-    Copyright (C) 2014-2016 Hippo Seven
+    Copyright (C) 2014-2019 Hippo Seven
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/build.gradle

@@ -1,31 +1,48 @@
-import com.android.build.gradle.internal.tasks.DefaultAndroidTask
-
 apply plugin: 'com.android.application'
-apply plugin: 'android-chinese-string'
+
+if (file('google-services.json').exists()) {
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'io.fabric'
+}
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.hippo.ehviewer"
         minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 77
-        versionName "1.0.24"
+        targetSdkVersion 28
+        versionCode 104
+        versionName "1.7.3"
         vectorDrawables.useSupportLibrary = true
         resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
-                "es"
+                "es", "ja", "ko", "fr", "de", "th"
+        testOptions.unitTests.includeAndroidResources = true
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     lintOptions {
+        disable 'MissingTranslation'
         abortOnError true
+        checkReleaseBuilds true
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField 'String', 'FILE_PROVIDER_AUTHORITY', '"com.hippo.ehviewer.fileprovider"'
+        }
+        debug {
+            applicationIdSuffix ".debug"
+            buildConfigField 'String', 'FILE_PROVIDER_AUTHORITY', '"com.hippo.ehviewer.debug.fileprovider"'
         }
     }
 
@@ -42,7 +59,7 @@ task copyNotice(type: Copy) {
     finalizedBy ":daogenerator:executeDaoGenerator"
 }
 
-tasks.withType(DefaultAndroidTask) {
+tasks.withType(JavaCompile) {
     task -> task.dependsOn copyNotice
 }
 
@@ -51,35 +68,52 @@ clean {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile "com.android.support:appcompat-v7:$supportLibrary"
-    compile "com.android.support:design:$supportLibrary"
-    compile 'com.github.amlcurran.showcaseview:library:5.4.3'
-    compile 'com.github.seven332:android-recaptcha:2bbb3459a8'
-    compile 'com.github.seven332:animator:0.1.0'
-    compile 'com.github.seven332:beerbelly:0.1.4'
-    compile 'com.github.seven332:conaco:0.1.5-eh'
-    compile 'com.github.seven332:drawerlayout:0.2.1'
-    compile 'com.github.seven332:easyrecyclerview:0.1.1'
-    compile 'com.github.seven332:glgallery:0.1.2'
-    compile 'com.github.seven332:glview:0.1.0'
-    compile 'com.github.seven332:glview-image:0.1.0'
-    compile 'com.github.seven332:hotspot:0.1.0'
-    compile 'com.github.seven332:image:0.1.12'
-    compile 'com.github.seven332:okhttp:3.5.0'
-    compile 'com.github.seven332:refreshlayout:0.1.0'
-    compile 'com.github.seven332:ripple:0.1.2'
-    compile 'com.github.seven332:streampipe:0.1.0'
-    compile 'com.github.seven332:tuxiang:0.1.2'
-    compile 'com.github.seven332:unifile:0.2.0'
-    compile 'com.github.seven332:yorozuya:0.1.2'
-    compile 'com.github.seven332:yorozuya-thread:0.1.1'
-    compile 'com.github.seven332:yorozuya-collect:0.1.4'
-    compile 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.9.2'
-    compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
-    compile 'org.greenrobot:greendao:2.2.0'
-    compile 'org.jsoup:jsoup:1.9.2'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.4'
-    testCompile 'org.jooq:joor:0.9.6'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.firebase:firebase-core:16.0.9'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
+    implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
+    implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
+    implementation 'com.github.seven332.a7zip:extract-lite:d4ddec5793'
+    implementation 'com.github.seven332:android-recaptcha:2bbb3459a8'
+    implementation 'com.github.seven332:android-resource:0.1.0'
+    implementation 'com.github.seven332:animator:0.1.0'
+    implementation 'com.github.seven332:beerbelly:0.1.4'
+    implementation 'com.github.seven332:conaco:0.1.5-eh'
+    implementation 'com.github.seven332:drawerlayout:ea2bb388f0'
+    implementation 'com.github.seven332:easyrecyclerview:0.1.1'
+    implementation 'com.github.seven332:glgallery:0.1.2'
+    implementation 'com.github.seven332:glview:0.1.0'
+    implementation 'com.github.seven332:glview-image:0.1.0'
+    implementation 'com.github.seven332:hotspot:0.1.0'
+    implementation 'com.github.seven332:image:0.1.12'
+    implementation 'com.github.seven332:refreshlayout:0.1.0'
+    implementation 'com.github.seven332:ripple:0.1.2'
+    implementation 'com.github.seven332:streampipe:0.1.0'
+    implementation 'com.github.seven332:tuxiang:0.1.6'
+    implementation 'com.github.seven332:unifile:9ec57bcd8f'
+    implementation 'com.github.seven332:yorozuya:0.1.2'
+    implementation 'com.github.seven332:yorozuya-thread:0.1.1'
+    implementation 'com.github.seven332:yorozuya-collect:0.1.4'
+    implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.3'
+    implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
+    implementation 'org.greenrobot:greendao:2.2.1'
+    implementation 'org.jsoup:jsoup:1.12.1'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:4.2.1'
+    testImplementation 'org.jooq:joor:0.9.6'
+}
+
+configurations.all {
+    resolutionStrategy {
+        force 'com.github.seven332:glgallery:25893283ca'
+        force 'com.github.seven332:glview:ba6aee61d7'
+        force 'com.github.seven332:glview-image:68d94b0fc2'
+        force 'com.github.seven332:image:09b43c0c68'
+
+        exclude group: 'com.github.seven332', module: 'okhttp'
+    }
 }

app/src/debug/res/values-es/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <string name="app_name">EhViewer Debug</string>
+
+</resources>

app/src/debug/res/values-ja/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <string name="app_name">EhViewer Debug</string>
+
+</resources>

app/src/debug/res/values-ko/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <string name="app_name">EhViewer Debug</string>
+
+</resources>

app/src/debug/res/values-zh-rCN/strings.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <string name="app_name">EhViewer Debug</string>
+
+</resources>