3.5.0

WangDaYeeeeee · Feb 17, 2019 · 0e37bf7 · 0e37bf7
1 parent 588764e
commit 0e37bf7
Show file tree

Hide file tree

Showing 297 changed files with 1,197 additions and 1,155 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.wangdaye.mysplash"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 348
-        versionName "3.4.8"
+        versionCode 350
+        versionName "3.5.0"
     }
     sourceSets {
         main {
@@ -64,6 +64,10 @@ android {
             v2SigningEnabled false
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 buildscript {
@@ -97,12 +101,12 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:preference-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.1.0-alpha03'
+    implementation 'com.google.android.material:material:1.1.0-alpha03'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.browser:browser:1.0.0'
 
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
@@ -112,15 +116,15 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:3.7.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
 
-    implementation 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    implementation 'com.jakewharton:butterknife:10.1.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
 
     implementation 'com.github.rahatarmanahmed:circularprogressview:2.5.0'
     implementation 'com.pacioianu.david:ink-page-indicator:1.2.0'
     implementation 'org.greenrobot:greendao:3.2.0'
     implementation "com.google.android.apps.muzei:muzei-api:3.1.0"
     implementation 'org.jetbrains:annotations-java5:15.0'
-    implementation 'android.arch.work:work-runtime:1.0.0-beta01'
+    implementation 'android.arch.work:work-runtime:1.0.0-rc01'
 
     implementation 'com.liulishuo.filedownloader:library:1.7.5'
 }
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":348,"versionName":"3.4.8","enabled":true,"outputFile":"Mysplash 3.4.8.apk","fullName":"release","baseName":"release"},"path":"Mysplash 3.4.8.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":350,"versionName":"3.5.0","enabled":true,"outputFile":"Mysplash 3.5.0.apk","fullName":"release","baseName":"release"},"path":"Mysplash 3.5.0.apk","properties":{}}]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.wangdaye.mysplash">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+        tools:ignore="ProtectedPermissions" />
+
     <application
         android:name=".Mysplash"
         android:allowBackup="true"
@@ -13,7 +24,8 @@
         android:largeHeap="true"
         android:taskAffinity="com.wangdaye.mysplash"
         android:allowTaskReparenting="true"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning,ManifestResource">
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning,ManifestResource"
+        tools:targetApi="p">
 
         <activity
             android:name=".main.view.activity.MainActivity"
@@ -261,17 +273,14 @@
             <intent-filter>
                 <action android:name="com.google.android.apps.muzei.api.MuzeiArtProvider"/>
             </intent-filter>
-            <meta-data
-                android:name="color"
-                android:value="@color/colorPrimary_dark" />
             <meta-data
                 android:name="settingsActivity"
                 android:value="com.wangdaye.mysplash.common.ui.activity.muzei.MuzeiSettingsActivity" />
         </provider>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.wangdaye.mysplash"
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
             android:grantUriPermissions="true"
             android:exported="false">
             <meta-data
@@ -281,17 +290,4 @@
 
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET"
-        tools:ignore="ManifestOrder" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-        tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <!-- Muzei. -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
 </manifest>
diff --git a/app/src/main/java/com/wangdaye/mysplash/Mysplash.java b/app/src/main/java/com/wangdaye/mysplash/Mysplash.java
@@ -5,12 +5,12 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringDef;
-import android.support.v7.app.AppCompatDelegate;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringDef;
+import androidx.appcompat.app.AppCompatDelegate;
 import android.text.TextUtils;
 
 import com.wangdaye.mysplash.common.basic.activity.LoadableActivity;
@@ -21,7 +21,6 @@
 import com.wangdaye.mysplash.common.utils.manager.CustomApiManager;
 import com.wangdaye.mysplash.common.utils.manager.SettingsOptionManager;
 import com.wangdaye.mysplash.common.utils.manager.ThemeManager;
-import com.wangdaye.mysplash.main.view.activity.MainActivity;
 import com.wangdaye.mysplash.photo3.view.activity.PhotoActivity3;
 
 import java.lang.reflect.ParameterizedType;
@@ -208,18 +207,6 @@ public MysplashActivity getTopActivity() {
         }
     }
 
-    @Nullable
-    public MainActivity getMainActivity() {
-        if (activityList != null && activityList.size() > 0) {
-            for (int i = 0; i < activityList.size(); i ++) {
-                if (activityList.get(i) instanceof MainActivity) {
-                    return (MainActivity) activityList.get(i);
-                }
-            }
-        }
-        return null;
-    }
-
     public int getActivityCount() {
         if (activityList != null) {
             return activityList.size();
@@ -244,15 +231,15 @@ public List<Photo> loadMorePhotos(PhotoActivity3 activity,
         if (index > -1) {
             Activity a = activityList.get(index);
             if (a instanceof LoadableActivity) {
-                if (((ParameterizedType) a.getClass().getGenericSuperclass())
-                        .getActualTypeArguments()[0]
-                        .toString()
-                        .equals(Photo.class.toString())) {
-                    try {
+                try {
+                    if (((ParameterizedType) a.getClass().getGenericSuperclass())
+                            .getActualTypeArguments()[0]
+                            .toString()
+                            .equals(Photo.class.toString())) {
                         return ((LoadableActivity) a).loadMoreData(list, headIndex, headDirection, bundle);
-                    } catch (Exception ignore) {
-
                     }
+                } catch (Exception ignored) {
+                    // do nothing.
                 }
             }
         }
@@ -264,15 +251,15 @@ public void dispatchPhotoUpdate(PhotoActivity3 activity, Photo p) {
         if (index > -1) {
             Activity a = activityList.get(index);
             if (a instanceof LoadableActivity) {
-                if (((ParameterizedType) a.getClass().getGenericSuperclass())
-                        .getActualTypeArguments()[0]
-                        .toString()
-                        .equals(Photo.class.toString())) {
-                    try {
+                try {
+                    if (((ParameterizedType) a.getClass().getGenericSuperclass())
+                            .getActualTypeArguments()[0]
+                            .toString()
+                            .equals(Photo.class.toString())) {
                         ((LoadableActivity) a).receiveUpdate(p);
-                    } catch (Exception ignore) {
-
                     }
+                } catch (Exception ignore) {
+                    // do nothing.
                 }
             }
         }
@@ -283,15 +270,15 @@ public void dispatchPhotoUpdate(LoadableActivity<Photo> activity, Photo p) {
         if (index < activityList.size()) {
             Activity a = activityList.get(index);
             if (a instanceof RequestLoadActivity) {
-                if (((ParameterizedType) a.getClass().getGenericSuperclass())
-                        .getActualTypeArguments()[0]
-                        .toString()
-                        .equals(Photo.class.toString())) {
-                    try {
+                try {
+                    if (((ParameterizedType) a.getClass().getGenericSuperclass())
+                            .getActualTypeArguments()[0]
+                            .toString()
+                            .equals(Photo.class.toString())) {
                         ((RequestLoadActivity) a).receiveUpdate(p);
-                    } catch (Exception ignore) {
-
                     }
+                } catch (Exception ignore) {
+                    // do nothing.
                 }
             }
         }
@@ -306,8 +293,8 @@ public void finishSameActivity(Class c) {
     }
 
     public void dispatchRecreate() {
-        for (Activity a : activityList) {
-            a.recreate();
+        for (int i = activityList.size() - 1; i >= 0; i --) {
+            activityList.get(i).recreate();
         }
     }
 }
diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/activity/AboutActivity.java b/app/src/main/java/com/wangdaye/mysplash/about/view/activity/AboutActivity.java
@@ -1,16 +1,15 @@
 package com.wangdaye.mysplash.about.view.activity;
 
 import android.os.Bundle;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.wangdaye.mysplash.R;
 import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.ui.adapter.AboutAdapter;
 import com.wangdaye.mysplash.common.ui.widget.coordinatorView.StatusBarView;
 import com.wangdaye.mysplash.common.ui.widget.SwipeBackCoordinatorLayout;
-import com.wangdaye.mysplash.common.utils.manager.ThemeManager;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -76,13 +75,12 @@ public CoordinatorLayout getSnackbarContainer() {
     }
 
     private void initWidget() {
-        SwipeBackCoordinatorLayout swipeBackView = ButterKnife.findById(
-                this, R.id.activity_about_swipeBackView);
+        SwipeBackCoordinatorLayout swipeBackView = findViewById(R.id.activity_about_swipeBackView);
         swipeBackView.setOnSwipeListener(this);
 
         recyclerView.setAdapter(new AboutAdapter(this));
         recyclerView.setLayoutManager(
-                new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+                new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
     }
 
     // interface.

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/AppHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/AppHolder.java
@@ -1,6 +1,6 @@
 package com.wangdaye.mysplash.about.view.holder;
 
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/HeaderHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/HeaderHolder.java
@@ -1,6 +1,6 @@
 package com.wangdaye.mysplash.about.view.holder;
 
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/com/wangdaye/mysplash/about/view/holder/TranslatorHolder.java b/app/src/main/java/com/wangdaye/mysplash/about/view/holder/TranslatorHolder.java
@@ -1,6 +1,6 @@
 package com.wangdaye.mysplash.about.view.holder;
 
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/com/wangdaye/mysplash/collection/model/widget/LoadObject.java b/app/src/main/java/com/wangdaye/mysplash/collection/model/widget/LoadObject.java
@@ -1,6 +1,6 @@
 package com.wangdaye.mysplash.collection.model.widget;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.wangdaye.mysplash.common.basic.activity.MysplashActivity;
 import com.wangdaye.mysplash.common.i.model.LoadModel;