From 7f36d7bbd0bb378b571f65154036fbbb271f5e65 Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Mon, 21 Jun 2021 04:59:11 +0500 Subject: [PATCH] Move ReportActivity to termux-shared so that other termux plugins can use it too --- app/src/main/AndroidManifest.xml | 2 +- .../com/termux/app/activities/SettingsActivity.java | 5 +++-- .../termux/app/terminal/TermuxTerminalViewClient.java | 6 +++--- app/src/main/java/com/termux/app/utils/CrashUtils.java | 6 +++--- .../main/java/com/termux/app/utils/PluginUtils.java | 6 +++--- app/src/main/res/values/strings.xml | 9 --------- app/src/main/res/values/styles.xml | 9 --------- .../com/termux/shared}/activities/ReportActivity.java | 6 +++--- .../java/com/termux/shared}/models/ReportInfo.java | 6 +++--- .../src/main/res/drawable/ic_copy.xml | 0 .../src/main/res/drawable/ic_error_notification.xml | 0 .../src/main/res/drawable/ic_share.xml | 0 .../src/main/res/layout/activity_report.xml | 0 .../res/layout/markdown_adapter_node_code_block.xml | 0 .../main/res/layout/markdown_adapter_node_default.xml | 0 .../src/main/res/layout/partial_toolbar.xml | 0 .../src/main/res/menu/menu_report.xml | 0 {app => termux-shared}/src/main/res/values/dimens.xml | 0 termux-shared/src/main/res/values/strings.xml | 7 +++++++ termux-shared/src/main/res/values/styles.xml | 10 ++++++++++ 20 files changed, 36 insertions(+), 36 deletions(-) rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/activities/ReportActivity.java (98%) rename {app/src/main/java/com/termux/app => termux-shared/src/main/java/com/termux/shared}/models/ReportInfo.java (90%) rename {app => termux-shared}/src/main/res/drawable/ic_copy.xml (100%) rename {app => termux-shared}/src/main/res/drawable/ic_error_notification.xml (100%) rename {app => termux-shared}/src/main/res/drawable/ic_share.xml (100%) rename {app => termux-shared}/src/main/res/layout/activity_report.xml (100%) rename {app => termux-shared}/src/main/res/layout/markdown_adapter_node_code_block.xml (100%) rename {app => termux-shared}/src/main/res/layout/markdown_adapter_node_default.xml (100%) rename {app => termux-shared}/src/main/res/layout/partial_toolbar.xml (100%) rename {app => termux-shared}/src/main/res/menu/menu_report.xml (100%) rename {app => termux-shared}/src/main/res/values/dimens.xml (100%) create mode 100644 termux-shared/src/main/res/values/styles.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ee6eae63..d2357492 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,7 +102,7 @@ android:theme="@style/Theme.AppCompat.Light.DarkActionBar" /> diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java index 3e3c23de..9c2015b8 100644 --- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java +++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java @@ -10,7 +10,8 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import com.termux.R; -import com.termux.app.models.ReportInfo; +import com.termux.shared.activities.ReportActivity; +import com.termux.shared.models.ReportInfo; import com.termux.app.models.UserAction; import com.termux.shared.interact.ShareUtils; import com.termux.shared.packages.PackageUtils; @@ -84,7 +85,7 @@ public class SettingsActivity extends AppCompatActivity { aboutString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context)); aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context)); - ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT, TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false)); + ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT.getName(), TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false)); } }.start(); diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java index 99f2d8ef..41574ce0 100644 --- a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java +++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java @@ -24,8 +24,8 @@ import com.termux.app.TermuxActivity; import com.termux.shared.shell.ShellUtils; import com.termux.shared.terminal.TermuxTerminalViewClientBase; import com.termux.shared.termux.TermuxConstants; -import com.termux.app.activities.ReportActivity; -import com.termux.app.models.ReportInfo; +import com.termux.shared.activities.ReportActivity; +import com.termux.shared.models.ReportInfo; import com.termux.app.models.UserAction; import com.termux.app.terminal.io.KeyboardShortcut; import com.termux.app.terminal.io.extrakeys.ExtraKeysView; @@ -660,7 +660,7 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase { if (termuxAptInfo != null) reportString.append("\n\n").append(termuxAptInfo); - ReportActivity.startReportActivity(mActivity, new ReportInfo(UserAction.REPORT_ISSUE_FROM_TRANSCRIPT, TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity), false)); + ReportActivity.startReportActivity(mActivity, new ReportInfo(UserAction.REPORT_ISSUE_FROM_TRANSCRIPT.getName(), TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity), false)); } }.start(); } diff --git a/app/src/main/java/com/termux/app/utils/CrashUtils.java b/app/src/main/java/com/termux/app/utils/CrashUtils.java index 670277b7..55a65ef4 100644 --- a/app/src/main/java/com/termux/app/utils/CrashUtils.java +++ b/app/src/main/java/com/termux/app/utils/CrashUtils.java @@ -9,10 +9,10 @@ import android.content.Intent; import androidx.annotation.Nullable; import com.termux.R; -import com.termux.app.activities.ReportActivity; +import com.termux.shared.activities.ReportActivity; import com.termux.shared.notification.NotificationUtils; import com.termux.shared.file.FileUtils; -import com.termux.app.models.ReportInfo; +import com.termux.shared.models.ReportInfo; import com.termux.app.models.UserAction; import com.termux.shared.settings.preferences.TermuxAppSharedPreferences; import com.termux.shared.settings.preferences.TermuxPreferenceConstants; @@ -89,7 +89,7 @@ public class CrashUtils { Logger.logDebug(logTag, "The crash log file at \"" + TermuxConstants.TERMUX_CRASH_LOG_FILE_PATH + "\" found. Sending \"" + title + "\" notification."); - Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT, logTag, title, null, reportString, "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true)); + Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.CRASH_REPORT.getName(), logTag, title, null, reportString, "\n\n" + TermuxUtils.getReportIssueMarkdownString(context), true)); PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT); // Setup the notification channel if not already set up diff --git a/app/src/main/java/com/termux/app/utils/PluginUtils.java b/app/src/main/java/com/termux/app/utils/PluginUtils.java index b1d5c5db..2ea2a0f2 100644 --- a/app/src/main/java/com/termux/app/utils/PluginUtils.java +++ b/app/src/main/java/com/termux/app/utils/PluginUtils.java @@ -11,16 +11,16 @@ import android.os.Bundle; import androidx.annotation.Nullable; import com.termux.R; +import com.termux.shared.activities.ReportActivity; import com.termux.shared.notification.NotificationUtils; import com.termux.shared.termux.TermuxConstants; import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE; -import com.termux.app.activities.ReportActivity; import com.termux.shared.logger.Logger; import com.termux.shared.settings.preferences.TermuxAppSharedPreferences; import com.termux.shared.settings.preferences.TermuxPreferenceConstants.TERMUX_APP; import com.termux.shared.settings.properties.SharedProperties; import com.termux.shared.settings.properties.TermuxPropertyConstants; -import com.termux.app.models.ReportInfo; +import com.termux.shared.models.ReportInfo; import com.termux.shared.models.ExecutionCommand; import com.termux.app.models.UserAction; import com.termux.shared.data.DataUtils; @@ -159,7 +159,7 @@ public class PluginUtils { reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(context, true)); reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context)); - Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND, logTag, title, null, reportString.toString(), null,true)); + Intent notificationIntent = ReportActivity.newInstance(context, new ReportInfo(UserAction.PLUGIN_EXECUTION_COMMAND.getName(), logTag, title, null, reportString.toString(), null,true)); PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT); // Setup the notification channel if not already set up diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ca4cb766..c226924c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -105,15 +105,6 @@ - - Copy - Share - - Share With - Report Text - - - Save file in ~/downloads/ Edit diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c747fed7..8859b8c1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -44,15 +44,6 @@ - - - - - + + +