toggle themes

app/src/main/java/org/wntr/mdeditor/MainActivity.kt

@@ -172,7 +172,6 @@ class MainActivity : AppCompatActivity() {
 
             @JavascriptInterface
             fun getCursor(): String {
-                Log.i(javaClass.simpleName,"delivering cursor: ${metaData.cursor}")
                 val cursor = JSONObject(JSONObject(metaData.cursor), arrayOf("ch", "line"))
                 Log.i(javaClass.simpleName,"delivering cursor: $cursor")
                 return cursor.toString()
@@ -258,30 +257,18 @@ class MainActivity : AppCompatActivity() {
         super.onResume()
 
         loadMetaFromSharedPrefs()
-        CoroutineScope(Dispatchers.Main).launch {
+        if (thisFileUri !== null) {
-            withContext(Dispatchers.IO) {
+            readFile(thisFileUri!!)
-                //if (contentResolver.getType(parse(intent.dataString))!!.split("/")[0] == "text" && intentScheme == "content") {
+            Log.d(javaClass.simpleName,"Loading on resume from thisFileUri: ${thisFileUri}")
-                if (intent.data != null) {
+        }
-                    if (contentResolver.getType(parse(intent.dataString))!!.split("/")[0] == "text") {
-                        readFile(intent.data!!)
-                        intent.data = null
-                        Log.d(javaClass.simpleName,"Loading on resume from intent data: ${intent.data}")
-                    } else {}
-                } else { // No start with intent data. Load previously used file
-                    if (thisFileUri !== null) readFile(thisFileUri!!)
-                    Log.d(javaClass.simpleName,"Loading on resume from thisFileUri: ${thisFileUri}")
-                }
-            }
-            webView.evaluateJavascript("onRead();") {}
 
-            if (metaData.metaData.get("url") !== null) {
+        if (metaData.metaData.get("url") !== null) {
-                val url = parse(metaData.metaData.get("url"))
+            val url = parse(metaData.metaData.get("url"))
-                deleteVisible = true
+            deleteVisible = true
-                invalidateOptionsMenu()
+            invalidateOptionsMenu()
-                val apiHost = url.scheme + "://" + url.host
+            val apiHost = url.scheme + "://" + url.host
-                Log.i(javaClass.simpleName, "Starting api controller for: $apiHost")
+            Log.i(javaClass.simpleName, "Starting api controller for: $apiHost")
-                api = ghostAPI(applicationContext, apiHost)
+            api = ghostAPI(applicationContext, apiHost)
-            }
         }
     }
     override fun onNewIntent(intent:Intent) {
@@ -328,7 +315,6 @@ class MainActivity : AppCompatActivity() {
 
         if (intentScheme == "link" && uri.toString() !="null") {
             mdToAppend += "[](${uri})\n"
-            webView.evaluateJavascript("onRead();"){}
             intent.putExtra(Intent.EXTRA_TEXT, null as CharSequence?)
         }
         if (intentScheme == "content") {
@@ -336,12 +322,7 @@ class MainActivity : AppCompatActivity() {
                 pushImage(uri)
                 intent.putExtra(Intent.EXTRA_STREAM, null as Uri?)
             } else if (mimeType == "text" && intent.data != null ) {
-                CoroutineScope(Dispatchers.Main).launch {
+                readFile(intent.data!!)
-                    withContext(Dispatchers.IO) {
-                        readFile(intent.data!!)
-                    }
-                    webView.evaluateJavascript("onRead();") {}
-                }
             }
         }
     }
@@ -1050,6 +1031,7 @@ class MainActivity : AppCompatActivity() {
                             Toast.LENGTH_LONG
                         ).show()
                     })
+                    return@withContext
                 }
                 catch (e: Exception) {
                     Log.d(javaClass.simpleName, e.stackTraceToString())
@@ -1060,9 +1042,12 @@ class MainActivity : AppCompatActivity() {
                             Toast.LENGTH_LONG
                         ).show()
                     })
+                    return@withContext
                 }
                 this@MainActivity.runOnUiThread({
-                    val script = "easyMDE.codemirror.doc.setValue(`${mdeValue}`);"
+                    val script = "easyMDE.codemirror.doc.setValue(`${mdeValue}`);" +
+                                 "easyMDE.codemirror.doc.setCursor(JSON.parse(`${JSONObject(JSONObject(metaData.cursor), arrayOf("ch", "line"))}`));" +
+                                 "pasteText();"
                     Log.d(javaClass.simpleName, "executing in webview:\n${script}")
                     webView.evaluateJavascript(script, {})
                 })

app/src/main/res/raw/controller.js

@@ -2,7 +2,6 @@ function onRead() {
     easyMDE.codemirror.doc.setValue(Android.getValue())
     easyMDE.codemirror.doc.markClean()
     easyMDE.codemirror.focus()
-    console.log(Android.getCursor())
     easyMDE.codemirror.doc.setCursor(JSON.parse(Android.getCursor()))
     pasteText()
 }
@@ -79,6 +78,13 @@ function toggleBar() {
     Android.toggleBar()
     easyMDE.codemirror.focus()
 }
+themes = [ "solarized", "3024-night"]
+i=1
+function toggleTheme() {
+    easyMDE.codemirror.setOption("theme",themes[i])
+    i++
+    if (i>themes.length-1) i=0
+}
 
 const easyMDE = new EasyMDE({
                 spellChecker: false,
@@ -110,24 +116,17 @@ const easyMDE = new EasyMDE({
                 ],
                 toolbar: [
                     {
-                        name: "day",
+                        name: "toggleTheme",
-                        action: () => easyMDE.codemirror.setOption("theme","solarized"),
+                        action: toggleTheme,
-                        className: "fa fa-sun",
-                        title: "Day Theme"
-                    },
-                    {
-                        name: "night",
-                        action: () => easyMDE.codemirror.setOption("theme","3024-night"),
                         className: "fa fa-moon",
-                        title: "Night Theme"
+                        title: "Toggle Theme"
                     },
-                    "guide",
                     {
                         name: "share",
                         action: shareText,
                         className: "fa fa-share-nodes",
                         title: "Share"
-                    }, "undo",
+                    },"strikethrough", "horizontal-rule","undo",
                     {
                         name: "preview",
                         action: myPreview,