Rename markor baseactivity and use everywhere, move OpenEditor activi…

…ty to subdir, by @gsantner
gsantner · Dec 1, 2021 · 9a8673a · 9a8673a
1 parent 5d1ce8a
commit 9a8673a
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 25 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -151,7 +151,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.DocumentRelayActivity"
+            android:name=".activity.openeditor.OpenEditorFromShortcutOrWidgetActivity"
             android:launchMode="singleTop"
             android:theme="@android:style/Theme.NoDisplay" />
         <activity

diff --git a/app/src/main/java/net/gsantner/markor/activity/ActionOrderActivity.java b/app/src/main/java/net/gsantner/markor/activity/ActionOrderActivity.java
@@ -15,7 +15,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -47,7 +46,7 @@
 import java.util.Map;
 import java.util.Set;
 
-public class ActionOrderActivity extends AppCompatActivity {
+public class ActionOrderActivity extends MarkorBaseActivity {
 
     public static final String EXTRA_FORMAT_KEY = "FORMAT_KEY";
 

diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java b/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java
@@ -48,7 +48,7 @@
 import butterknife.ButterKnife;
 import other.so.AndroidBug5497Workaround;
 
-public class DocumentActivity extends AppActivityBase {
+public class DocumentActivity extends MarkorBaseActivity {
     public static final String EXTRA_DO_PREVIEW = "EXTRA_DO_PREVIEW";
 
     @BindView(R.id.document__placeholder_fragment)

diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java
@@ -61,7 +61,7 @@
 import butterknife.OnLongClick;
 import butterknife.OnPageChange;
 
-public class MainActivity extends AppActivityBase implements FilesystemViewerFragment.FilesystemFragmentOptionsListener, BottomNavigationView.OnNavigationItemSelectedListener {
+public class MainActivity extends MarkorBaseActivity implements FilesystemViewerFragment.FilesystemFragmentOptionsListener, BottomNavigationView.OnNavigationItemSelectedListener {
 
     public static boolean IS_DEBUG_ENABLED = false;
 

diff --git a/...tner/markor/activity/AppActivityBase.java → ...r/markor/activity/MarkorBaseActivity.java b/...tner/markor/activity/AppActivityBase.java → ...r/markor/activity/MarkorBaseActivity.java
@@ -5,7 +5,7 @@
 import net.gsantner.markor.util.AppSettings;
 import net.gsantner.opoc.activity.GsActivityBase;
 
-public abstract class AppActivityBase extends GsActivityBase<AppSettings> {
+public abstract class MarkorBaseActivity extends GsActivityBase<AppSettings> {
 
     @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
@@ -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
@@ -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/...arkor/activity/DocumentRelayActivity.java → ...enEditorFromShortcutOrWidgetActivity.java b/...arkor/activity/DocumentRelayActivity.java → ...enEditorFromShortcutOrWidgetActivity.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
@@ -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
@@ -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
@@ -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
@@ -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);