From 7d1cf22fb632cf64fb11a7dda77d26275674faec Mon Sep 17 00:00:00 2001
From: Troy Stanger <stanger@zumero.com>
Date: Wed, 7 Nov 2018 10:33:51 -0600
Subject: [PATCH 1/5] Implemented button images as background images.

---
 Ooui.Forms/Renderers/ButtonRenderer.cs | 51 ++++++++++++++------------
 Ooui/Style.cs                          | 13 ++++++-
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/Ooui.Forms/Renderers/ButtonRenderer.cs b/Ooui.Forms/Renderers/ButtonRenderer.cs
index fc06700..d4c9857 100644
--- a/Ooui.Forms/Renderers/ButtonRenderer.cs
+++ b/Ooui.Forms/Renderers/ButtonRenderer.cs
@@ -110,32 +110,37 @@ namespace Ooui.Forms.Renderers
             Element.SetStyleFont (Element.FontFamily, Element.FontSize, Element.FontAttributes, Control.Style);
         }
 
-        void UpdateImage ()
+        async void UpdateImage ()
         {
-            //IImageSourceHandler handler;
-            //FileImageSource source = Element.Image;
-            //if (source != null && (handler = Internals.Registrar.Registered.GetHandlerForObject<IImageSourceHandler> (source)) != null) {
-            //    UIImage uiimage;
-            //    try {
-            //        uiimage = await handler.LoadImageAsync (source, scale: (float)UIScreen.MainScreen.Scale);
-            //    }
-            //    catch (OperationCanceledException) {
-            //        uiimage = null;
-            //    }
-            //    Ooui.Button button = Control;
-            //    if (button != null && uiimage != null) {
-            //        button.SetImage (uiimage.ImageWithRenderingMode (UIImageRenderingMode.AlwaysOriginal), UIControlState.Normal);
+            IImageSourceHandler handler;
+            FileImageSource source = Element.Image;
 
-            //        button.ImageView.ContentMode = UIViewContentMode.ScaleAspectFit;
+            if (source != null &&
+                (handler = Xamarin.Forms.Internals.Registrar.Registered.GetHandler<IImageSourceHandler>(source.GetType())) != null)
+            {
+                string uiimage;
+                try
+                {
+                    uiimage = await handler.LoadImageAsync(source, scale: 1.0f);
+                }
+                catch (OperationCanceledException)
+                {
+                    uiimage = null;
+                }
 
-            //        ComputeEdgeInsets (Control, Element.ContentLayout);
-            //    }
-            //}
-            //else {
-            //    Control.SetImage (null, UIControlState.Normal);
-            //    ClearEdgeInsets (Control);
-            //}
-            //((IVisualElementController)Element).NativeSizeChanged ();
+                var Button = Control;
+                if (Button != null && uiimage != null)
+                {
+                    Button.Style.BackgroundImage = uiimage;
+                    Button.Style.BackgroundPosition = "center";
+                }
+            }
+            else
+            {
+                Control.Style.BackgroundImage = null;
+                Control.Style.BackgroundPosition = null;
+            }
+            ((IVisualElementController)Element).NativeSizeChanged ();
         }
 
         void UpdateText ()
diff --git a/Ooui/Style.cs b/Ooui/Style.cs
index 5a83415..3460e22 100644
--- a/Ooui/Style.cs
+++ b/Ooui/Style.cs
@@ -32,9 +32,14 @@ namespace Ooui
 
         public Value BackgroundImage {
             get => this["background-image"];
-            set => this["background-image"] = value;
+            set => this["background-image"] = AddUrl(value);
         }
 
+        public Value BackgroundPosition {
+            get => this["background-position"];
+            set => this["background-position"] = value;
+        }
+        
         public Value BorderTopColor {
             get => this["border-top-color"];
             set => this["border-top-color"] = value;
@@ -425,7 +430,11 @@ namespace Ooui
             }
             return o.ToString ();
         }
-
+        static string AddUrl(object val)
+        {
+            return String.Format("url('{0}')", val);
+        }
+        
         static string AddNumberUnits (object val, string units)
         {
             if (val == null)

From 0d316279ec8504bbd1849625ba019ef952c2da9a Mon Sep 17 00:00:00 2001
From: Troy Stanger <stanger@zumero.com>
Date: Wed, 7 Nov 2018 10:41:29 -0600
Subject: [PATCH 2/5] Fix incorrect style when AddUrl is passed null

---
 Ooui/Style.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Ooui/Style.cs b/Ooui/Style.cs
index 3460e22..1d41705 100644
--- a/Ooui/Style.cs
+++ b/Ooui/Style.cs
@@ -432,6 +432,8 @@ namespace Ooui
         }
         static string AddUrl(object val)
         {
+            if (val == null)
+                return null;
             return String.Format("url('{0}')", val);
         }
         

From b29060fea5473cb7c4fb81d0ce4be08e8f1c1b3d Mon Sep 17 00:00:00 2001
From: Troy Stanger <stanger@zumero.com>
Date: Wed, 7 Nov 2018 11:20:39 -0600
Subject: [PATCH 3/5] Implemented actionsheets for Ooui.Forms. AddNumberUnits()
 should be called for margin values.

