notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions

Mainly layouts and refacts

Browse source
This commit is contained in:
Paul Schneider 2016-10-14 16:21:03 +02:00
commit 7b3340cbc3
23 changed files with 629 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
View file

@ -317,13 +317,15 @@
<Compile Include="Helpers\YavscHelpers.cs" />
<Compile Include="Html.cs" />
<Compile Include="MainActivity.cs" />
<Compile Include="MarkdownEditor.cs">
<Compile Include="Markdown\JsBridgeMarkdown.cs" />
<Compile Include="Markdown\MarkdownEditor.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>MarkdownEditor.cshtml</DependentUpon>
</Compile>
<Compile Include="MarkdownViewRenderer.cs" />
<Compile Include="MarkdownWebViewClient.cs" />
<Compile Include="Markdown\MarkdownViewModel.cs" />
<Compile Include="Markdown\MarkdownViewRenderer.cs" />
<Compile Include="Markdown\MarkdownWebChromeClient.cs" />
<Compile Include="OAuth2\YaOAuth2Authenticator.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@ -338,7 +340,7 @@
<SubType>Designer</SubType>
</None>
<None Include="google-services.json" />
<None Include="MarkdownEditor.cshtml">
<None Include="Markdown\MarkdownEditor.cshtml">
<Generator>RazorTemplatePreprocessor</Generator>
<LastGenOutput>MarkdownEditor.cs</LastGenOutput>
<SubType>None</SubType>

45
BookAStar/BookAStar.Droid/Markdown/JsBridgeMarkdown.cs Normal file
View file

@ -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<MarkdownViewRenderer> hybridWebViewRenderer;
public JsBridgeMarkdown(MarkdownViewRenderer hybridRenderer)
{
hybridWebViewRenderer = new WeakReference<MarkdownViewRenderer>(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()
{
}
}
}

185
BookAStar/BookAStar.Droid/MarkdownEditor.cs → BookAStar/BookAStar.Droid/Markdown/MarkdownEditor.cs
View file

@ -9,7 +9,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
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("<!DOCTYPE html>\r\n<html>\r\n<head>\r\n <meta");
WriteLiteral(" charset=\"utf-8\"");
WriteLiteral(">\r\n <link");
WriteLiteral(">\r\n <style>\r\n .standalone-container {\r\n margin: 0;\r\n " +
" width: 100%;\r\n height: 100%;\r\n }\r\n </style>\r\n");
#line 13 "MarkdownEditor.cshtml"
#line default
#line hidden
#line 13 "MarkdownEditor.cshtml"
if (Model.Editable)
{
#line default
#line hidden
WriteLiteral(" <link");
WriteLiteral(" rel=\"stylesheet\"");
WriteLiteral(" href=\"quill.snow.css\"");
WriteLiteral(@" />
<style>
.standalone-container {
margin: 0;
WriteLiteral(" />\r\n");
WriteLiteral(@" <style>
#bubble-container {
width: 100%;
height: 100%;
}
#bubble-container {
width:100%;
height: 100%;
}
#bubble-container div.ql-editor {
margin-top:3em;
padding-top:3em;
}
.hidden {
display: none;
}
</style>
");
</head>
<body>
<div");
#line 30 "MarkdownEditor.cshtml"
}
#line default
#line hidden
WriteLiteral("</head>\r\n<body>\r\n <div");
WriteLiteral(" class=\"standalone-container\"");
@ -74,84 +95,124 @@ WriteLiteral(" id=\"bubble-container\"");
WriteLiteral(">");
#line 28 "MarkdownEditor.cshtml"
Write(Html.Write(Model));
#line 34 "MarkdownEditor.cshtml"
Write(Html.Write(Model.GetHtml()));
#line default
#line hidden
WriteLiteral("</div>\r\n </div>\r\n \r\n <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(" src=\"quill.min.js\"");
WriteLiteral("></script>\r\n <script");
WriteLiteral("</div>\r\n </div>\r\n <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(" src=\"jquery.js\"");
WriteLiteral("></script>\r\n <script");
WriteLiteral("></script>\r\n");
#line 37 "MarkdownEditor.cshtml"
#line default
#line hidden
#line 37 "MarkdownEditor.cshtml"
if (Model.Editable)
{
#line default
#line hidden
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(" src=\"quill.min.js\"");
WriteLiteral("></script>\r\n");
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(" src=\"showdown.js\"");
WriteLiteral("></script>\r\n <script");
WriteLiteral("></script>\r\n");
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(" src=\"to-markdown.js\"");
WriteLiteral("></script>\r\n <script");
WriteLiteral("></script>\r\n");
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(" src=\"md-helpers.js\"");
WriteLiteral("></script>\r\n\r\n <script");
WriteLiteral("></script>\r\n");
#line 43 "MarkdownEditor.cshtml"
#line default
#line hidden
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(@">
var toolbarOptions = [
['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block'],
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 </script>\r\n");
[{ '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'
});
#line 86 "MarkdownEditor.cshtml"
}
else
{
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());
});
</script>
</body>
</html>
");
#line default
#line hidden
WriteLiteral(" <script");
WriteLiteral(" type=\"text/javascript\"");
WriteLiteral(">\r\n $(document).ready(function() {\r\n jsLoaded();\r\n });\r\n" +
" </script>\r\n");
#line 94 "MarkdownEditor.cshtml"
}
#line default
#line hidden
WriteLiteral("</body>\r\n</html>\r\n");
}
}

