Skip to content

Commit ef03f0d

Browse files
committedSep 3, 2022
Refactoring - Replace patch references to DocumentEditAndViewFragment, by @gsantner
1 parent 3fa6063 commit ef03f0d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed
 

‎app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
@SuppressWarnings({"UnusedReturnValue"})
6969
@SuppressLint("NonConstantResourceId")
7070
public class DocumentEditAndViewFragment extends MarkorBaseFragment implements FormatRegistry.TextFormatApplier {
71-
public static final String FRAGMENT_TAG = "DocumentEditFragment";
71+
public static final String FRAGMENT_TAG = "DocumentEditAndViewFragment";
7272
public static final String SAVESTATE_DOCUMENT = "DOCUMENT";
7373
public static final String START_PREVIEW = "START_PREVIEW";
7474

‎app/src/main/res/layout/document__fragment__edit.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:background="@android:color/transparent"
1717
android:descendantFocusability="beforeDescendants"
1818
android:focusableInTouchMode="true"
19-
tools:context="web.gsantner.markor.activity.DocumentEditFragment"
19+
tools:context="web.gsantner.markor.activity.DocumentEditAndViewFragment"
2020
tools:showIn="@layout/document__activity">
2121

2222
<net.gsantner.markor.frontend.DraggableScrollbarScrollView

‎experiments/0001-Auto-scrolling-functionality-draft-1-699.patch

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Auto scrolling functionality, draft 1 (#699)
55

66
---
77
.../markor/activity/DocumentActivity.java | 7 ++++
8-
.../markor/activity/DocumentEditFragment.java | 17 ++++++++++
8+
.../markor/activity/DocumentEditAndViewFragment.java | 17 ++++++++++
99
.../opoc/util/CoolExperimentalStuff.java | 34 +++++++++++++++++++
1010
.../main/res/menu/document__edit__menu.xml | 6 ++++
1111
app/src/main/res/values/strings.xml | 1 +
@@ -38,19 +38,19 @@ index eca0ab1f..b9d95876 100644
3838
@Override
3939
@SuppressWarnings("StatementWithEmptyBody")
4040
public void onBackPressed() {
41-
diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java
41+
diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java
4242
index c0ad2d1f..23af187d 100644
43-
--- a/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java
44-
+++ b/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java
45-
@@ -250,6 +250,7 @@ public class DocumentEditFragment extends GsFragmentBase implements TextFormat.T
43+
--- a/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java
44+
+++ b/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java
45+
@@ -250,6 +250,7 @@ public class DocumentEditAndViewFragment extends GsFragmentBase implements TextFormat.T
4646
menu.findItem(R.id.submenu_tools).setVisible(isExpimentalFeaturesEnabled);
4747
menu.findItem(R.id.action_load_epub).setVisible(isExpimentalFeaturesEnabled);
4848
menu.findItem(R.id.action_speed_read).setVisible(isExpimentalFeaturesEnabled);
4949
+ menu.findItem(R.id.action_auto_scroll).setVisible(isExpimentalFeaturesEnabled);
5050
}
5151

5252
public void loadDocumentIntoUi() {
53-
@@ -416,6 +417,21 @@ public class DocumentEditFragment extends GsFragmentBase implements TextFormat.T
53+
@@ -416,6 +417,21 @@ public class DocumentEditAndViewFragment extends GsFragmentBase implements TextFormat.T
5454
CoolExperimentalStuff.showSpeedReadDialog(getActivity(), _document.getContent());
5555
return true;
5656
}
@@ -72,7 +72,7 @@ index c0ad2d1f..23af187d 100644
7272
}
7373
return super.onOptionsItemSelected(item);
7474
}
75-
@@ -617,6 +633,7 @@ public class DocumentEditFragment extends GsFragmentBase implements TextFormat.T
75+
@@ -617,6 +633,7 @@ public class DocumentEditAndViewFragment extends GsFragmentBase implements TextFormat.T
7676
_webView.animate().setDuration(150).alpha(1.0f).setListener(null);
7777
}
7878
_isPreviewVisible = show;

0 commit comments

Comments
 (0)
Please sign in to comment.