android-fun
/
mdeditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup JSI

Browse Source
hauntED
yova 4 months ago
parent 1c4ebfca18
commit 7c087562df
3 changed files with 60 additions and 98 deletions
Show Stats Download Patch File Download Diff File

121
app/src/main/java/org/wntr/mdeditor/MainActivity.kt
Unescape View File

@ -59,53 +59,53 @@ class MainActivity : AppCompatActivity() {
autoDownloadFontAwesome: false, autoDownloadFontAwesome: false,
theme: "solarized", theme: "solarized",
status: [ status: [
{ {
className: "editor-statusbar-left", className: "editor-statusbar-left",
onUpdate: (el) => { onUpdate: (el) => {
el.innerHTML = saveStatus() el.innerHTML = saveStatus()
} }
}, },
{ {
className: "displayName", className: "displayName",
defaultValue: "None", defaultValue: "None",
onUpdate: (el) => { onUpdate: (el) => {
el.innerHTML = displayName() el.innerHTML = displayName()
}, },
}, "lines", "words", "cursor", }, "lines", "words", "cursor",
{ {
className: "editor-statusbar-right", className: "editor-statusbar-right",
onUpdate: (el) => { onUpdate: (el) => {
el.innerHTML = "<i class=\"fa fa-square\"></i>" el.innerHTML = "<i class=\"fa fa-square\"></i>"
} }
} }
], ],
toolbar: [ toolbar: [
{ {
name: "toggleTheme", name: "toggleTheme",
action: toggleTheme, action: toggleTheme,
className: "fa fa-moon", className: "fa fa-moon",
title: "Toggle Theme" title: "Toggle Theme"
}, },
{ {
name: "share", name: "share",
action: shareText, action: shareText,
className: "fa fa-share-nodes", className: "fa fa-share-nodes",
title: "Share" title: "Share"
},"strikethrough", "horizontal-rule","undo", },"strikethrough", "horizontal-rule","undo",
{ {
name: "preview", name: "preview",
action: myPreview, action: myPreview,
className: "fa fa-eye", className: "fa fa-eye",
title: "Preview", title: "Preview",
noDisable: true noDisable: true
},"redo", },"redo",
"bold", "italic","link","code", "bold", "italic","link","code",
{ {
name: "toggle", name: "toggle",
action: toggleBar, action: toggleBar,
className: "fa fa-expand", className: "fa fa-expand",
title: "Toggle Bar", title: "Toggle Bar",
} }
] ]
}); });
""" """
@ -141,7 +141,7 @@ class MainActivity : AppCompatActivity() {
Log.i(javaClass.simpleName, "intent data on start: ${intent.data.toString()}\nIntent action: ${intent.action}") Log.i(javaClass.simpleName, "intent data on start: ${intent.data.toString()}\nIntent action: ${intent.action}")
credManager = CredentialManager(applicationContext) credManager = CredentialManager(applicationContext)
val webView = findViewById<WebView>(R.id.mde_webview) webView = findViewById<WebView>(R.id.mde_webview)
webView.settings.javaScriptEnabled = true webView.settings.javaScriptEnabled = true
webView.setLongClickable(true); webView.setLongClickable(true);
@ -164,19 +164,9 @@ class MainActivity : AppCompatActivity() {
webView.loadUrl("file:///android_res/raw/index.html") webView.loadUrl("file:///android_res/raw/index.html")
val jsi = object { val jsi = object {
@JavascriptInterface
fun getValue(): String {
return mdeValue
}
@JavascriptInterface
fun reportChange(value: String) {
Log.i(javaClass.simpleName, value)
}
@JavascriptInterface @JavascriptInterface
fun triggerSaveFile(value: String) { fun triggerSaveFile() {
mdeValue = value
saveFile() saveFile()
} }
@ -189,11 +179,6 @@ class MainActivity : AppCompatActivity() {
return height return height
}*/ }*/
@JavascriptInterface
fun refresh() {
readFile(thisFileUri!!)
}
@JavascriptInterface @JavascriptInterface
fun triggerDisplayName(): String { fun triggerDisplayName(): String {
return getDisplayName(applicationContext, thisFileUri) return getDisplayName(applicationContext, thisFileUri)
@ -214,11 +199,6 @@ class MainActivity : AppCompatActivity() {
} }
} }
@JavascriptInterface
fun triggerGhost(sharedText: String) {
shareGhost(sharedText, ::sendPost)
}
@JavascriptInterface @JavascriptInterface
fun getMdToAppend(): String { fun getMdToAppend(): String {
val md = mdToAppend val md = mdToAppend
@ -226,13 +206,6 @@ class MainActivity : AppCompatActivity() {
return md return md
} }
@JavascriptInterface
fun getCursor(): String {
val cursor = JSONObject(JSONObject(metaData.cursor), arrayOf("ch", "line"))
Log.i(javaClass.simpleName,"delivering cursor: $cursor")
return cursor.toString()
}
@JavascriptInterface @JavascriptInterface
fun isFullscreen() : Boolean{ fun isFullscreen() : Boolean{
return supportActionBar!!.isShowing return supportActionBar!!.isShowing

21
app/src/main/java/org/wntr/mdeditor/MetadataActivity.kt
Unescape View File

@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import org.wntr.mdeditor.MainActivity.Companion.credManager
import org.wntr.mdeditor.databinding.ActivityMetadataBinding import org.wntr.mdeditor.databinding.ActivityMetadataBinding
class MetadataActivity : AppCompatActivity() { class MetadataActivity : AppCompatActivity() {
@ -15,25 +16,25 @@ class MetadataActivity : AppCompatActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityMetadataBinding.inflate(layoutInflater) binding = ActivityMetadataBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
binding.title.setText(MainActivity.metaData.get("title") ?: getDisplayName(applicationContext, MainActivity.thisFileUri)) binding.title.setText(metaData.get("title") ?: getDisplayName(applicationContext, thisFileUri))
binding.url.setText(MainActivity.metaData.get("url")) binding.url.setText(metaData.get("url"))
binding.featureImage.setText(MainActivity.metaData.get("feature_image")) binding.featureImage.setText(metaData.get("feature_image"))
binding.author.setText(MainActivity.metaData.get("author") ?: MainActivity.credManager.username) binding.author.setText(metaData.get("author") ?: credManager.username)
} }
fun onButtonSaveClick(view: View) { fun onButtonSaveClick(view: View) {
Log.d(javaClass.simpleName, "Getting Metadata:\ntitle:\t${binding.title.text}\nfeature_image:\t${binding.featureImage.text}") Log.d(javaClass.simpleName, "Getting Metadata:\ntitle:\t${binding.title.text}\nfeature_image:\t${binding.featureImage.text}")
MainActivity.metaData.put("title", binding.title.text.toString()) metaData.put("title", binding.title.text.toString())
MainActivity.metaData.put("feature_image", binding.featureImage.text.toString()) metaData.put("feature_image", binding.featureImage.text.toString())
if (binding.author.text.toString() != MainActivity.credManager.username) { if (binding.author.text.toString() != MainActivity.credManager.username) {
var apiHost: String? = null var apiHost: String? = null
if (MainActivity.metaData.get("url") !== null) { if (metaData.get("url") !== null) {
val url = Uri.parse(MainActivity.metaData.get("url")) val url = Uri.parse(metaData.get("url"))
apiHost = url.scheme + "://" + url.host apiHost = url.scheme + "://" + url.host
} else apiHost = MainActivity.credManager.instance } else apiHost = MainActivity.credManager.instance
MainActivity.credManager.saveCredentialsToSharedPrefs(Credentials(apiHost, binding.author.text.toString())) credManager.saveCredentialsToSharedPrefs(Credentials(apiHost, binding.author.text.toString()))
} }
MainActivity.metaData.put("author", binding.author.text.toString()) metaData.put("author", binding.author.text.toString())
MainActivity.readOnResume = false MainActivity.readOnResume = false
finish() finish()
} }

16
app/src/main/res/raw/controller.js
Unescape View File

@ -1,14 +1,5 @@
function onRead() {
easyMDE.codemirror.doc.setValue(Android.getValue())
easyMDE.codemirror.doc.markClean()
easyMDE.codemirror.focus()
easyMDE.codemirror.doc.setCursor(JSON.parse(Android.getCursor()))
pasteText()
}
function saveFile() { function saveFile() {
if (!easyMDE.codemirror.doc.isClean()) Android.triggerSaveFile(easyMDE.value()) if (!easyMDE.codemirror.doc.isClean()) Android.triggerSaveFile()
easyMDE.codemirror.doc.markClean()
} }
function dispatchCut() { function dispatchCut() {
@ -22,10 +13,7 @@ function myPreview() {
saveFile() saveFile()
easyMDE.togglePreview() easyMDE.togglePreview()
} }
function refresh() {
Android.refresh()
onRead()
}
function displayName() { function displayName() {
if (typeof Android !== 'undefined') return Android.triggerDisplayName() if (typeof Android !== 'undefined') return Android.triggerDisplayName()
else return "NONdroid" else return "NONdroid"

Write Preview
Loading…
Cancel
Save