96
BookAStar/BookAStar.Droid/Markdown/MarkdownEditor.cshtml Normal file
View file

@ -0,0 +1,96 @@
@model MarkdownViewModel
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
.standalone-container {
margin: 0;
width: 100%;
height: 100%;
}
</style>
@if (Model.Editable)
{
<link rel="stylesheet" href="quill.snow.css" />
<style>
#bubble-container {
width: 100%;
height: 100%;
}
#bubble-container div.ql-editor {
padding-top:3em;
}
.hidden {
display: none;
}
</style>
}
</head>
<body>
<div class="standalone-container">
<div id="bubble-container">@Html.Write(Model.GetHtml())</div>
</div>
<script type="text/javascript" src="jquery.js"></script>
@if (Model.Editable)
{
<script type="text/javascript" src="quill.min.js"></script>
<script type="text/javascript" src="showdown.js"></script>
<script type="text/javascript" src="to-markdown.js"></script>
<script type="text/javascript" src="md-helpers.js"></script>
<script type="text/javascript">
var toolbarOptions = [
['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block'],
[{ 'header': 1 }, { 'header': 2 }, { 'header': 3 }], // custom button values
[{ 'list': 'ordered' }, { 'list': 'bullet' }],
[{ 'indent': '-1' }, { 'indent': '+1' }], // outdent/indent
['link', 'image', 'video'],
['clean'] // remove formatting button
];
var showImageUI = function (value) {
if (value) {
var href = prompt('Enter the URL');
this.quill.format('image', href);
} else {
this.quill.format('image', false);
}
};
$(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") {
contentEdited(getMD());
}
});
var toolbar = quill.getModule('toolbar');
toolbar.addHandler('image', showImageUI);
jsLoaded();
});
</script>
}
else
{
<script type="text/javascript">
$(document).ready(function() {
jsLoaded();
});
</script>
}
</body>
</html>

29
BookAStar/BookAStar.Droid/Markdown/MarkdownViewModel.cs Normal file
View file

@ -0,0 +1,29 @@
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;
namespace BookAStar.Droid.Markdown
{
public class MarkdownViewModel
{
protected static MarkdownDeep.Markdown markdown = new MarkdownDeep.Markdown();
public string Content { get; set; }
public bool Editable { get; set; }
public string GetHtml()
{
return markdown.Transform(Content);
}
public override string ToString()
{
return Content;
}
}
}

100
BookAStar/BookAStar.Droid/Markdown/MarkdownViewRenderer.cs Normal file
View file

