Merge pull request #10 from mouyase/dev

Dev
mouyase · Nov 5, 2019 · 43e411a · 43e411a
2 parents 335356c + dd8ee16
commit 43e411a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "tech.yojigen.pivisionm"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 443006
-        versionName '4.4.3(443006)'
+        versionCode 443008
+        versionName '4.4.3(443008)'
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
     }
@@ -60,7 +60,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-
+    implementation 'com.android.support:multidex:1.0.3'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,9 +15,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:targetApi="n">
+        tools:targetApi="q">
         <activity
             android:name="com.reiya.pixiv.other.SplashActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -136,7 +137,6 @@
         <activity
             android:name="com.tencent.bugly.beta.ui.BetaActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|locale"
-            android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent" />
         <provider
             android:name="androidx.core.content.FileProvider"

diff --git a/app/src/main/java/com/reiya/pixiv/base/BaseApplication.java b/app/src/main/java/com/reiya/pixiv/base/BaseApplication.java
@@ -14,12 +14,14 @@
 import android.widget.Toast;
 
 import androidx.fragment.app.FragmentActivity;
+import androidx.multidex.MultiDex;
 
 import com.bumptech.glide.Glide;
 import com.reiya.pixiv.bean.Theme;
 import com.reiya.pixiv.bean.User;
 import com.reiya.pixiv.db.RecordDAO;
 import com.reiya.pixiv.dialog.LoginDialog;
+import com.reiya.pixiv.main.MainActivity;
 import com.reiya.pixiv.network.HttpClient;
 import com.reiya.pixiv.network.HttpService;
 import com.reiya.pixiv.network.NetworkRequest;
@@ -28,6 +30,7 @@
 import com.reiya.pixiv.util.StringHelper;
 import com.reiya.pixiv.util.UserData;
 import com.tencent.bugly.Bugly;
+import com.tencent.bugly.beta.Beta;
 
 import java.io.IOException;
 
@@ -48,6 +51,7 @@ public static BaseApplication getInstance() {
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
+        MultiDex.install(base);
     }
 
     public static long getTime(String name) {

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -99,7 +99,6 @@
     </style>
 
     <style name="Translucent" parent="AppTheme">
-
     </style>
 
     <style name="TranslucentNoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
@@ -110,9 +109,7 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="Splash" parent="AppTheme" android:windowIsTranslucent="false">
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowDisablePreview">true</item>
+    <style name="Splash" parent="AppTheme">
         <item name="android:windowBackground">@drawable/bg_splash</item>
     </style>
 
@@ -121,4 +118,4 @@
         <item name="android:windowBackground">@color/black_translucent</item>
         <item name="android:windowIsTranslucent">true</item>
     </style>
-</resources>
+</resources>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
     }
 }