From 9a8673af824cd5d2a89d7ca42ccbe6c385bfbc52 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Wed, 1 Dec 2021 14:23:54 +0100 Subject: [PATCH] Rename markor baseactivity and use everywhere, move OpenEditor activity to subdir, by @gsantner --- app/src/main/AndroidManifest.xml | 2 +- .../gsantner/markor/activity/ActionOrderActivity.java | 3 +-- .../net/gsantner/markor/activity/DocumentActivity.java | 2 +- .../net/gsantner/markor/activity/MainActivity.java | 2 +- .../{AppActivityBase.java => MarkorBaseActivity.java} | 2 +- .../net/gsantner/markor/activity/SettingsActivity.java | 2 +- .../markor/activity/openeditor/OpenEditorActivity.java | 4 ++-- .../OpenEditorFromShortcutOrWidgetActivity.java} | 8 +++++--- .../activity/openeditor/OpenShareIntoActivity.java | 3 +-- .../main/java/net/gsantner/markor/util/ShareUtil.java | 4 ++-- .../java/net/gsantner/markor/util/ShortcutUtils.java | 8 ++++---- .../other/writeily/widget/WrMarkorWidgetProvider.java | 10 +++++----- 12 files changed, 25 insertions(+), 25 deletions(-) rename app/src/main/java/net/gsantner/markor/activity/{AppActivityBase.java => MarkorBaseActivity.java} (85%) rename app/src/main/java/net/gsantner/markor/activity/{DocumentRelayActivity.java => openeditor/OpenEditorFromShortcutOrWidgetActivity.java} (77%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 783199bed..e6e3e719a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -151,7 +151,7 @@ { +public abstract class MarkorBaseActivity extends GsActivityBase { @Override public Integer getNewNavigationBarColor() { diff --git a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java index c4145eb7d..94902e3a5 100644 --- a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java @@ -49,7 +49,7 @@ import butterknife.ButterKnife; import other.writeily.widget.WrMarkorWidgetProvider; -public class SettingsActivity extends AppActivityBase { +public class SettingsActivity extends MarkorBaseActivity { @SuppressWarnings("WeakerAccess") public static class RESULT { diff --git a/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorActivity.java b/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorActivity.java index 80dabb90f..435ea8561 100644 --- a/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorActivity.java @@ -10,10 +10,10 @@ package net.gsantner.markor.activity.openeditor; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import net.gsantner.markor.R; import net.gsantner.markor.activity.DocumentActivity; +import net.gsantner.markor.activity.MarkorBaseActivity; import net.gsantner.markor.model.Document; import net.gsantner.markor.util.AppSettings; import net.gsantner.opoc.util.ActivityUtils; @@ -22,7 +22,7 @@ import java.io.File; -public class OpenEditorActivity extends AppCompatActivity { +public class OpenEditorActivity extends MarkorBaseActivity { protected void openEditorForFile(File file) { Intent openIntent = new Intent(getApplicationContext(), DocumentActivity.class) .setAction(Intent.ACTION_CALL_BUTTON) diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentRelayActivity.java b/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorFromShortcutOrWidgetActivity.java similarity index 77% rename from app/src/main/java/net/gsantner/markor/activity/DocumentRelayActivity.java rename to app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorFromShortcutOrWidgetActivity.java index 62c90aa46..78b436d39 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentRelayActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorFromShortcutOrWidgetActivity.java @@ -1,14 +1,16 @@ -package net.gsantner.markor.activity; +package net.gsantner.markor.activity.openeditor; -import android.app.Activity; import android.content.Intent; import android.os.Bundle; +import net.gsantner.markor.activity.DocumentActivity; +import net.gsantner.markor.activity.MarkorBaseActivity; + /** * This Activity exists solely to launch DocumentActivity with the correct intent * it is necessary as widget and shortcut intents do not respect MultipleTask etc */ -public class DocumentRelayActivity extends Activity { +public class OpenEditorFromShortcutOrWidgetActivity extends MarkorBaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenShareIntoActivity.java b/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenShareIntoActivity.java index 32eea59d6..dff1fc36a 100644 --- a/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenShareIntoActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/openeditor/OpenShareIntoActivity.java @@ -13,7 +13,6 @@ import android.os.Bundle; import android.support.annotation.Nullable; -import net.gsantner.markor.activity.DocumentRelayActivity; import net.gsantner.markor.model.Document; public class OpenShareIntoActivity extends OpenEditorActivity { @@ -22,7 +21,7 @@ public class OpenShareIntoActivity extends OpenEditorActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Intent openShare = new Intent(this, DocumentRelayActivity.class) + Intent openShare = new Intent(this, OpenEditorFromShortcutOrWidgetActivity.class) .setAction(Intent.ACTION_SEND) .putExtra(Document.EXTRA_PATH_IS_FOLDER, true) .putExtra(Intent.EXTRA_TEXT, ""); diff --git a/app/src/main/java/net/gsantner/markor/util/ShareUtil.java b/app/src/main/java/net/gsantner/markor/util/ShareUtil.java index c34294bb9..dbb201b47 100644 --- a/app/src/main/java/net/gsantner/markor/util/ShareUtil.java +++ b/app/src/main/java/net/gsantner/markor/util/ShareUtil.java @@ -21,7 +21,7 @@ import android.widget.Toast; import net.gsantner.markor.R; -import net.gsantner.markor.activity.DocumentRelayActivity; +import net.gsantner.markor.activity.openeditor.OpenEditorFromShortcutOrWidgetActivity; import net.gsantner.markor.model.Document; public class ShareUtil extends net.gsantner.opoc.util.ShareUtil { @@ -35,7 +35,7 @@ public void createLauncherDesktopShortcut(Document document) { // So basically only for java.io.File Objects. Virtual files, or content:// // in private/restricted space won't work - because of missing permission grant when re-launching if (document != null && document.getFile() != null && !TextUtils.isEmpty(document.getTitle())) { - Intent shortcutIntent = new Intent(_context, DocumentRelayActivity.class) + Intent shortcutIntent = new Intent(_context, OpenEditorFromShortcutOrWidgetActivity.class) .setData(Uri.fromFile(document.getFile())); super.createLauncherDesktopShortcut(shortcutIntent, R.drawable.ic_launcher, document.getTitle()); Toast.makeText(_context, R.string.tried_to_create_shortcut_for_this_notice, Toast.LENGTH_LONG).show(); diff --git a/app/src/main/java/net/gsantner/markor/util/ShortcutUtils.java b/app/src/main/java/net/gsantner/markor/util/ShortcutUtils.java index 7af9e2b73..a9af7c0e6 100644 --- a/app/src/main/java/net/gsantner/markor/util/ShortcutUtils.java +++ b/app/src/main/java/net/gsantner/markor/util/ShortcutUtils.java @@ -19,7 +19,7 @@ import android.support.annotation.NonNull; import net.gsantner.markor.R; -import net.gsantner.markor.activity.DocumentRelayActivity; +import net.gsantner.markor.activity.openeditor.OpenEditorFromShortcutOrWidgetActivity; import java.io.File; import java.util.ArrayList; @@ -61,7 +61,7 @@ public static void setShortcuts(@NonNull Context context) { final AppSettings appSettings = new AppSettings(context); // Create the to-do shortcut - Intent openTodo = new Intent(context, DocumentRelayActivity.class) + Intent openTodo = new Intent(context, OpenEditorFromShortcutOrWidgetActivity.class) .setAction(Intent.ACTION_EDIT) .setData(Uri.fromFile(appSettings.getTodoFile())); @@ -74,7 +74,7 @@ public static void setShortcuts(@NonNull Context context) { newShortcuts.add(shortcutToDo); // Create the QuickNote shortcut - Intent openQuickNote = new Intent(context, DocumentRelayActivity.class) + Intent openQuickNote = new Intent(context, OpenEditorFromShortcutOrWidgetActivity.class) .setAction(Intent.ACTION_EDIT) .setData(Uri.fromFile(appSettings.getQuickNoteFile())); @@ -97,7 +97,7 @@ public static void setShortcuts(@NonNull Context context) { File file = new File(filePath); - Intent openFile = new Intent(context, DocumentRelayActivity.class) + Intent openFile = new Intent(context, OpenEditorFromShortcutOrWidgetActivity.class) .setAction(Intent.ACTION_EDIT) .setData(Uri.fromFile(file)); diff --git a/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java b/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java index f8bd17e6d..d5ca6dc78 100644 --- a/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java +++ b/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java @@ -20,7 +20,7 @@ import android.widget.RemoteViews; import net.gsantner.markor.R; -import net.gsantner.markor.activity.DocumentRelayActivity; +import net.gsantner.markor.activity.openeditor.OpenEditorFromShortcutOrWidgetActivity; import net.gsantner.markor.activity.MainActivity; import net.gsantner.markor.model.Document; import net.gsantner.markor.util.AppSettings; @@ -72,7 +72,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a AppSettings appSettings = new AppSettings(context); // ~~~Create new File~~~ Share empty text into markor, easier to access from widget than new file dialog - Intent openShare = new Intent(context, DocumentRelayActivity.class) + Intent openShare = new Intent(context, OpenEditorFromShortcutOrWidgetActivity.class) .setAction(Intent.ACTION_SEND) .putExtra(Document.EXTRA_PATH, directoryF) .putExtra(Document.EXTRA_PATH_IS_FOLDER, true) @@ -84,14 +84,14 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a views.setOnClickPendingIntent(R.id.widget_header, PendingIntent.getActivity(context, requestCode++, goToMain, 0)); // Open To-do - Intent openTodo = new Intent(context, DocumentRelayActivity.class) + Intent openTodo = new Intent(context, OpenEditorFromShortcutOrWidgetActivity.class) .setAction(Intent.ACTION_EDIT) .putExtra(Document.EXTRA_PATH, appSettings.getTodoFile()) .putExtra(Document.EXTRA_PATH_IS_FOLDER, false); views.setOnClickPendingIntent(R.id.widget_todo, PendingIntent.getActivity(context, requestCode++, openTodo, 0)); // Open QuickNote - Intent openQuickNote = new Intent(context, DocumentRelayActivity.class) + Intent openQuickNote = new Intent(context, OpenEditorFromShortcutOrWidgetActivity.class) .setAction(Intent.ACTION_EDIT) .putExtra(Document.EXTRA_PATH, appSettings.getQuickNoteFile()) .putExtra(Document.EXTRA_PATH_IS_FOLDER, false); @@ -111,7 +111,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a views.setEmptyView(R.id.widget_list_container, R.id.widget_empty_hint); views.setRemoteAdapter(R.id.widget_notes_list, notesListIntent); - Intent openNoteIntent = new Intent(context, DocumentRelayActivity.class); + Intent openNoteIntent = new Intent(context, OpenEditorFromShortcutOrWidgetActivity.class); PendingIntent openNotePendingIntent = PendingIntent.getActivity(context, requestCode++, openNoteIntent, PendingIntent.FLAG_UPDATE_CURRENT); views.setPendingIntentTemplate(R.id.widget_notes_list, openNotePendingIntent);