@ -0,0 +1,100 @@
using BookAStar.Views;
using Android.Webkit;
using Xamarin.Forms.Platform.Android;
using BookAStar.Droid;
using System;
using Java.Interop;
using System.ComponentModel;
using Android.Views;
[assembly: Xamarin.Forms.ExportRenderer(typeof(MarkdownView), typeof(MarkdownViewRenderer))]
namespace BookAStar.Droid
{
using Markdown;
public class MarkdownViewRenderer : ViewRenderer<MarkdownView, WebView>
{
private WebView editorView;
private MarkdownEditor editorTemplate = new MarkdownEditor();
const string jsLoadedJavaScriptFunction = "function jsLoaded(){jsBridge.jsLoaded()}";
const string contentEditedJavaScriptFunction = "function contentEdited(data){jsBridge.contentEdited(data)}";
public WebView EditorView
{
get
{
return editorView;
}
}
/// <summary>
/// To be called once document finished loading
/// </summary>
/// <param name="xview"></param>
/// <param name="view"></param>
public static async void AdjustHeightRequest(MarkdownView xview, WebView view)
{
if (view == null || xview == null) return;
var vch = view.ContentHeight;
xview.HeightRequest = vch > xview.MinimumHeightRequest ? vch : xview.MinimumHeightRequest;
}
protected override void OnElementChanged(ElementChangedEventArgs<MarkdownView> e)
{
base.OnElementChanged(e);
if (Control == null)
{
SetNativeControl(CreateNativeControl());
InjectJS(jsLoadedJavaScriptFunction);
InjectJS(contentEditedJavaScriptFunction);
}
if (e.OldElement != null)
{
// Unsubscribe
}
if (e.NewElement != null)
{
// Subscribe
editorTemplate.Model = new Markdown.MarkdownViewModel
{ Content = e.NewElement.Markdown, Editable = e.NewElement.Editable };
var html = editorTemplate.GenerateString();
EditorView.LoadDataWithBaseURL("file:///android_asset/",
html, "text/html", "utf-8", null);
}
}
void InjectJS(string script)
{
if (Control != null)
{
Control.LoadUrl(string.Format("javascript: {0}", script));
}
}
private WebView CreateNativeControl()
{
editorView = new WebView(Context);
EditorView.SetWebChromeClient(
new MarkdownWebChromeClient()
);
EditorView.Settings.BuiltInZoomControls = false;
EditorView.Settings.JavaScriptEnabled = true;
EditorView.Settings.LoadsImagesAutomatically = true;
EditorView.Settings.SetAppCacheEnabled(true);
EditorView.Settings.AllowContentAccess = true;
EditorView.Settings.AllowFileAccess = true;
EditorView.Settings.AllowFileAccessFromFileURLs = true;
EditorView.Settings.AllowUniversalAccessFromFileURLs = true;
EditorView.Settings.BlockNetworkImage = false;
EditorView.Settings.BlockNetworkLoads = false;
EditorView.Settings.DomStorageEnabled = true;
EditorView.AddJavascriptInterface(new JsBridgeMarkdown(this), "jsBridge");
EditorView.ViewTreeObserver.PreDraw += ViewTreeObserver_PreDraw;
return EditorView;
}
private void ViewTreeObserver_PreDraw(object sender, ViewTreeObserver.PreDrawEventArgs e)
{
AdjustHeightRequest(Element, Control);
}
}
}

23
BookAStar/BookAStar.Droid/Markdown/MarkdownWebChromeClient.cs Normal file
View file

@ -0,0 +1,23 @@
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;
namespace BookAStar.Droid.Markdown
{
class MarkdownWebChromeClient : WebChromeClient
{
/*public override void OnConsoleMessage(string message, int lineNumber, string sourceID)
{
base.OnConsoleMessage(message, lineNumber, sourceID);
}*/
}
}

146
BookAStar/BookAStar.Droid/MarkdownViewRenderer.cs
View file

