XF Upgrade 4.4

Fabulous.XamarinForms/samples/AllControls/AllControls/AllControls.fs

@@ -34,6 +34,7 @@ type RootPageKind =
     | SkiaCanvas
     | MapSamples
     | OxyPlotSamples
+    | SwipeSample
     //| VideoSamples
     //| CachedImageSamples
 
@@ -395,6 +396,7 @@ module App =
                                     View.Button(text = "Skia Canvas", command = (fun () -> dispatch (SetRootPageKind SkiaCanvas)))
                                     View.Button(text = "Map Samples", command = (fun () -> dispatch (SetRootPageKind MapSamples)))
                                     View.Button(text = "OxyPlot Samples", command = (fun () -> dispatch (SetRootPageKind OxyPlotSamples)))
+                                    View.Button(text = "SwipeView Samples", command = (fun () -> dispatch (SetRootPageKind SwipeSample)))
                                     //View.Button(text = "VideoManager Samples", command = (fun () -> dispatch (SetRootPageKind VideoSamples)))
                                     //View.Button(text = "CachedImage Samples", command = (fun () -> dispatch (SetRootPageKind CachedImageSamples)))
                             ])),
@@ -950,10 +952,12 @@ module App =
     let carouselViewSample model dispatch =
         match Device.RuntimePlatform with
         | Device.iOS | Device.Android -> 
+            let carouselRef = ViewRef<CustomCarouselView>()
             View.ContentPage(
                 View.StackLayout 
                   [
                     mainPageButton dispatch
+
                     View.CarouselView(items = 
                       [
                         View.Label(text="Person1") 
@@ -969,7 +973,8 @@ module App =
                         View.Label(text="Person12")
                         View.Label(text="Person13")
                         View.Label(text="Person14")
-                      ], margin= Thickness 10.)
+                      ], margin= Thickness 10., ref=carouselRef)
+                    View.IndicatorView(itemsSourceBy=carouselRef)
                   ]
             )
 
@@ -1261,7 +1266,34 @@ module App =
                     View.Label(text="OxyPlot for XamarinForms 1.0.0 does not support your platform")
                     View.Label(text="For status see https://github.com/oxyplot/oxyplot-xamarin")
                   ])
-
+
+    let swipeViewSample model dispatch =
+        View.ContentPage(
+            View.SwipeView(
+                leftItems = View.SwipeItems(
+                    sItems = [
+                        View.SwipeItem(text="Left 1", backgroundColor=Color.LightPink)
+                        View.SwipeItem(text="Left 2", backgroundColor=Color.LightGreen)
+                    ]
+                ),
+                rightItems = View.SwipeItems(
+                    sItems = [
+                        View.SwipeItem(text="Right 1", backgroundColor=Color.LightPink)
+                        View.SwipeItem(text="Right 2", backgroundColor=Color.LightGreen)
+                    ]
+                ),
+                content = View.Grid(
+                    height=60.0,
+                    width=300.0,
+                    backgroundColor=Color.LightGray,
+
+                    children = [
+                        View.BoxView(Color.Blue)
+                    ]
+                )
+            )
+        )
+
     // let videoSamples model dispatch = 
     //     View.ScrollingContentPage("VideoManager Sample", [ 
     //         mainPageButton dispatch
@@ -1321,6 +1353,7 @@ module App =
         //| VideoSamples -> videoSamples model dispatch
         //| CachedImageSamples -> chachedImageSamples model dispatch
         | OxyPlotSamples -> oxyPlotSamples model dispatch
+        | SwipeSample -> swipeViewSample model dispatch
 
 
 type App () as app = 

Fabulous.XamarinForms/samples/AllControls/Droid/MainActivity.fs

@@ -20,7 +20,8 @@ type MainActivity() =
 
     override this.OnCreate (bundle: Bundle) =
         base.OnCreate (bundle)
-        global.Xamarin.Forms.Forms.SetFlags([|"Shell_Experimental"; "CollectionView_Experimental"; "Visual_Experimental"|])
+        global.Xamarin.Forms.Forms.SetFlags([|"Shell_Experimental"; "CollectionView_Experimental"; "Visual_Experimental"; 
+                                                "IndicatorView_Experimental"; "SwipeView_Experimental"|])
 
         Xamarin.Forms.Forms.Init (this, bundle)
         Xamarin.FormsMaps.Init(this, bundle) 

Fabulous.XamarinForms/samples/AllControls/iOS/AppDelegate.fs

@@ -13,7 +13,8 @@ type AppDelegate () =
     let mutable _app: AllControls.App option = None
 
     override this.FinishedLaunching (uiApp, options) =
-        Xamarin.Forms.Forms.SetFlags([|"Shell_Experimental"; "CollectionView_Experimental"; "Visual_Experimental"|]);
+        Xamarin.Forms.Forms.SetFlags([|"Shell_Experimental"; "CollectionView_Experimental"; "Visual_Experimental"; 
+                                        "IndicatorView_Experimental"; "SwipeView_Experimental"|]);
         Forms.Init()
         Xamarin.FormsMaps.Init() 
         OxyPlot.Xamarin.Forms.Platform.iOS.PlotViewRenderer.Init()

