Add offline xkcd

Author: zjn0505

build.gradle

@@ -1,23 +1,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.objectboxVersion = '2.5.1'
-    ext.booster_version = '1.5.1'
+    ext.objectboxVersion = '2.6.0'
+    ext.booster_version = '2.1.0'
     ext.isProprietary = getGradle().getStartParameter().getTaskRequests().toString().contains("Proprietary")
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         if (isProprietary) {
             classpath 'com.google.gms:google-services:4.3.3'
-            classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta03'
-            classpath "com.tencent.mm:AndResGuard-gradle-plugin:1.2.17"
+            classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
+            classpath "com.tencent.mm:AndResGuard-gradle-plugin:1.2.18"
         }
         classpath "io.objectbox:objectbox-gradle-plugin:$objectboxVersion"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
         classpath "com.didiglobal.booster:booster-gradle-plugin:$booster_version"
         classpath "com.didiglobal.booster:booster-transform-thread:$booster_version"
         classpath "com.didiglobal.booster:booster-transform-webview:$booster_version"

gradle.properties

@@ -18,10 +18,8 @@ org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 android.enableD8=true
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
 android.debug.obsoleteApi=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-android.enableBuildScriptClasspathCheck=false
-android.enableSeparateAnnotationProcessing=true
+android.enableBuildScriptClasspathCheck=false

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-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip

xkcd/build.gradle

