Skip to content

Commit d7f0a73

Browse files
committed
update to 1.5
1 parent 26fd7e8 commit d7f0a73

25 files changed

+29
-25
lines changed

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "top.linesoft.open2share"
88
minSdkVersion 21
99
targetSdkVersion 30
10-
versionCode 5
11-
versionName '1.4'
10+
versionCode 6
11+
versionName '1.5'
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {
@@ -26,10 +26,10 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
implementation 'androidx.appcompat:appcompat:1.2.0'
29-
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
29+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3030
implementation 'androidx.preference:preference:1.1.1'
3131
//implementation 'com.blankj:utilcodex:1.29.0'
32-
testImplementation 'junit:junit:4.13'
32+
testImplementation 'junit:junit:4.13.2'
3333
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
3434
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3535
}

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
android:name="hide_icon">
3939
<intent-filter>
4040
<action android:name="android.intent.action.MAIN" />
41+
42+
<!-- 为了使图标从桌面隐藏-->
4143
<data
4244
android:host="linesoft_abc"
4345
android:scheme="top.linesoft.open2share.abc" />
@@ -52,9 +54,7 @@
5254
android:label="@string/convert_text"
5355
tools:ignore="AppLinkUrlError">
5456
<action android:name="android.intent.action.VIEW" />
55-
5657
<category android:name="android.intent.category.DEFAULT" />
57-
5858
<data android:mimeType="*/*" />
5959
</intent-filter>
6060
</activity>

app/src/main/java/top/linesoft/open2share/ReceiveOpenActivity.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.os.StrictMode;
65

76
import androidx.annotation.Nullable;
87
import androidx.appcompat.app.AppCompatActivity;
@@ -26,9 +25,12 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
2625
@Override
2726
protected void onCreate(Bundle savedInstanceState) {
2827
super.onCreate(savedInstanceState);
29-
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
30-
StrictMode.setVmPolicy(builder.build());
31-
builder.detectFileUriExposure();
28+
29+
//解决极少数旧App未使用URI分享会导致报错的问题
30+
//目前来看这类应用极少,先注释掉了
31+
// StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
32+
// StrictMode.setVmPolicy(builder.build());
33+
// builder.detectFileUriExposure();
3234

3335
setContentView(R.layout.activity_receive_open);
3436
//Toast.makeText(this,"已经将打开文件转换为分享文件",Toast.LENGTH_LONG).show();

app/src/main/java/top/linesoft/open2share/SettingsActivity.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ public static class SettingsFragment extends PreferenceFragmentCompat implements
3636
SwitchPreference hidePreference;
3737
Preference aboutPreference;
3838

39-
/**
40-
* Called when a preference has been clicked.
41-
*
42-
* @param preference The preference that was clicked
43-
* @return {@code true} if the click was handled
44-
*/
4539
@Override
4640
public boolean onPreferenceClick(Preference preference) {
4741
if (preference == guidePreference){
-44.6 KB
Loading
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/open2share_icon_background"/>
3+
<background android:drawable="@color/open2share_icon_background"/>
44
<foreground android:drawable="@drawable/open2share_icon_foreground"/>
55
</adaptive-icon>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/open2share_icon_background"/>
3+
<background android:drawable="@color/open2share_icon_background"/>
44
<foreground android:drawable="@drawable/open2share_icon_foreground"/>
55
</adaptive-icon>
-1.62 KB
Loading
Loading
-1007 Bytes
Loading
Loading
-2.33 KB
Loading
Loading
Loading
Loading
Loading
Loading

app/src/main/res/values-en/strings.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<string name="app_name">open2share</string>
44
<string name="convert_text">Convert to share</string>
55
<string name="guide">Usage</string>
6-
<string name="hide_describe">After hiding, you may have to uninstall and reload to display the icon again.</string>
76
<string name="hide">hide icon from launcher</string>
87
<string name="about">about</string>
98
<string name="about_title">about \"open2share\"</string>
@@ -13,7 +12,7 @@
1312
<string name="warn">WARN</string>
1413
<string name="yes">Yes</string>
1514
<string name="no">No</string>
16-
<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>
15+
<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>
1716
<string name="about_dialogue_title">about</string>
1817
<string name="about_dialogue_msg">Author: 双霖(LineSoft)</string>
1918
<string name="ok">OK</string>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="open2share_icon_background">#2962FF</color>
4+
</resources>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<string name="app_name">open2share</string>
33
<string name="convert_text">转换为分享文件</string>
44
<string name="guide">使用说明</string>
5-
<string name="hide_describe">隐藏后,您可能只能通过卸载重装才能再次显示图标。</string>
65
<string name="hide">隐藏桌面图标</string>
76
<string name="about">关于</string>
87
<string name="about_title">关于“open2share”</string>
@@ -12,7 +11,7 @@
1211
<string name="warn">警告:</string>
1312
<string name="yes">是</string>
1413
<string name="no">否</string>
15-
<string name="hide_tips">1.在部分系统下,隐藏桌面图标会导致本页面被关闭,您将很难再次进入到本页面.\n2.部分系统不支持该功能. 是否继续?</string>
14+
<string name="hide_tips">1.隐藏后,您可能只能通过卸载重装才能再次显示图标。 2.在部分系统下,隐藏桌面图标会导致本页面被关闭,您将很难再次进入到本页面。 3.部分系统不支持该功能,隐藏后桌面仍会显示图标。 是否继续?</string>
1615
<string name="about_dialogue_title">关于本软件</string>
1716
<string name="about_dialogue_msg">作者:双霖(LineSoft)</string>
1817
<string name="ok">确定</string>

app/src/main/res/xml/root_preferences.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
android:defaultValue="false"
1919
android:icon="@drawable/ic_baseline_restore_from_trash_24"
2020
android:key="hide_icon"
21-
android:summary="@string/hide_describe"
2221
android:title="@string/hide" />
2322
<PreferenceCategory android:title="@string/about">
2423
<Preference

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77

88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.0.1'
10+
classpath 'com.android.tools.build:gradle:4.1.3'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

0 commit comments

Comments
 (0)