Fabulous.XamarinForms/src/Fabulous.XamarinForms.Core/CustomControls.fs

@@ -189,13 +189,21 @@ type CustomTimePicker() =
         if propertyName = "Time" then
             timeChanged.Trigger(this, this.Time)
 
+type CustomIndicatorView() = 
+    inherit IndicatorView(IndicatorTemplate = ViewElementDataTemplateSelector())
+
 /// Itemslayout for CarouselView
 type VerticalLinearItemsLayout() = 
     inherit LinearItemsLayout(ItemsLayoutOrientation.Vertical)
-
+    
 type HorizontalLinearItemsLayout() = 
     inherit LinearItemsLayout(ItemsLayoutOrientation.Horizontal)
 
+type CarouselVerticalItemsLayout() =
+    inherit LinearItemsLayout(ItemsLayoutOrientation.Vertical, 
+        SnapPointsType = SnapPointsType.MandatorySingle, 
+        SnapPointsAlignment = SnapPointsAlignment.Center)
+
 /////////////////
 /// Pages
 /////////////////

Fabulous.XamarinForms/src/Fabulous.XamarinForms.Core/ViewConverters.fs

@@ -167,4 +167,9 @@ module ViewConverters =
     let makeCustomTimePickerTimeChangedEventHandler f =
         System.EventHandler<System.TimeSpan>(fun sender args ->
             f args    
+        )    
+
+    let makeSwipeItemsChangedEventHandler f =
+        System.Collections.Specialized.NotifyCollectionChangedEventHandler(fun sender args ->
+            f args
         )

Fabulous.XamarinForms/src/Fabulous.XamarinForms.Core/ViewHelpers.fs

@@ -167,4 +167,4 @@ module ViewHelpers =
                 let update (_prevOpt: ViewElement voption) (_source: ViewElement) (_target: obj) = ()
                 let res = ViewElement(externalObj.GetType(), create, update, attribs)
                 externalsTable.Add(externalObj, res)
-                res
+                res

Fabulous.XamarinForms/src/Fabulous.XamarinForms.Core/ViewUpdaters.fs

@@ -675,6 +675,18 @@ module ViewUpdaters =
             let realTarget = (target :> Xamarin.Forms.IShellContentController).Page
             if realTarget <> null then currValue.UpdateIncremental(prevValue, realTarget)            
         | ValueSome _, ValueNone -> target.ContentTemplate <- null
+
+    let updateShellNavBarHasShadow prevValueOpt currValueOpt target =
+        match prevValueOpt, currValueOpt with
+        | ValueSome prevValue, ValueSome currValue when prevValue = currValue -> ()
+        | ValueNone, ValueNone -> ()
+        | _, ValueSome currValue -> Shell.SetNavBarHasShadow(target, currValue)
+        | ValueSome _, ValueNone -> 
+            let hasShadow = 
+                match Device.RuntimePlatform with
+                | Device.Android -> true
+                | _ -> false
+            Shell.SetNavBarHasShadow(target, hasShadow)
 
     let updatePageUseSafeArea (prevValueOpt: bool voption) (currValueOpt: bool voption) (target: Xamarin.Forms.Page) =
         let setUseSafeArea newValue =
@@ -723,4 +735,20 @@ module ViewUpdaters =
         | ValueSome prevValue, ValueSome currValue when prevValue = currValue -> ()
         | ValueNone, ValueNone -> ()
         | _, ValueSome currValue -> Element.SetMenu(target, currValue.Create() :?> Menu)
-        | ValueSome _, ValueNone -> Element.SetMenu(target, null)
+        | ValueSome _, ValueNone -> Element.SetMenu(target, null)
+
+    let updateIndicatorViewItemsSourceBy (prevValueOpt: ViewRef<CustomCarouselView> voption) (currValueOpt: ViewRef<CustomCarouselView> voption) (target: Xamarin.Forms.IndicatorView) =
+        match prevValueOpt, currValueOpt with
+        | ValueSome prevValue, ValueSome currValue when prevValue = currValue -> ()
+        | ValueNone, ValueNone -> ()
+        | _, ValueSome currValue -> 
+            match currValue.TryValue with
+            | Some v -> IndicatorView.SetItemsSourceBy(target, v)
+            | None -> IndicatorView.SetItemsSourceBy(target, null)
+        | ValueSome _, ValueNone -> IndicatorView.SetItemsSourceBy(target, null)
+
+    let updateSwipeItems (prevCollOpt: ViewElement array voption) (collOpt: ViewElement array voption) (target: Xamarin.Forms.SwipeItems) =
+        let create (desc: ViewElement) =
+            desc.Create() :?> Xamarin.Forms.ISwipeItem
+
+        updateCollectionGeneric prevCollOpt collOpt target create (fun _ _ _ -> ()) (fun _ _ -> true) updateChild