@ -1,146 +0,0 @@
using BookAStar.Views;
using Android.Webkit;
using Xamarin.Forms.Platform.Android;
using BookAStar.Droid;
using System;
using Java.Interop;
using System.ComponentModel;
using Android.Views;
[assembly: Xamarin.Forms.ExportRenderer(typeof(MarkdownView), typeof(MarkdownViewRenderer))]
namespace BookAStar.Droid
{
public class JsBridgeMarkdown : Java.Lang.Object
{
readonly WeakReference<MarkdownViewRenderer> hybridWebViewRenderer;
public JsBridgeMarkdown(MarkdownViewRenderer hybridRenderer)
{
hybridWebViewRenderer = new WeakReference<MarkdownViewRenderer>(hybridRenderer);
}
[JavascriptInterface]
[Export("invokeAction")]
public void InvokeAction(string data)
{
MarkdownViewRenderer hybridRenderer;
if (hybridWebViewRenderer != null && hybridWebViewRenderer.TryGetTarget(out hybridRenderer))
{
hybridRenderer.Element.Markdown = data;
MarkdownViewRenderer.AdjustHeightRequest(hybridRenderer.Element,
hybridRenderer.EditorView);
}
}
}
public class MarkdownViewRenderer : ViewRenderer<MarkdownView, WebView>
{
private WebView editorView;
private MarkdownEditor editorTemplate = new MarkdownEditor();
private MarkdownDeep.Markdown markdown = new MarkdownDeep.Markdown();
const string JavaScriptFunction = "function invokeCSharpAction(data){jsBridge.invokeAction(data);}";
public WebView EditorView
{
get
{
return editorView;
}
}
/// <summary>
/// To be called once document finished loading
/// </summary>
/// <param name="xview"></param>
/// <param name="view"></param>
public static async void AdjustHeightRequest(MarkdownView xview, WebView view)
{
xview.BatchBegin();
var vch = view.ContentHeight; // FIXME why not 3?
xview.HeightRequest = vch > xview.MinimumHeightRequest ? vch : xview.MinimumHeightRequest;
xview.BatchCommit();
}
private void SetMDEditorText(string text)
{
editorTemplate.Model = (text == null) ? null : markdown.Transform(text);
var html = editorTemplate.GenerateString();
EditorView.LoadDataWithBaseURL("file:///android_asset/",
html, "text/html", "utf-8", null);
}
protected override void OnElementChanged(ElementChangedEventArgs<MarkdownView> e)
{
base.OnElementChanged(e);
if (Control == null)
{
SetNativeControl(CreateNativeControl());
InjectJS(JavaScriptFunction);
}
if (e.OldElement != null)
{
// Unsubscribe
}
if (e.NewElement != null)
{
// Subscribe
var viewclient = new MarkdownWebViewClient(
md => { e.NewElement.Markdown = md; });
EditorView.SetWebViewClient(viewclient);
Control.AddJavascriptInterface(new JsBridgeMarkdown(this), "jsBridge");
SetMDEditorText(e.NewElement.Markdown);
}
}
void InjectJS(string script)
{
if (Control != null)
{
Control.LoadUrl(string.Format("javascript: {0}", script));
}
}
private WebView CreateNativeControl()
{
editorView = new WebView(Context);
EditorView.Settings.BuiltInZoomControls = false;
EditorView.Settings.JavaScriptEnabled = true;
EditorView.Settings.LoadsImagesAutomatically = true;
EditorView.Settings.SetAppCacheEnabled(true);
EditorView.Settings.AllowContentAccess = true;
EditorView.Settings.AllowFileAccess = true;
EditorView.Settings.AllowFileAccessFromFileURLs = true;
EditorView.Settings.AllowUniversalAccessFromFileURLs = true;
EditorView.Settings.BlockNetworkImage = false;
EditorView.Settings.BlockNetworkLoads = false;
EditorView.Settings.DomStorageEnabled = true;
// editorView.SetMinimumHeight(300);
return EditorView;
}
// FIXME no impact...
protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
{
MeasureSpecMode widthMode = MeasureSpec.GetMode(widthMeasureSpec);
MeasureSpecMode heightMode = MeasureSpec.GetMode(heightMeasureSpec);
int widthSize = MeasureSpec.GetSize(widthMeasureSpec);
int heightSize = MeasureSpec.GetSize(heightMeasureSpec);
int pxHeight = (int)ContextExtensions.ToPixels(Context, Element.HeightRequest);
int pxWidth = (int)ContextExtensions.ToPixels(Context, Element.WidthRequest);
var measuredWidth = widthMode != MeasureSpecMode.Exactly ? (widthMode != MeasureSpecMode.AtMost ? pxHeight : Math.Min(pxHeight, widthSize)) : widthSize;
var measuredHeight = heightMode != MeasureSpecMode.Exactly ? (heightMode != MeasureSpecMode.AtMost ? pxWidth : Math.Min(pxWidth, heightSize)) : heightSize;
SetMeasuredDimension(measuredWidth, measuredHeight< Element.HeightRequest ? (int) Element.HeightRequest : measuredHeight);
}
/*
protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
{
Element.Layout(new Xamarin.Forms.Rectangle(0, 0, ContextExtensions.FromPixels(Context, right - left), ContextExtensions.FromPixels(Context, bottom - top)));
base.OnLayout(changed, left, top, right, bottom);
}
*/
}
}

37
BookAStar/BookAStar.Droid/MarkdownWebViewClient.cs
View file

@ -1,37 +0,0 @@
using System;
using Android.App;
using Android.Webkit;
namespace BookAStar.Droid
{
class MarkdownWebViewClient : WebViewClient
{
Action<string> update;
public MarkdownWebViewClient(Action<string> update) : base()
{
this.update = update;
}
private static Activity getActivity ()
{
return (Activity)App.PlatformSpecificInstance;
}
public string Markdown { get; private set; }
public override WebResourceResponse ShouldInterceptRequest(WebView view, IWebResourceRequest request)
{
if (request.Url.Scheme=="file")
{
if (request.Url.Path=="/android_asset/validate")
{
// TODO Better,
// by inspecting the form entries from the view
Markdown = request.Url.GetQueryParameter("md");
update(Markdown);
return new WebResourceResponse("application/json", "utf-8" ,200, "Ok", null, null);
}
}
return base.ShouldInterceptRequest(view, request);
}
}
}