From cce3afdf1c6a973f5b55fbf8b37c371ceedd1e3d Mon Sep 17 00:00:00 2001 From: ZaneYork Date: Wed, 5 Aug 2020 16:45:42 +0800 Subject: [PATCH] 1.Layout adjust --- app/src/main/AndroidManifest.xml | 4 +- app/src/main/assets/privacy_policy.txt | 6 +-- app/src/main/assets/privacy_policy.txt.in | 6 +-- app/src/main/assets/privacy_policy.txt.th | 6 +-- app/src/main/assets/privacy_policy.txt.zh | 6 +-- .../com/zane/smapiinstaller/MainActivity.java | 2 +- .../smapiinstaller/constant/Constants.java | 4 ++ .../ui/about/AboutFragment.java | 4 +- app/src/main/res/layout/fragment_about.xml | 50 +++++++++---------- app/src/main/res/layout/fragment_main.xml | 8 +-- app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/styles.xml | 4 ++ 12 files changed, 57 insertions(+), 44 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 46ff162..99572c7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -19,7 +20,8 @@ android:supportsRtl="true" android:configChanges="orientation|keyboard|screenSize" android:networkSecurityConfig="@xml/network_security_config" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + tools:ignore="UnusedAttribute"> The only official channel for distribution of this app are:
-* Google Play Store -
* Coolapk
-* Github +* GitHub +
+* Google Play Store
Any other mode of distribution is not official and thus, is not maintained by the developer.
diff --git a/app/src/main/assets/privacy_policy.txt.in b/app/src/main/assets/privacy_policy.txt.in index 24988bf..3ae1a05 100644 --- a/app/src/main/assets/privacy_policy.txt.in +++ b/app/src/main/assets/privacy_policy.txt.in @@ -28,11 +28,11 @@ Layanan ini tidak membahas siapa pun yang berusia di bawah 16 tahun. Saya tidak
Satu-satunya saluran resmi untuk distribusi aplikasi ini adalah:
-* Google Play Store -
* Coolapk
-* Github +* GitHub +
+* Google Play Store
Mode distribusi lainnya tidak resmi dan tidak dikelola oleh pengembang.
diff --git a/app/src/main/assets/privacy_policy.txt.th b/app/src/main/assets/privacy_policy.txt.th index 1a35c88..95f7370 100644 --- a/app/src/main/assets/privacy_policy.txt.th +++ b/app/src/main/assets/privacy_policy.txt.th @@ -28,11 +28,11 @@ Zane York เป็นผู้พัฒนา SMAPI Installer app. แอพล
ช่องทางการเผยแพร่แอพลิเคชั่นนี้อย่างเป็นทางการ ได้แก่:
-* Google Play Store -
* Coolapk
-* Github +* GitHub +
+* Google Play Store
แอพลิเคชั่นที่ถูกเผยแพร่ในแหล่งอื่นนอกจากช่องทางเหล่านี้ จะไม่ได้รับการดูแลจากผู้พัฒนา
diff --git a/app/src/main/assets/privacy_policy.txt.zh b/app/src/main/assets/privacy_policy.txt.zh index 0f02714..b60f1b5 100644 --- a/app/src/main/assets/privacy_policy.txt.zh +++ b/app/src/main/assets/privacy_policy.txt.zh @@ -28,11 +28,11 @@
分发此应用程序的唯一官方渠道是：
-* Google Play商店 -
* 酷安
-* Github +* GitHub +
+* Google Play Store
任何其他分发方式都可能不是开发者官方维护的。
diff --git a/app/src/main/java/com/zane/smapiinstaller/MainActivity.java b/app/src/main/java/com/zane/smapiinstaller/MainActivity.java index dffd465..e5af1ef 100644 --- a/app/src/main/java/com/zane/smapiinstaller/MainActivity.java +++ b/app/src/main/java/com/zane/smapiinstaller/MainActivity.java @@ -169,7 +169,7 @@ public class MainActivity extends AppCompatActivity { DialogUtils.showConfirmDialog(toolbar, R.string.settings_check_for_updates, MainActivity.this.getString(R.string.app_update_detected, dto.getVersionName()), (dialog, which) -> { if (which == DialogAction.POSITIVE) { - CommonLogic.openInPlayStore(MainActivity.this); + CommonLogic.openUrl(MainActivity.this, Constants.RELEASE_URL); } else { ConfigUtils.saveConfig(application, appConfig); } diff --git a/app/src/main/java/com/zane/smapiinstaller/constant/Constants.java b/app/src/main/java/com/zane/smapiinstaller/constant/Constants.java index c28ac4f..755367a 100644 --- a/app/src/main/java/com/zane/smapiinstaller/constant/Constants.java +++ b/app/src/main/java/com/zane/smapiinstaller/constant/Constants.java @@ -30,6 +30,10 @@ public class Constants { * DLC下载路径 */ public static final String DLC_LIST_UPDATE_URL = "http://dl.zaneyork.cn/smapi/downloadable_content_list.json"; + /** + * 软件发布页 + */ + public static final String RELEASE_URL = "https://github.com/ZaneYork/SMAPI-Android-Installer/releases"; /** * 帮助内容下载路径 */ diff --git a/app/src/main/java/com/zane/smapiinstaller/ui/about/AboutFragment.java b/app/src/main/java/com/zane/smapiinstaller/ui/about/AboutFragment.java index 93341a8..d81980b 100644 --- a/app/src/main/java/com/zane/smapiinstaller/ui/about/AboutFragment.java +++ b/app/src/main/java/com/zane/smapiinstaller/ui/about/AboutFragment.java @@ -40,10 +40,10 @@ public class AboutFragment extends Fragment { @OnClick(R.id.button_release) void release() { - CommonLogic.doOnNonNull(this.getContext(), (context) -> CommonLogic.openUrl(context, "https://github.com/ZaneYork/SMAPI-Android-Installer/releases")); + CommonLogic.doOnNonNull(this.getContext(), (context) -> CommonLogic.openUrl(context, Constants.RELEASE_URL)); } - @OnClick(R.id.button_gplay) +// @OnClick(R.id.button_gplay) void gplay() { CommonLogic.openInPlayStore(this.getActivity()); } diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index aeefb3f..e499505 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -70,33 +70,33 @@ app:srcCompat="@drawable/global" /> - + + + -