---
 Ooui.Forms/ActionSheet.cs | 100 ++++++++++++++++++++++++++++++++++++++
 Ooui.Forms/Platform.cs    |  13 +++++
 Ooui/Style.cs             |  16 +++---
 3 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 Ooui.Forms/ActionSheet.cs

diff --git a/Ooui.Forms/ActionSheet.cs b/Ooui.Forms/ActionSheet.cs
new file mode 100644
index 0000000..d0e7ebc
--- /dev/null
+++ b/Ooui.Forms/ActionSheet.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using Xamarin.Forms.Internals;
+
+namespace Ooui.Forms
+{
+    public class ActionSheet
+    {
+        private readonly Button _cancelButton;
+        private readonly List<Button> _buttons;
+
+        public Element Element { get; private set; }
+
+        public ActionSheet(ActionSheetArguments arguments)
+        {
+            Element = new Div();
+            Element.ClassName = "modal-dialog";
+
+            var content = new Div();
+            content.ClassName = "modal-content";
+
+            var header = new Div();
+            header.ClassName = "modal-header";
+
+            var h4 = new Heading(4)
+            {
+                Text = arguments.Title
+            };
+
+            header.AppendChild(h4);
+
+            content.AppendChild(header);
+
+            var body = new Div();
+            body.ClassName = "modal-body";
+
+            content.AppendChild(body);
+
+            _buttons = new List<Button>();
+
+            foreach (var button in arguments.Buttons)
+            {
+                var btnBody = new Div();
+                btnBody.Style.MarginBottom = 5;
+
+                var btn = new Button(button);
+                btn.Style.Width = "100%";
+                btn.ClassName = "btn";
+                btn.Click += (s,e) =>  SetResult(button);
+
+                _buttons.Add(btn);
+
+                btnBody.AppendChild(btn);
+                body.AppendChild(btnBody);
+            }
+
+            if (!string.IsNullOrEmpty(arguments.Cancel))
+            {
+                var footer = new Div();
+                footer.ClassName = "modal-footer";
+
+                _cancelButton = new Button(arguments.Cancel);
+                _cancelButton.ClassName = "btn -btn-default";
+                _cancelButton.Click += (s, e) => SetResult(arguments.Cancel);
+
+                footer.AppendChild(_cancelButton);
+
+                content.AppendChild(footer);
+            }
+
+            Element.AppendChild(content);
+
+            void SetResult(string result)
+            {
+                arguments.SetResult(result);
+            }
+        }
+
+        public event TargetEventHandler Clicked
+        {
+            add
+            {
+                _cancelButton.Click += value;
+                foreach (var btn in _buttons)
+                {
+                    btn.Click += value;
+                }
+
+            }
+            remove
+            {
+                _cancelButton.Click -= value;
+                foreach (var btn in _buttons)
+                {
+                    btn.Click -= value;
+                }
+            }
+        }
+    }
+}
diff --git a/Ooui.Forms/Platform.cs b/Ooui.Forms/Platform.cs
index 635fe97..c600a20 100644
--- a/Ooui.Forms/Platform.cs
+++ b/Ooui.Forms/Platform.cs
@@ -45,6 +45,19 @@ namespace Ooui.Forms
                     _renderer.RemoveChild (alert.Element);
                 }
             });
+
+            MessagingCenter.Subscribe(this, Page.ActionSheetSignalName, (Page sender, ActionSheetArguments arguments) =>
+            {
+                var sheet = new ActionSheet(arguments);
+                sheet.Clicked += CloseSheet;
+
+                _renderer.AppendChild(sheet.Element);
+
+                void CloseSheet (object s, EventArgs e)
+                {
+                    _renderer.RemoveChild(sheet.Element);
+                }
+            });
         }
 
         void IDisposable.Dispose ()
diff --git a/Ooui/Style.cs b/Ooui/Style.cs
index 5a83415..03b580b 100644
--- a/Ooui/Style.cs
+++ b/Ooui/Style.cs
@@ -219,31 +219,31 @@ namespace Ooui
 
         public Value MarginTop {
             get => this["margin-top"];
-            set => this["margin-top"] = value;
+            set => this["margin-top"] = AddNumberUnits (value, "px");
         }
 
         public Value MarginRight {
             get => this["margin-right"];
-            set => this["margin-right"] = value;
+            set => this["margin-right"] = AddNumberUnits (value, "px");
         }
 
         public Value MarginBottom {
             get => this["margin-bottom"];
-            set => this["margin-bottom"] = value;
+            set => this["margin-bottom"] = AddNumberUnits (value, "px");
         }
 
         public Value MarginLeft {
             get => this["margin-left"];
-            set => this["margin-left"] = value;
+            set => this["margin-left"] = AddNumberUnits (value, "px");
         }
 
         public Value Margin {
             get => this["margin-top"];
             set {
-                this["margin-top"] = value;
-                this["margin-right"] = value;
-                this["margin-bottom"] = value;
-                this["margin-left"] = value;
+                this["margin-top"] = AddNumberUnits (value, "px");
+                this["margin-right"] = AddNumberUnits (value, "px");
+                this["margin-bottom"] = AddNumberUnits (value, "px");
+                this["margin-left"] = AddNumberUnits (value, "px");
             }
         }
 

