diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index 3238cdd9..eb6ce467 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -317,13 +317,15 @@
-
+
+
True
True
MarkdownEditor.cshtml
-
-
+
+
+
@@ -338,7 +340,7 @@
Designer
-
+
RazorTemplatePreprocessor
MarkdownEditor.cs
None
diff --git a/BookAStar/BookAStar.Droid/Markdown/JsBridgeMarkdown.cs b/BookAStar/BookAStar.Droid/Markdown/JsBridgeMarkdown.cs
new file mode 100644
index 00000000..56657838
--- /dev/null
+++ b/BookAStar/BookAStar.Droid/Markdown/JsBridgeMarkdown.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Android.Webkit;
+using Java.Interop;
+
+namespace BookAStar.Droid.Markdown
+{
+ public class JsBridgeMarkdown : Java.Lang.Object
+ {
+ readonly WeakReference hybridWebViewRenderer;
+
+ public JsBridgeMarkdown(MarkdownViewRenderer hybridRenderer)
+ {
+ hybridWebViewRenderer = new WeakReference(hybridRenderer);
+ }
+
+ [JavascriptInterface]
+ [Export("contentEdited")]
+ public void ContentEdited(string data)
+ {
+ MarkdownViewRenderer hybridRenderer;
+
+ if (hybridWebViewRenderer != null && hybridWebViewRenderer.TryGetTarget(out hybridRenderer))
+ {
+ hybridRenderer.Element.Markdown = data;
+ }
+ }
+
+ [JavascriptInterface]
+ [Export("jsLoaded")]
+ public void JSLoaded()
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar.Droid/MarkdownEditor.cs b/BookAStar/BookAStar.Droid/Markdown/MarkdownEditor.cs
similarity index 70%
rename from BookAStar/BookAStar.Droid/MarkdownEditor.cs
rename to BookAStar/BookAStar.Droid/Markdown/MarkdownEditor.cs
index 5f79ee21..63160726 100644
--- a/BookAStar/BookAStar.Droid/MarkdownEditor.cs
+++ b/BookAStar/BookAStar.Droid/Markdown/MarkdownEditor.cs
@@ -9,7 +9,7 @@
//
//------------------------------------------------------------------------------
-namespace BookAStar.Droid
+namespace BookAStar.Droid.Markdown
{
using System;
using System.Collections.Generic;
@@ -24,7 +24,7 @@ public partial class MarkdownEditor : MarkdownEditorBase
#line hidden
#line 1 "MarkdownEditor.cshtml"
-public string Model { get; set; }
+public MarkdownViewModel Model { get; set; }
#line default
#line hidden
@@ -36,34 +36,55 @@ WriteLiteral("\r\n\r\n\r\n \r\n \r\n \r\n");
+
+
+#line 13 "MarkdownEditor.cshtml"
+
+
+#line default
+#line hidden
+
+#line 13 "MarkdownEditor.cshtml"
+ if (Model.Editable)
+ {
+
+
+#line default
+#line hidden
+WriteLiteral("
-
+");
+
+
+#line 30 "MarkdownEditor.cshtml"
+ }
-
-
- \r\n\r\n ");
-#line 28 "MarkdownEditor.cshtml"
- Write(Html.Write(Model));
+#line 34 "MarkdownEditor.cshtml"
+ Write(Html.Write(Model.GetHtml()));
#line default
#line hidden
-WriteLiteral("\r\n \r\n \r\n \r\n \r\n \r\n");
+
+
+#line 37 "MarkdownEditor.cshtml"
+
+
+#line default
+#line hidden
-WriteLiteral(">\r\n \r\n \r\n");
+
+WriteLiteral(" \r\n \r\n");
+
+WriteLiteral(" \r\n \r\n");
+
+WriteLiteral(" \r\n\r\n \r\n");
+
+
+#line 43 "MarkdownEditor.cshtml"
+
+
+
+#line default
+#line hidden
+WriteLiteral(" \r\n var toolbarOptions = [\r\n [\'bold\', \'italic\', \'underline\', \'str" +
+"ike\'], // toggled buttons\r\n [\'blockquote\', \'code-block\'],\r\n [{ " +
+"\'header\': 1 }, { \'header\': 2 }, { \'header\': 3 }], // custom button" +
+" values\r\n [{ \'list\': \'ordered\' }, { \'list\': \'bullet\' }],\r\n [{ \'indent\'" +
+": \'-1\' }, { \'indent\': \'+1\' }], // outdent/indent\r\n [\'link\', \'image" +
+"\', \'video\'],\r\n [\'clean\'] // remove " +
+"formatting button\r\n ];\r\n\r\n var showImageUI = function (val" +
+"ue) {\r\n if (value) {\r\n var href = prompt(\'Ente" +
+"r the URL\');\r\n this.quill.format(\'image\', href);\r\n " +
+" } else {\r\n this.quill.format(\'image\', false);\r\n " +
+" }\r\n };\r\n\r\n $(document).ready(function () {\r\n " +
+" var quill = new Quill(\'#bubble-container\', {\r\n modul" +
+"es: {\r\n toolbar: toolbarOptions\r\n },\r\n" +
+" placeholder: \'Composez votre texte ...\',\r\n " +
+" theme: \'snow\'\r\n });\r\n\r\n function getMD() {\r\n " +
+" return markdownize($(\'#bubble-container div.ql-editor\').html())\r" +
+"\n }\r\n quill.on(\'text-change\', function (delta, old" +
+"Delta, source) {\r\n if (source === \"user\") {\r\n " +
+" contentEdited(getMD());\r\n }\r\n });\r\n " +
+" var toolbar = quill.getModule(\'toolbar\');\r\n toolbar." +
+"addHandler(\'image\', showImageUI);\r\n jsLoaded();\r\n });\r" +
+"\n \r\n");
+
+
+#line 86 "MarkdownEditor.cshtml"
+ }
+ else
+ {
+
+
+#line default
+#line hidden
+WriteLiteral("
- var toolbarOptions = [
- ['bold', 'italic', 'underline', 'strike'], // toggled buttons
- ['blockquote', 'code-block'],
-
- [{ 'header': 1 }, { 'header': 2 }], // custom button values
- [{ 'list': 'ordered' }, { 'list': 'bullet' }],
- [{ 'indent': '-1' }, { 'indent': '+1' }], // outdent/indent
- ['link', 'image', 'video'],
- ['clean'] // remove formatting button
- ];
-
-
- $(document).ready(function () {
- var quill = new Quill('#bubble-container', {
- modules: {
- toolbar: toolbarOptions
- },
- placeholder: 'Composez votre texte ...',
- theme: 'snow'
- });
-
- function getMD() {
- return markdownize($('#bubble-container div.ql-editor').html())
- }
- quill.on('text-change', function (delta, oldDelta, source) {
- if (source === ""user"") {
- invokeCSharpAction(getMD());
- }
- });
- // TODO implement a dedicated injection
- invokeCSharpAction(getMD());
- });
-
-
-
-
-");
+WriteLiteral(">\r\n $(document).ready(function() {\r\n jsLoaded();\r\n });\r\n" +
+" \r\n");
+
+
+#line 94 "MarkdownEditor.cshtml"
+ }
+
+
+#line default
+#line hidden
+WriteLiteral("\r\n