Skip to content

Commit b67c199

Browse files
committed
Bump to 2.7.7
1 parent 9b54bbd commit b67c199

File tree

22 files changed

+108
-81
lines changed

22 files changed

+108
-81
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Add prefetch all comics option, for fast or offline browsing
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- 加入预加载所有漫画选项,以支持快速浏览或离线阅读
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- 加入預加載所有漫畫選項,以支持快速瀏覽或離線閱讀
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- 加入預加載所有漫畫選項,以支持快速瀏覽或離線閱讀

xkcd/build.gradle

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ android {
6969
applicationId "xyz.jienan.xkcd"
7070
minSdkVersion 16
7171
targetSdkVersion 29
72-
versionCode 69
73-
versionName "2.7.6"
72+
versionCode 70
73+
versionName "2.7.7"
7474
vectorDrawables.useSupportLibrary = true
7575
resConfigs "de", "es", "fr", "ru", "b+zh", "b+zh+hant+TW"
7676
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
7777
javaCompileOptions {
7878
annotationProcessorOptions {
79-
arguments = [ "objectbox.incremental" : "true" ]
79+
arguments = ["objectbox.incremental": "true"]
8080
}
8181
}
8282
}
@@ -135,7 +135,8 @@ android {
135135
if (isProprietary) {
136136
signingConfig signingConfigs.releaseConfig
137137
} else {
138-
signingConfig signingConfigs.releaseFossConfig // https://gitlab.com/fdroid/fdroidserver/issues/697#note_229584776
138+
signingConfig signingConfigs.releaseFossConfig
139+
// https://gitlab.com/fdroid/fdroidserver/issues/697#note_229584776
139140
}
140141
multiDexEnabled false
141142
}
@@ -190,26 +191,36 @@ dependencies {
190191
implementation 'org.jsoup:jsoup:1.12.1'
191192
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
192193
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
193-
//noinspection GradleDependency
194-
implementation('com.squareup.okhttp3:logging-interceptor:3.12.3') {
195-
force = true // don't change
194+
195+
implementation('com.squareup.okhttp3:logging-interceptor') {
196+
version {
197+
strictly '[3.12, 3.13['
198+
prefer '3.12.12'
199+
}
196200
}
197-
//noinspection GradleDependency
198-
implementation('com.squareup.okhttp3:okhttp:3.12.3') {
199-
force = true // from 3.13, okhttp only support Android 5+
201+
202+
implementation('com.squareup.okhttp3:okhttp') {
200203
// https://cashapp.github.io/2019-02-05/okhttp-3-13-requires-android-5
204+
version {
205+
strictly '[3.12, 3.13['
206+
prefer '3.12.12'
207+
}
201208
}
202209
implementation 'com.squareup:seismic:1.0.2'
203210
implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
204211
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
205212
implementation 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
206213
implementation 'com.google.code.gson:gson:2.8.6'
207-
//noinspection GradleDependency
208-
implementation('com.github.bumptech.glide:glide:3.8.0') {
209-
force = true
214+
215+
implementation('com.github.bumptech.glide:glide') {
216+
version {
217+
strictly '3.8.0'
218+
}
210219
}
211-
implementation('com.github.bumptech.glide:okhttp3-integration:1.5.0') {
212-
force = true
220+
implementation('com.github.bumptech.glide:okhttp3-integration') {
221+
version {
222+
strictly '1.5.0'
223+
}
213224
}
214225
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
215226
implementation 'com.jakewharton.timber:timber:4.7.1'

xkcd/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
android:name=".XkcdApplication"
1111
android:allowBackup="true"
1212
android:extractNativeLibs="true"
13+
android:fullBackupContent="@xml/backup_descriptor"
1314
android:icon="@mipmap/ic_launcher"
1415
android:label="@string/app_name"
1516
android:networkSecurityConfig="@xml/network_security_config"
1617
android:roundIcon="@mipmap/ic_launcher_round"
1718
android:supportsRtl="true"
1819
android:theme="@style/AppBarFontTheme"
19-
tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
20+
tools:ignore="UnusedAttribute"
2021
tools:replace="android:extractNativeLibs">
2122

2223
<activity

xkcd/src/main/java/xyz/jienan/xkcd/base/network/WhatIfAPI.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@ package xyz.jienan.xkcd.base.network
33

44
import io.reactivex.Observable
55
import okhttp3.ResponseBody
6-
import retrofit2.http.Field
7-
import retrofit2.http.FormUrlEncoded
8-
import retrofit2.http.GET
9-
import retrofit2.http.Headers
10-
import retrofit2.http.POST
11-
import retrofit2.http.Path
12-
import retrofit2.http.Query
13-
import retrofit2.http.Url
6+
import retrofit2.http.*
147
import xyz.jienan.xkcd.model.WhatIfArticle
158

169
interface WhatIfAPI {

xkcd/src/main/java/xyz/jienan/xkcd/base/network/XkcdAPI.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,7 @@ package xyz.jienan.xkcd.base.network
33
import io.reactivex.Observable
44
import io.reactivex.Single
55
import okhttp3.ResponseBody
6-
import retrofit2.http.Field
7-
import retrofit2.http.FormUrlEncoded
8-
import retrofit2.http.GET
9-
import retrofit2.http.Header
10-
import retrofit2.http.Headers
11-
import retrofit2.http.POST
12-
import retrofit2.http.Path
13-
import retrofit2.http.Query
14-
import retrofit2.http.Url
6+
import retrofit2.http.*
157
import xyz.jienan.xkcd.model.ExtraComics
168
import xyz.jienan.xkcd.model.XkcdPic
179

xkcd/src/main/java/xyz/jienan/xkcd/comics/fragment/SingleComicFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import android.graphics.Bitmap
66
import android.net.Uri
77
import android.os.Bundle
88
import android.text.TextUtils
9-
import android.view.HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING
109
import android.view.HapticFeedbackConstants.LONG_PRESS
1110
import android.view.Menu
1211
import android.view.MenuItem

xkcd/src/main/java/xyz/jienan/xkcd/extra/fragment/ExtraMainFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package xyz.jienan.xkcd.extra.fragment
22

33
import android.os.Bundle
4-
import android.view.*
4+
import android.view.Menu
5+
import android.view.MenuInflater
6+
import android.view.View
57
import kotlinx.android.synthetic.main.fab_sub_icons.*
68
import kotlinx.android.synthetic.main.fragment_comic_main.*
79
import xyz.jienan.xkcd.Const

0 commit comments

Comments
 (0)