From eb2a8ec367815ff7a2c1e498e840ea9c17d389a1 Mon Sep 17 00:00:00 2001
From: Troy Stanger <stanger@zumero.com>
Date: Wed, 7 Nov 2018 12:31:11 -0600
Subject: [PATCH 4/5] Ooui.Forms ListViews now respect the values of
 SeparatorColor and SeparatorVisibility

---
 Ooui.Forms/Renderers/ListViewRenderer.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Ooui.Forms/Renderers/ListViewRenderer.cs b/Ooui.Forms/Renderers/ListViewRenderer.cs
index 98cf5a3..5985f3b 100644
--- a/Ooui.Forms/Renderers/ListViewRenderer.cs
+++ b/Ooui.Forms/Renderers/ListViewRenderer.cs
@@ -108,6 +108,11 @@ namespace Ooui.Forms.Renderers
                 for (var i = listItems.Count; i < items.Count; i++) {
                     var li = new ListItem ();
                     li.Style["list-style-type"] = "none";
+                    if (Element.SeparatorVisibility == SeparatorVisibility.Default)
+                    {
+                        var color = Element.SeparatorColor.ToOouiColor(Color.FromStyleValue("#999"));
+                        li.Style["border-bottom"] = string.Format("{0}px {1} {2}", 1, "solid", color.ToString());
+                    }
                     li.Click += ListItem_Click;
                     Control.AppendChild (li);
                     listItems.Add (li);

From e4cb4e11236a004ddabdc5c6af3cb3f876b2cf88 Mon Sep 17 00:00:00 2001
From: Troy Stanger <stanger@zumero.com>
Date: Fri, 9 Nov 2018 15:20:52 -0600
Subject: [PATCH 5/5] Changes to cell separators now happen more reactively.

---
 Ooui.Forms/Renderers/ListViewRenderer.cs | 32 ++++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/Ooui.Forms/Renderers/ListViewRenderer.cs b/Ooui.Forms/Renderers/ListViewRenderer.cs
index 5985f3b..9f50610 100644
--- a/Ooui.Forms/Renderers/ListViewRenderer.cs
+++ b/Ooui.Forms/Renderers/ListViewRenderer.cs
@@ -41,6 +41,7 @@ namespace Ooui.Forms.Renderers
                 e.NewElement.ScrollToRequested += ListView_ScrollToRequested;
 
                 UpdateItems ();
+                UpdateSeparator ();
                 UpdateBackgroundColor ();
             }
 
@@ -53,6 +54,10 @@ namespace Ooui.Forms.Renderers
 
             if (e.PropertyName == ItemsView<Cell>.ItemsSourceProperty.PropertyName)
                 UpdateItems ();
+            else if (e.PropertyName == Xamarin.Forms.ListView.SeparatorColorProperty.PropertyName)
+                UpdateSeparator ();
+            else if (e.PropertyName == Xamarin.Forms.ListView.SeparatorVisibilityProperty.PropertyName)
+                UpdateSeparator ();
         }
 
         protected override void Dispose (bool disposing)
@@ -76,6 +81,7 @@ namespace Ooui.Forms.Renderers
         private void OnCollectionChanged (object sender, NotifyCollectionChangedEventArgs e)
         {
             UpdateItems ();
+            UpdateSeparator ();
         }
 
         private void UnsubscribeCellClicks ()
@@ -108,11 +114,6 @@ namespace Ooui.Forms.Renderers
                 for (var i = listItems.Count; i < items.Count; i++) {
                     var li = new ListItem ();
                     li.Style["list-style-type"] = "none";
-                    if (Element.SeparatorVisibility == SeparatorVisibility.Default)
-                    {
-                        var color = Element.SeparatorColor.ToOouiColor(Color.FromStyleValue("#999"));
-                        li.Style["border-bottom"] = string.Format("{0}px {1} {2}", 1, "solid", color.ToString());
-                    }
                     li.Click += ListItem_Click;
                     Control.AppendChild (li);
                     listItems.Add (li);
@@ -139,6 +140,27 @@ namespace Ooui.Forms.Renderers
             }
         }
 
+        private void UpdateSeparator()
+        {
+            if (Control == null)
+                return;
+
+            var listItems = Control.Children.OfType<ListItem>().ToList();
+
+            foreach (var li in listItems)
+            {
+                if (Element.SeparatorVisibility == SeparatorVisibility.Default)
+                {
+                    var color = Element.SeparatorColor.ToOouiColor(Color.FromStyleValue("#999"));
+                    li.Style["border-bottom"] = string.Format("{0}px {1} {2}", 1, "solid", color.ToString());
+                } 
+                else
+                {
+                    li.Style["border-bottom"] = null;
+                }
+            }
+        }
+
         void ListItem_Click (object sender, TargetEventArgs e)
         {
             if (Control == null)