@@ -116,7 +116,6 @@ android {
             minifyEnabled true
             zipAlignEnabled true
             shrinkResources true
-            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'proguard-rules-no-obfuscate.pro'
             testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project-test.pro'
             applicationIdSuffix ".debug"
@@ -175,22 +174,22 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3'
     debugImplementation 'com.gu.android:toolargetool:0.2.1@aar'
     debugImplementation "io.objectbox:objectbox-android-objectbrowser:$objectboxVersion"
     releaseImplementation "io.objectbox:objectbox-android:$objectboxVersion"
 
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.media:media:1.1.0'
     implementation 'androidx.exifinterface:exifinterface:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha02'
-    implementation 'com.google.android.material:material:1.2.0-alpha06'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'org.jsoup:jsoup:1.12.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.4'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.4'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
     //noinspection GradleDependency
     implementation('com.squareup.okhttp3:logging-interceptor:3.12.3') {
         force = true // don't change
@@ -201,10 +200,10 @@ dependencies {
         // https://cashapp.github.io/2019-02-05/okhttp-3-13-requires-android-5
     }
     implementation 'com.squareup:seismic:1.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
     //noinspection GradleDependency
     implementation('com.github.bumptech.glide:glide:3.8.0') {
         force = true
@@ -217,11 +216,11 @@ dependencies {
     implementation 'me.dkzwm.widget.srl:core:1.6.6.7.androidx'
     implementation 'me.dkzwm.widget.srl:ext-classics:1.6.6.7.androidx'
 
-    fossImplementation "androidx.work:work-runtime-ktx:2.3.4"
-    fossImplementation "androidx.work:work-rxjava2:2.3.4"
-    proprietaryImplementation 'com.google.firebase:firebase-analytics:17.3.0'
-    proprietaryImplementation 'com.google.firebase:firebase-messaging:20.1.5'
-    proprietaryImplementation 'com.google.firebase:firebase-crashlytics:17.0.0-beta04'
+    implementation "androidx.work:work-runtime-ktx:2.3.4"
+    implementation "androidx.work:work-rxjava2:2.3.4"
+    proprietaryImplementation 'com.google.firebase:firebase-analytics:17.4.3'
+    proprietaryImplementation 'com.google.firebase:firebase-messaging:20.2.1'
+    proprietaryImplementation 'com.google.firebase:firebase-crashlytics:17.1.0'
 
 //    implementation 'androidx.slice:slice-core:1.0.0'
 //    implementation 'androidx.slice:slice-builders:1.0.0'

xkcd/src/main/AndroidManifest.xml

@@ -3,21 +3,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="xyz.jienan.xkcd">
 
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".XkcdApplication"
         android:allowBackup="true"
+        android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:extractNativeLibs="true"
-        tools:replace="android:extractNativeLibs"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppBarFontTheme"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
+        tools:replace="android:extractNativeLibs">
 
         <activity
             android:name=".home.MainActivity"
@@ -37,20 +37,20 @@
         <activity
             android:name=".comics.activity.ImageDetailPageActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
-            android:theme="@style/TransparentBackgroundTheme"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:theme="@style/TransparentBackgroundTheme" />
 
         <activity
             android:name=".comics.activity.ImageWebViewActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
-            android:theme="@style/TransparentBackgroundTheme"
             android:label=" "
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:theme="@style/TransparentBackgroundTheme" />
 
         <activity
             android:name=".settings.PreferenceActivity"
-            android:label="@string/settings"
             android:configChanges="screenSize|orientation|keyboardHidden|uiMode"
+            android:label="@string/settings"
             android:launchMode="singleTop" />
 
         <activity
@@ -63,9 +63,6 @@
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_what_if_list" />
 
-        <service android:name=".whatif.WhatIfFastLoadService"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
         <meta-data
             android:name="xyz.jienan.xkcd.base.glide.OkHttpProgressGlideModule"
             android:value="GlideModule" />

xkcd/src/main/java/xyz/jienan/xkcd/XkcdApplication.kt

@@ -1,15 +1,19 @@
 package xyz.jienan.xkcd
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.content.res.Configuration
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.PreferenceManager
+import androidx.work.*
 import xyz.jienan.xkcd.base.glide.GlideImageLoader
 import xyz.jienan.xkcd.model.MyObjectBox
 import xyz.jienan.xkcd.model.XkcdModel
 import xyz.jienan.xkcd.model.persist.BoxManager
 import xyz.jienan.xkcd.model.persist.SharedPrefManager
 import xyz.jienan.xkcd.model.util.XkcdSideloadUtils
+import xyz.jienan.xkcd.model.work.WhatIfFastLoadWorker
+import xyz.jienan.xkcd.model.work.XkcdFastLoadWorker
 import xyz.jienan.xkcd.ui.xkcdimageview.ImageLoaderFactory
 
 /**
@@ -38,6 +42,7 @@ class XkcdApplication : Application() {
         SharedPrefManager.init(this)
 
         ImageLoaderFactory.initialize(GlideImageLoader.with(this))
+        fastLoad()
     }
 
     companion object {
@@ -55,4 +60,27 @@ class XkcdApplication : Application() {
         XkcdModel.localizedUrl = resources.getString(R.string.api_xkcd_localization)
         FlavorUtils.updateLocale()
     }
+
+
+    @SuppressLint("EnqueueWork")
+    private fun fastLoad() {
+        val xkcdFastLoadRequest: OneTimeWorkRequest =
+                OneTimeWorkRequestBuilder<XkcdFastLoadWorker>()
+                        .setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
+                        .addTag("xkcd")
+                        .build()
+
+        val whatIfFastLoad: OneTimeWorkRequest =
+                OneTimeWorkRequestBuilder<WhatIfFastLoadWorker>()
+                        .setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
+                        .build()
+
+        val xkcdWork = WorkManager.getInstance(this)
+                .beginUniqueWork("xkcd", ExistingWorkPolicy.KEEP, xkcdFastLoadRequest)
+
+        val whatIfWork = WorkManager.getInstance(this)
+                .beginUniqueWork("what_if", ExistingWorkPolicy.KEEP, whatIfFastLoad)
+
+        WorkContinuation.combine(listOf(xkcdWork, whatIfWork)).enqueue()
+    }
 }

xkcd/src/main/java/xyz/jienan/xkcd/base/glide/OkHttpProgressGlideModule.java

@@ -7,6 +7,7 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
 import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader;
+import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.module.GlideModule;
 
@@ -46,7 +47,7 @@ public static void expect(String url, UIProgressListener listener) {
 
     @Override
     public void applyOptions(Context context, GlideBuilder builder) {
-
+        builder.setDiskCache(new InternalCacheDiskCacheFactory(context, 600 * 1024 * 1024));
     }
 
     @Override

xkcd/src/main/java/xyz/jienan/xkcd/comics/contract/ComicsMainContract.java

@@ -23,8 +23,6 @@ interface View extends BaseView<Presenter> {
 
     interface Presenter extends ContentMainBasePresenter {
 
-        void fastLoad(int latestIndex);
-
         long getBookmark();
 
         boolean setBookmark(long index);

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

@@ -44,7 +44,6 @@ class ComicsMainFragment : ContentMainBaseFragment(), ComicsMainContract.View {
     override fun latestXkcdLoaded(xkcdPic: XkcdPic) {
         latestIndex = xkcdPic.num.toInt()
         super.latestLoaded()
-        (presenter as ComicsMainPresenter).fastLoad(latestIndex)
     }
 
     override fun showFab(xkcdPic: XkcdPic) {
@@ -84,7 +83,7 @@ class ComicsMainFragment : ContentMainBaseFragment(), ComicsMainContract.View {
     }
 
     override fun showThumbUpCount(thumbCount: Long?) {
-        showToast(context!!, thumbCount.toString())
+        showToast(requireContext(), thumbCount.toString())
     }
 
     override fun renderXkcdSearch(xkcdPics: List<XkcdPic>) {
@@ -112,7 +111,7 @@ class ComicsMainFragment : ContentMainBaseFragment(), ComicsMainContract.View {
     override fun onTabTitleDoubleTap() {
         if (currentIndex > 0) {
             (presenter as ComicsMainPresenter).bookmark = currentIndex.toLong()
-            showToast(context!!, getString(R.string.bookmark_saved))
+            showToast(requireContext(), getString(R.string.bookmark_saved))
             view?.performHapticFeedback(LONG_PRESS, FLAG_IGNORE_GLOBAL_SETTING)
             logUXEvent(Const.FIRE_XKCD_BOOKMARK_DOUBLE_TAP)
         }

xkcd/src/main/java/xyz/jienan/xkcd/comics/presenter/ComicsMainPresenter.kt

@@ -53,17 +53,6 @@ class ComicsMainPresenter(private val view: ComicsMainContract.View) : ComicsMai
         view.toggleFab(isFav)
     }
 
-    override fun fastLoad(latestIndex: Int) {
-        if (latestIndex <= 0) {
-            return
-        }
-        Timber.d("Start fast load")
-        XkcdModel.fastLoad(latestIndex)
-                .subscribe({ Timber.d("Fast load succeed") },
-                        { e -> Timber.e(e, "Error in fast load") })
-                .also { compositeDisposable.add(it) }
-    }
-
     override fun getInfoAndShowFab(index: Int) {
         if (!fabShowDisposable.isDisposed) {
             fabShowDisposable.dispose()
@@ -149,7 +138,7 @@ class ComicsMainPresenter(private val view: ComicsMainContract.View) : ComicsMai
 
     override fun getBookmark() = SharedPrefManager.getBookmark(XKCD_BOOKMARK)
 
-    override fun setBookmark(index: Long) : Boolean {
+    override fun setBookmark(index: Long): Boolean {
         return if (index > 0) {
             SharedPrefManager.setBookmark(XKCD_BOOKMARK, index)
             true