update to 1.5

linesoft2 · Mar 31, 2021 · d7f0a73 · d7f0a73
1 parent 26fd7e8
commit d7f0a73
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 25 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
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 "top.linesoft.open2share"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 5
-        versionName '1.4'
+        versionCode 6
+        versionName '1.5'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -26,10 +26,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference:1.1.1'
     //implementation 'com.blankj:utilcodex:1.29.0'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,8 @@
             android:name="hide_icon">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
+<!--                为了使图标从桌面隐藏-->
                 <data
                     android:host="linesoft_abc"
                     android:scheme="top.linesoft.open2share.abc" />
@@ -52,9 +54,7 @@
                 android:label="@string/convert_text"
                 tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>

diff --git a/app/src/main/java/top/linesoft/open2share/ReceiveOpenActivity.java b/app/src/main/java/top/linesoft/open2share/ReceiveOpenActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.StrictMode;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -26,9 +25,12 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
-        StrictMode.setVmPolicy(builder.build());
-        builder.detectFileUriExposure();
+
+        //解决极少数旧App未使用URI分享会导致报错的问题
+        //目前来看这类应用极少，先注释掉了
+//        StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
+//        StrictMode.setVmPolicy(builder.build());
+//        builder.detectFileUriExposure();
 
         setContentView(R.layout.activity_receive_open);
         //Toast.makeText(this,"已经将打开文件转换为分享文件",Toast.LENGTH_LONG).show();

diff --git a/app/src/main/java/top/linesoft/open2share/SettingsActivity.java b/app/src/main/java/top/linesoft/open2share/SettingsActivity.java
@@ -36,12 +36,6 @@ public static class SettingsFragment extends PreferenceFragmentCompat implements
         SwitchPreference hidePreference;
         Preference aboutPreference;
 
-        /**
-         * Called when a preference has been clicked.
-         *
-         * @param preference The preference that was clicked
-         * @return {@code true} if the click was handled
-         */
         @Override
         public boolean onPreferenceClick(Preference preference) {
             if (preference == guidePreference){

diff --git a/app/src/main/open2share_icon-playstore.png b/app/src/main/open2share_icon-playstore.png
diff --git a/app/src/main/res/mipmap-anydpi-v26/open2share_icon.xml b/app/src/main/res/mipmap-anydpi-v26/open2share_icon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/open2share_icon_background"/>
+    <background android:drawable="@color/open2share_icon_background"/>
     <foreground android:drawable="@drawable/open2share_icon_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/open2share_icon_round.xml b/app/src/main/res/mipmap-anydpi-v26/open2share_icon_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/open2share_icon_background"/>
+    <background android:drawable="@color/open2share_icon_background"/>
     <foreground android:drawable="@drawable/open2share_icon_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/open2share_icon.png b/app/src/main/res/mipmap-hdpi/open2share_icon.png
diff --git a/app/src/main/res/mipmap-hdpi/open2share_icon_round.png b/app/src/main/res/mipmap-hdpi/open2share_icon_round.png
diff --git a/app/src/main/res/mipmap-mdpi/open2share_icon.png b/app/src/main/res/mipmap-mdpi/open2share_icon.png
diff --git a/app/src/main/res/mipmap-mdpi/open2share_icon_round.png b/app/src/main/res/mipmap-mdpi/open2share_icon_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/open2share_icon.png b/app/src/main/res/mipmap-xhdpi/open2share_icon.png
diff --git a/app/src/main/res/mipmap-xhdpi/open2share_icon_round.png b/app/src/main/res/mipmap-xhdpi/open2share_icon_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/open2share_icon.png b/app/src/main/res/mipmap-xxhdpi/open2share_icon.png
diff --git a/app/src/main/res/mipmap-xxhdpi/open2share_icon_round.png b/app/src/main/res/mipmap-xxhdpi/open2share_icon_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/open2share_icon.png b/app/src/main/res/mipmap-xxxhdpi/open2share_icon.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/open2share_icon_round.png b/app/src/main/res/mipmap-xxxhdpi/open2share_icon_round.png
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -3,7 +3,6 @@
     <string name="app_name">open2share</string>
     <string name="convert_text">Convert to share</string>
     <string name="guide">Usage</string>
-    <string name="hide_describe">After hiding, you may have to uninstall and reload to display the icon again.</string>
     <string name="hide">hide icon from launcher</string>
     <string name="about">about</string>
     <string name="about_title">about \"open2share\"</string>
@@ -13,7 +12,7 @@
     <string name="warn">WARN</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="hide_tips">1. In some systems, hiding the desktop icon will cause this page to be closed, and it will be difficult for you to enter this page again. \n2. Some systems do not support this function. Do you want to continue?</string>
+    <string name="hide_tips">1.After hiding, you may have to uninstall and reload to display the icon again.\n2. In some systems, hiding the desktop icon will cause this page to be closed, and it will be difficult for you to enter this page again. \n3. Some systems do not support this function. Do you want to continue?</string>
     <string name="about_dialogue_title">about</string>
     <string name="about_dialogue_msg">Author: 双霖(LineSoft)</string>
     <string name="ok">OK</string>

diff --git a/app/src/main/res/values/open2share_icon_background.xml b/app/src/main/res/values/open2share_icon_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="open2share_icon_background">#2962FF</color>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,7 +2,6 @@
     <string name="app_name">open2share</string>
     <string name="convert_text">转换为分享文件</string>
     <string name="guide">使用说明</string>
-    <string name="hide_describe">隐藏后，您可能只能通过卸载重装才能再次显示图标。</string>
     <string name="hide">隐藏桌面图标</string>
     <string name="about">关于</string>
     <string name="about_title">关于“open2share”</string>
@@ -12,7 +11,7 @@
     <string name="warn">警告：</string>
     <string name="yes">是</string>
     <string name="no">否</string>
-    <string name="hide_tips">1.在部分系统下，隐藏桌面图标会导致本页面被关闭，您将很难再次进入到本页面.\n2.部分系统不支持该功能. 是否继续？</string>
+    <string name="hide_tips">1.隐藏后，您可能只能通过卸载重装才能再次显示图标。 2.在部分系统下，隐藏桌面图标会导致本页面被关闭，您将很难再次进入到本页面。 3.部分系统不支持该功能，隐藏后桌面仍会显示图标。 是否继续？</string>
     <string name="about_dialogue_title">关于本软件</string>
     <string name="about_dialogue_msg">作者：双霖(LineSoft)</string>
     <string name="ok">确定</string>

diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
@@ -18,7 +18,6 @@
         android:defaultValue="false"
         android:icon="@drawable/ic_baseline_restore_from_trash_24"
         android:key="hide_icon"
-        android:summary="@string/hide_describe"
         android:title="@string/hide" />
     <PreferenceCategory android:title="@string/about">
         <Preference

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files