Upgrade CommonUtils

devgianlu · Oct 18, 2023 · 8f3d8b9 · 8f3d8b9
1 parent 30eb44c
commit 8f3d8b9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/CommonUtils b/CommonUtils
diff --git a/app/src/main/java/com/gianlu/pretendyourexyzzy/ThisApplication.java b/app/src/main/java/com/gianlu/pretendyourexyzzy/ThisApplication.java
@@ -1,5 +1,7 @@
 package com.gianlu.pretendyourexyzzy;
 
+import androidx.annotation.Nullable;
+
 import com.bumptech.glide.Glide;
 import com.gianlu.commonutils.analytics.AnalyticsApplication;
 import com.gianlu.commonutils.preferences.CommonPK;
@@ -22,6 +24,12 @@ protected boolean isDebug() {
         return BuildConfig.DEBUG;
     }
 
+    @Nullable
+    @Override
+    protected String getGithubProjectName() {
+        return "PretendYoureXyzzyAndroid";
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();

diff --git a/app/src/main/java/com/gianlu/pretendyourexyzzy/api/Pyx.java b/app/src/main/java/com/gianlu/pretendyourexyzzy/api/Pyx.java
@@ -428,7 +428,7 @@ public interface OnPollingPyxErrorListener {
     public static class NoServersException extends Exception {
 
         public void solve(@NonNull Context context) {
-            OfflineActivity.startActivity(context, null);
+            OfflineActivity.startActivity(context, "PretendYoureXyzzyAndroid",null);
         }
     }
 

diff --git a/app/src/main/java/com/gianlu/pretendyourexyzzy/main/NewSettingsFragment.java b/app/src/main/java/com/gianlu/pretendyourexyzzy/main/NewSettingsFragment.java
@@ -335,7 +335,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
             binding.settingsApp.setSubtitle(R.string.devgianluCopyright, Calendar.getInstance().get(Calendar.YEAR));
             binding.settingsVersion.setSubtitle(getVersion());
             binding.settingsDeveloper.setOnClickListener((v) -> openLink("https://gianlu.xyz"));
-            binding.settingsEmailMe.setOnClickListener((v) -> LogsHelper.sendEmail(requireContext(), null));
             binding.settingsOpenSource.setOnClickListener((v) -> openLink("https://github.com/devgianlu/PretendYoureXyzzyAndroid"));
             binding.settingsTranslators.setOnClickListener((v) -> replaceFragment(Page.TRANSLATORS));
 
@@ -353,7 +352,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
             });
             binding.settingsDonate.setOnClickListener(v -> donate());
 
-            binding.settingsSendLogs.setOnClickListener(v -> LogsHelper.sendEmail(requireContext(), null));
+            binding.settingsOpenIssue.setOnClickListener(v -> LogsHelper.openGithubIssue(requireContext(), "PretendYoureXyzzyAndroid", null));
             binding.settingsExportLogs.setOnClickListener(v -> {
                 Intent shareIntent = new Intent(Intent.ACTION_SEND);
                 Exception logsException = LogsHelper.exportLogFiles(requireContext(), shareIntent);

diff --git a/app/src/main/res/layout/fragment_new_main_settings.xml b/app/src/main/res/layout/fragment_new_main_settings.xml
@@ -58,15 +58,6 @@
             app:subtitle="@string/devgianlu"
             app:title="@string/prefs_developer" />
 
-        <com.gianlu.pretendyourexyzzy.PreferenceItemView
-            android:id="@+id/settings_emailMe"
-            style="@style/TextAppearance.PreferencesItem"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/baseline_email_24"
-            app:subtitle="@string/devgianluEmail"
-            app:title="@string/emailMe" />
-
         <com.gianlu.pretendyourexyzzy.PreferenceItemView
             android:id="@+id/settings_openSource"
             style="@style/TextAppearance.PreferencesItem"
@@ -137,12 +128,12 @@
             android:text="@string/logs" />
 
         <com.gianlu.pretendyourexyzzy.PreferenceItemView
-            android:id="@+id/settings_sendLogs"
+            android:id="@+id/settings_openIssue"
             style="@style/TextAppearance.PreferencesItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@drawable/baseline_email_24"
-            app:title="@string/send_email" />
+            app:icon="@drawable/baseline_bug_report_24"
+            app:title="@string/openIssue" />
 
         <com.gianlu.pretendyourexyzzy.PreferenceItemView
             android:id="@+id/settings_exportLogs"
+1 −1		README.md
+1 −1		build.gradle
+6 −7		utils/build.gradle
+5 −1		utils/src/main/java/com/gianlu/commonutils/analytics/BaseCommonApplication.java
+10 −3		utils/src/main/java/com/gianlu/commonutils/analytics/UncaughtExceptionActivity.java
+16 −23		utils/src/main/java/com/gianlu/commonutils/logs/LogsHelper.java
+31 −44		utils/src/main/java/com/gianlu/commonutils/permissions/AskPermission.java
+19 −12		utils/src/main/java/com/gianlu/commonutils/preferences/BasePreferenceActivity.java
+10 −3		utils/src/main/java/com/gianlu/commonutils/ui/OfflineActivity.java
+4 −3		utils/src/main/res/layout/activity_offline.xml
+4 −3		utils/src/main/res/layout/activity_unchaught_exception.xml
+0 −4		utils/src/main/res/values-pt-rBR/strings.xml
+0 −4		utils/src/main/res/values-tr-rTR/strings.xml
+0 −4		utils/src/main/res/values-zh-rCN/strings.xml
+2 −5		utils/src/main/res/values/strings.xml