Keep cursor position when switching away

* Fixes #162
gsantner · Dec 28, 2017 · 1b82400 · 1b82400
1 parent 602256a
commit 1b82400
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java
@@ -46,6 +46,7 @@ public class DocumentEditFragment extends BaseFragment implements TextFormat.Tex
     public static final int HISTORY_DELTA = 5000;
     public static final String FRAGMENT_TAG = "DocumentEditFragment";
     private static final String SAVESTATE_DOCUMENT = "DOCUMENT";
+    private static final String SAVESTATE_CURSOR_POS = "CURSOR_POS";
     public static boolean showPreviewOnBack = false;
 
     public static DocumentEditFragment newInstance(Document document) {
@@ -100,6 +101,12 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         }
         _document = loadDocument();
         loadDocumentIntoUi();
+        if (savedInstanceState != null && savedInstanceState.containsKey(SAVESTATE_CURSOR_POS)) {
+            int cursor = savedInstanceState.getInt(SAVESTATE_CURSOR_POS);
+            if (cursor >= 0 && cursor < _hlEditor.length()){
+                _hlEditor.setSelection(cursor);
+            }
+        }
 
         new ActivityUtils(getActivity()).hideSoftKeyboard();
         AppSettings appSettings = new AppSettings(_context);
@@ -111,7 +118,11 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
     public void onResume() {
         super.onResume();
         checkReloadDisk();
+        int cursor = _hlEditor.getSelectionStart();
         _hlEditor.setText(_document.getContent());
+        if (cursor >= 0 && cursor < _hlEditor.length()){
+            _hlEditor.setSelection(cursor);
+        }
     }
 
     @Override
@@ -271,6 +282,7 @@ public boolean saveDocument() {
     public void onSaveInstanceState(@NonNull Bundle outState) {
         saveDocument();
         outState.putSerializable(SAVESTATE_DOCUMENT, _document);
+        outState.putSerializable(SAVESTATE_CURSOR_POS, _hlEditor.getSelectionStart());
         super.onSaveInstanceState(outState);
     }