3.3.4

WangDaYeeeeee · May 18, 2018 · a307d32 · a307d32
1 parent 0794494
commit a307d32
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 52 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.wangdaye.mysplash"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 333
-        versionName "3.3.3"
+        versionCode 334
+        versionName "3.3.4"
     }
     sourceSets {
         main {
@@ -38,13 +38,9 @@ android {
             debuggable false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
-            applicationVariants.all { variant ->
-                variant.outputs.each { output ->
-                    def outputFile = output.outputFile
-                    if (outputFile != null && outputFile.name.endsWith('.apk')) {
-                        def fileName = "Mysplash ${defaultConfig.versionName}.apk"
-                        output.outputFile = new File(outputFile.parent, fileName)
-                    }
+            android.applicationVariants.all { variant ->
+                variant.outputs.all {
+                    outputFileName = "Mysplash ${variant.versionName}.apk"
                 }
             }
         }
@@ -83,7 +79,7 @@ greendao {
     generateTests false
 }
 dependencies {
-    compile 'org.greenrobot:greendao:3.2.0'
+    implementation 'org.greenrobot:greendao:3.2.0'
 }
 
 allprojects {
@@ -99,26 +95,26 @@ allprojects {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
 
-    compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'com.android.support:cardview-v7:27.1.1'
-    compile 'com.android.support:design:27.1.1'
-    compile 'com.android.support:support-v4:27.1.1'
-    compile 'com.android.support:customtabs:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:customtabs:27.1.1'
 
-    compile 'com.squareup.retrofit2:retrofit:2.4.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.4.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
 
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
+    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
 
-    compile 'com.jakewharton:butterknife:8.5.1'
+    implementation 'com.jakewharton:butterknife:8.5.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
 
-    compile 'com.github.rahatarmanahmed:circularprogressview:2.5.0'
-    compile 'com.pacioianu.david:ink-page-indicator:1.2.0'
-    compile 'org.greenrobot:greendao:3.2.0'
-    compile 'com.google.android.apps.muzei:muzei-api:2.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:2.0'
 }
diff --git a/app/release/output.json b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":334,"versionName":"3.3.4","enabled":true,"outputFile":"release-3.3.4.apk","fullName":"release","baseName":"release"},"path":"release-3.3.4.apk","properties":{}}]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
         android:name=".Mysplash"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:theme="@style/MysplashTheme_light"
         android:supportsRtl="true"
@@ -20,6 +19,7 @@
             android:name=".main.view.activity.MainActivity"
             android:theme="@style/MysplashTheme_light.TranslucentNavigation.Main"
             android:launchMode="singleTask"
+            android:screenOrientation="user"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -33,36 +33,43 @@
 
         <activity android:name=".search.view.activity.SearchActivity"
             android:theme="@style/MysplashTheme_light.Common"
+            android:screenOrientation="user"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
             android:name=".main.view.activity.NotificationActivity"
             android:theme="@style/MysplashTheme_light.Common"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity
             android:name=".photo2.view.activity.PhotoActivity2"
             android:theme="@style/MysplashTheme_light.TranslucentNavigation.Photo2"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity
             android:name=".common.ui.activity.PreviewActivity"
             android:theme="@style/MysplashTheme_light.Translucent.TranslucentNavigation"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity
             android:name=".collection.view.activity.CollectionActivity"
             android:theme="@style/MysplashTheme_light.TranslucentNavigation.Collection"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity
             android:name=".user.view.activity.UserActivity"
             android:theme="@style/MysplashTheme_light.TranslucentNavigation.User"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity android:name=".common.ui.activity.LoginActivity"
             android:theme="@style/MysplashTheme_light.Translucent.Common"
+            android:screenOrientation="user"
             android:label="@string/app_name"
             android:launchMode="singleInstance">
             <intent-filter>
@@ -78,6 +85,7 @@
         <activity
             android:name=".me.view.activity.MeActivity"
             android:theme="@style/MysplashTheme_light.TranslucentNavigation.Me"
+            android:screenOrientation="user"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="com.wangdaye.mysplash.Me" />
@@ -87,16 +95,19 @@
 
         <activity
             android:name=".me.view.activity.MyFollowActivity"
-        android:theme="@style/MysplashTheme_light.Translucent.Common"
-        android:label="@string/app_name" />
+            android:theme="@style/MysplashTheme_light.Translucent.Common"
+            android:screenOrientation="user"
+            android:label="@string/app_name" />
 
         <activity android:name=".common.ui.activity.UpdateMeActivity"
             android:theme="@style/MysplashTheme_light.Translucent.Common"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity
             android:name=".common.ui.activity.DownloadManageActivity"
             android:theme="@style/MysplashTheme_light.Common"
+            android:screenOrientation="user"
             android:launchMode="singleTask"
             android:label="@string/app_name">
             <intent-filter>
@@ -108,24 +119,29 @@
         <activity
             android:name=".common.ui.activity.SettingsActivity"
             android:theme="@style/MysplashTheme_light.Translucent.Settings"
+            android:screenOrientation="user"
             android:label="@string/action_settings" />
 
         <activity
             android:name=".about.view.activity.AboutActivity"
             android:theme="@style/MysplashTheme_light.Translucent.Common"
+            android:screenOrientation="user"
             android:label="@string/action_about"/>
 
         <activity
             android:name=".common.ui.activity.IntroduceActivity"
             android:theme="@style/MysplashTheme_light.Translucent.Common"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity android:name=".common.ui.activity.CustomApiActivity"
             android:theme="@style/MysplashTheme_light.Translucent.Common"
+            android:screenOrientation="user"
             android:label="@string/app_name" />
 
         <activity android:name=".common.ui.activity.SetWallpaperActivity"
             android:theme="@style/MysplashTheme_dark.SetWallpaper"
+            android:screenOrientation="user"
             android:launchMode="singleInstance"
             android:label="@string/app_name">
             <intent-filter>
@@ -139,6 +155,7 @@
         <activity
             android:name=".common.ui.activity.MuzeiConfigurationActivity"
             android:theme="@style/MysplashTheme_light.Translucent.Common"
+            android:screenOrientation="user"
             android:label="@string/action_muzei_settings"
             android:launchMode="singleTask"
             android:exported="true"

diff --git a/app/src/main/java/com/wangdaye/mysplash/common/utils/manager/AuthManager.java b/app/src/main/java/com/wangdaye/mysplash/common/utils/manager/AuthManager.java
@@ -120,10 +120,8 @@ private AuthManager() {
 
     private void updateVersion(SharedPreferences sharedPreferences) {
         int versionNow = sharedPreferences.getInt(KEY_VERSION, 0);
-        String token = sharedPreferences.getString(KEY_ACCESS_TOKEN, null);
-
-        if ((versionNow < VERSION_CODE) && !TextUtils.isEmpty(token)) {
 
+        if (versionNow < VERSION_CODE) {
             SharedPreferences.Editor editor = sharedPreferences.edit();
             editor.putInt(KEY_VERSION, VERSION_CODE);
             editor.putString(KEY_ACCESS_TOKEN, null);

diff --git a/app/src/main/java/com/wangdaye/mysplash/main/view/activity/MainActivity.java b/app/src/main/java/com/wangdaye/mysplash/main/view/activity/MainActivity.java
@@ -567,7 +567,7 @@ public void onDownload(Photo photo) {
     @SuppressLint("SetTextI18n")
     @Override
     public void onWriteAccessToken() {
-        nav.getMenu().getItem(1).setVisible(true);
+        // nav.getMenu().getItem(1).setVisible(true);
         meManagePresenter.responseWriteAccessToken();
     }
 
@@ -584,7 +584,7 @@ public void onWriteAvatarPath() {
 
     @Override
     public void onLogout() {
-        nav.getMenu().getItem(1).setVisible(false);
+        // nav.getMenu().getItem(1).setVisible(false);
         meManagePresenter.responseLogout();
     }
 

diff --git a/app/src/main/java/com/wangdaye/mysplash/user/view/widget/UserProfileView.java b/app/src/main/java/com/wangdaye/mysplash/user/view/widget/UserProfileView.java
@@ -136,12 +136,14 @@ private void initView() {
 
         tagList.setLayoutManager(
                 new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
-
+/*
         if (AuthManager.getInstance().isAuthorized()) {
             rippleButton.setOnSwitchListener(this);
         } else {
             rippleButton.setVisibility(GONE);
         }
+*/
+        rippleButton.setVisibility(GONE);
 
         DisplayUtils.setTypeface(getContext(), locationTxt);
         DisplayUtils.setTypeface(getContext(), bioTxt);

diff --git a/app/src/main/res/resource/values/strings.xml b/app/src/main/res/resource/values/strings.xml
@@ -4,7 +4,7 @@
     <!-- application. -->
     <string name="app_name">Mysplash</string>
     <string name="powered">Powered by Unsplash.com</string>
-    <string name="version_code">3.3.3</string>
+    <string name="version_code">3.3.4</string>
 
     <!-- key words. -->
     <string name="about_app">ABOUT APP</string>

diff --git a/build.gradle b/build.gradle
@@ -3,12 +3,15 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.2'
+        // classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.jakewharton:butterknife-gradle-plugin:8.5.1'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
 
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -17,6 +20,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
         maven {
             url 'https://maven.google.com'
         }

diff --git a/gradle.properties b/gradle.properties
@@ -13,21 +13,16 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Mon Jul 18 19:58:56 CST 2016
-systemProp.http.proxyHost=127.0.0.1
-systemProp.http.proxyPort=1080
 
-systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=1080
+APP_ID_BETA = "41f1f23556b01d63b1ae823bdf008cc32ce446f77c843e2daa2a80c770015df3";
+SECRET_BETA = "dec952db51b50babd1ba55e26b7dbbd596ae03554a59c0055864826f7565c94e";
 
-APP_ID_BETA = "7bf112dfe38b71025468053af65c1f8ebe7a7ecf286eddb86c3131deb64b2ac4";
-SECRET_BETA = "bc149f8b667347f502b9d10b9b48b092547a7e17762237c8f3a53b1897e6101b";
+APP_ID_RELEASE="7a96a77d719e9967f935da53784d6a3eb58a4fb174dda25e89ec69059e46c815";
+SECRET_RELEASE="dd766f4ee6e01599ca6db2e97c306a883a024f7322f92d4f7ab4aeae3be7924e";
 
-APP_ID_RELEASE="41f1f23556b01d63b1ae823bdf008cc32ce446f77c843e2daa2a80c770015df3";
-SECRET_RELEASE="dec952db51b50babd1ba55e26b7dbbd596ae03554a59c0055864826f7565c94e";
+FEED_TOKEN = "39fe9fe57da901c9f654b7b7b4dab047568e4412d41b3bbb5f96c61f28632a12";
 
-FEED_TOKEN = "XXX";
+APP_ID_RELEASE_UNAUTH="7a96a77d719e9967f935da53784d6a3eb58a4fb174dda25e89ec69059e46c815";
 
-APP_ID_RELEASE_UNAUTH="41f1f23556b01d63b1ae823bdf008cc32ce446f77c843e2daa2a80c770015df3";
-
-GET_STREAM_KEY="XXX";
-GET_STREAM_AUTH_CODE="XXX";
+GET_STREAM_KEY="ava9r3mbqgqt";
+GET_STREAM_AUTH_CODE="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyZXNvdXJjZSI6IioiLCJhY3Rpb24iOiIqIiwiZmVlZF9pZCI6Im5vdGlmaWNhdGlvbjMwMDAxNCJ9.omzfnsa0sbnBnHfRvFu5_EMAM3abkZ5Viesl7h-MoWc";
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 26 16:51:17 CST 2017
+#Sun May 13 19:39:41 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/release/Mysplash 3.3.4.apk b/release/Mysplash 3.3.4.apk