diff options
author | Rui Marinho <me@ruimarinho.net> | 2017-01-26 15:33:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-26 15:33:15 +0000 |
commit | 52fc04724fc163c68c54cf33a5931871f8c1ee8e (patch) | |
tree | 28a56527e0886e616735d5334f7b10688c255074 /Xamarin.Forms.Platform.MacOS/Controls | |
parent | 6b2a69d930d42657aff2b9ad769503b4939568ab (diff) | |
download | xamarin-forms-52fc04724fc163c68c54cf33a5931871f8c1ee8e.tar.gz xamarin-forms-52fc04724fc163c68c54cf33a5931871f8c1ee8e.tar.bz2 xamarin-forms-52fc04724fc163c68c54cf33a5931871f8c1ee8e.zip |
MacOS (#650)
* [MacOS] Add SwitchRenderer
* [MacOS] Add TimePickerRenderer
* [MacOS] Cleanup TimePcikerRender
* [MacOS] Add WebViewRenderer
* [MacOS] Add Javascript evaluate to webview
* [MacOS] Fix build error on WebViewRenderer
* [MacOS] Add Base and TextCell renderers
* [MacOS] Start on ListViewRenderer
* [MacOS] Cleanup
* [MacOS] Vertical center text on default NSTextField
* [MacOS] Center NSTextField vertically
* [MacOS] Add ImageCellRenderer
* [MacOS] Add SwitchCellRenderer
* [MacOS] Add SwitchCellRenderer
* [iOS] Allow to set background color on other CellRenderers
* [MacOS] Fix selection mode on ListView
* [MacOS] Set background on Entry of entry cell
* [MacOS] Fix casting bug on CellRenderer
* [MacOS] Other fix on CellRenderer background
* [MacOS] Add ViewCellRenderer
* [MacOS] Fixes and cleanup on cells
* [MacOS] Add NSScrollView so NSTableView can scroll
* [MacOS] Add HeaderView to ListView
* [MacOS] Cleanup
* [Controls] Add Header support to ListView
* [MacOS] NSView reuse on NSTableView
* [MacOS] Some fix on layour order
* [MacOS] Add CarouselPageRenderer
* [MacOS] Implement EventTracker on PageRenderer
* [MacOS] Cleanup CarouselPageRenderer
* [MacOS] Add MasterDetailPage renderer
* [MacOS] MDP renderer don't allow drag of splitter
* [MacOS] Add TabbedPage renderer
* [MacOS] Initial sketch of NavigationPageRenderer
* [MacOS] Send disappearing of CurrentPage on Dispose on NavigationPageRenderer
* [MacOS] Add Gallery page for Mac
* [MacOS] Add MacOSExpressionSearch
* [MacOS] Fix ColorExtension
* [MacOS] Fix MDP renderer layout
* [MacOS] Implement native selection on ListViewRenderer
* [MacOS] Deselect a item on NSTableView
* [MacOS] Remove previous SplitViewItems
* [MacOS] Fix navigationpage height
* [MacOS] Add toolbar for NavigationPageRenderer
* [MacOS] Don't remove selection for now (crashing)
* [MacOS] Refactor page and back button title on NavigationPageRenderer
* [MacOS] Fix bug when native navigate back
* [MacOS] Hide layer when transition
* [MacOS] ListviewRenderer fix BbackgroundColor
* [MacOS] Fix background on ScrollViewRenderer
* [MacOS] Fix header measure on ListViewRenderer
* [MacOS] Add Mac twitter demo
* [Controls] Spaces for easy reading
* [MacOS] More xaml cleanup
* [Core] Add Mac as aTargetPlatform
* [MacOS] Add alerts and actionsheets
* [MacOS] Add GestureRecognizers
* [MacOS] Fix Layout issues when adding children, enable transformations
* [MacOS] Fix title on tab item, move to tabbed navigation based on segmented control
* [MacOS] Hide toolbar when not needed, this allows to work with tabbed page, cleanup
* [MacOS] Add NativeBindings and NativeViewWrapper
* [MacOS] Fix AssemblyInfo
* [MacOS] FIX NRE on SetBackgroundColor BoxView
* [MacOS] Fix NavigationPageRenderer
* [MacOS] Fix build
* [MacOS] Also update page when it resizes
* [MacOS] Add LayoutRenderer for handle items position when the bounds change.
* [MacOS] Refactor/Cleanup
* [MacOS] Add toolbar items support to NavigationPage
* [MacOS] Resize images for TabViewITems
* [MacOS] Fix TabbedPage resize issues , allow users to override some features when creating TVI
* [MacOS] Fix hide/show Navigation toolbar
* [MacOS] Redo CarouselPageRenderer with NSPageController
* [MacOS] Add support for Modal pages
* [MacOS] Refactor navigation from platform
* [Nuget] Add nuget for MacOS
* [Nuget]Fix nuspec
* [Nuget] Add variables for CI
* [Controls] Remove MainMenu from MacOS
* [MacOS] Add TableView renderer (no headers yet)
* [MacOS] Refactoring, marking extensions as internal
* [MacOS] Add group headers for TableViewRenderer
* [MacOS] Workaround for updates on listview collection
* [MacOS] Handle updates of rows in the ListViewRenderer properly
* [MacOS] Fix navigation animation
* Fix navigation header issues with modal pages
* [MacOS] Fix MDP issues with resizing
* [MacOS] Fix general dispose
* [MacOS] Add a ViewControllerWrapper for NSSplitView
* [MacOS] MDP renderer fix animation
* [MacOS] Fix ListView selection bug
* [MacOS] Fix rendering MDP Layout inside wrappers
* [MacOS] Re write the MainToolbar handler
* [MacOS] Don't use Sierra new extensions so we can run in stable channel
* [MacOS] Another way to hide the toolbar (smarter i think)
* [MacOS] Fix MDP bug and remove debug color
* [Controls] Add HanselForms sample
* [MacOS] Fix NRE WebviewRenderer
* [MacOS] Fix uneven rows on ListView renderer
* [MacOS] Fix NRE on load (can+t find the reason this happens)
* [MacOS] Fix uneven rows
* [MacOS] Fix header sizing on ListViewRenderer
* [Controls] More stuff on HanselForms
* [MacOS] Remove warning from ListViewRenderer
* [MacOS] Fix PageRenderer bug double init
* [MacOS] Don't calculate height if RowHeight is provided
* [Controls] More Hanselforms stuff
* [MacOS] Once again a new implementation for the NavigationBar, this time using a custom view to support BackgroundColor
* [MacOS] Fix build
* [MacOS] Refactoring AwesomeBar related controls
* Fix build
* [MacOS] NavigationBar update background and t test colors
* [MacOS] Fix when we remove navigation so it works when the NavigationRenderer wasn't removed from the parent controller like in a TabbedPage
* [MacOS] Add support for ListView grouping
* [MacOS] Fix image extension method.
* [MacOS] Add base Maps project
* [MacOS] Export MapRenderer
* [MacOS] Add pin click and geocoderbacked for Maps
* [MacOS] Add extra binding project for API not in stable.
* [MacOS] Add MacOS Maps lib
* [MacOS]Fix build on alpha
* [MacOS] Remove MacOS Maps extra binding
* [UITest] Basic macOS setup
* [UITest] Add MacOSApp wrapper implementation
* [MacOS] Set AutomationID
* [UITests] Add ActionSheetUITests to MacOS UITest
* [MacOS] Fix bug on Picker
* [UITests] Link basic uitest basefixture and related files
* [MacOS] Fix pickers reuse
* [UItests] Fix MacOS app path
* [UITest] Ignore UItest for appearing on macOS for now
* [UITest] Update macOS for 2.0.3
* [UITest] Refactor EnterText MacOS app
* [UITest]Fix ViewQuery on MacOS
* [UITest]Fix IsEnabled UItest on macOS
* [UITest] Implement Enter, mark some tests inconclusive fix others
* [MacOS] Implement Entry Completed event
* [UITests] Fix UITest for IsVisible, ignore ToolbarItem test for now
* [UITests] Fix ISVisible again add extra category
* [Controls] Cleanup macOS gallery
* [MacOS] Fix Assembly info
* [Docs] Fix docs
* Fix build
* [Nuget] Fix nuspec
* [Controls] Link files on MacOS
* [Core] Update Forms stack before firing a event saying page was removed, possible breaking change
* [MacOS] Implement RemovePage on NavigationPAgeRenderer
* [UItest] Ignore some , implement back on MacOS UITest app
* [MacOS] Add default back button name (needs to be translated)
* [MacOS] Fix dispose
* [UITest] Make 29257 work on MacOS
* [MacOS] Rename stuff
* [MacOS] More renaming and cleanup
* [MacOS] Share implementations for iOS
* [MacOS] Reuse more IOS extensions
* [MacOS] Reuse FontExtensions
* [MacOS] Share NativeViewWrapper related stuff
* [MAcOS] Share event args and ExportRenderer
* [MacOS] Share platform effect
* [MacOS] Fix build
* [Docs]Fixing docs
* [MacOS] Fix ViewCell reuse
* [Core] Support ListView CachingStrategy on MacOS
* [MacOS] Fix issues with TextCell and ImageCell (we can’t set null to a NSControl value)
* [MacOS] Fix MDP child sizing bug
[UITest] Query marked by id and text
* [MacOS] Comment test related with context actions
* [MacOS] Implement missing stuff on ticker
* [MacOS] Make sure VisualElemenTracker calls the ticker update
* [UITests]Ignore context actions and not possible to test
* [MacOS] Fix Grouping bug on Listview
* [MacOS] Fix selection on Listview when using grouping
* [MacOS] Update navbar when page is popped
* [MacOS] Cleanup NavigationBar
* [Controls] More info on exceptions
* [MacOS] Fix bug animation pop modal
* [MacOS] Bring back BackgroundColor of NavigationBar
* [MacOS] Fix UITest animation delay
* [MacOS] Treat warnings as errors
* [MacOS] Center title on toolbar
* [Core] Add Platform configuration specific for MacOS
* [MacOS] Implement TabbedPage platform specific to handle TabItems on NavigationPage bar
* [MacOS] Fix warning
* [MacOS] Fix bug on SearchBar color
* [MacOS]Fix build
* [MacOS] remove extra dll from maps
* [Docs] Update docs
* [MacOS]Cleanup and refactoring
* Revert "[MacOS] remove extra dll from maps"
This reverts commit 73b948937001fea3f28449a963d0b94943e07aa0.
* [MacOS] Fix wrong refactoring
* [MacOS] Remove gallery and uitest project
* [MacOS] dix formatting
* [MacOS] Remove extra stuff
* Merge branch 'master' into macOS-gallery
* [MacOS] Fix rebase
* [MacOS] Fix TargetPlatform
* fix docs
* [MacOS] Fix bug on TabbedPageRenderer no title
* [MacOS] Remove FormsNSView
* [MacOS] Cleanup on dispose on MDP renderer
* [MacOS] Update current page when source changes
* [MacOS] More cleanup
* [MacOS] Make sure we show the previous page when popping a Modal
* [MacOS] Fix issue with sizing the Header and visibility, remove for now header renderer reuse
* [MacOS] Clean CustomNSTableView
* [MacOS] Share LabelRenderer with iOS
* [MacOS] Share ResourcesProvider with iOS
* [MAcoS] Share VisualElementPackager with iOS
* [MacOS] Share ViewRenderer with iOS
* [MacOS] Merge with VisualElementTracker from iOS
* [MacOS] Merge with EventTracker from iOS
* [MacOS] Merge with VisualElementRenderer of iOS
* [MacOS] Make sure we always have a layer
* [MacOS] Fix Tracker merge with iOS version
* [MacOS] Fix bug with tabbed page on modal without navigation
* [Core] Rever change on core
* [MacOS] Clear renderers before setting them MDP
* [MacOS] Update tabbedPage ContainerArea
* [MacOS] Fix ListViewRenderer
* [MacOS] Make sure we don’t pass null to TextField string value
* [MacOS] Support for multiple clicks in same selected item on NSTableView
* [MacOS] Support Focus on EntryRenderer
* [MacOS] Fix index bug on TablevIewDataSource
* [MacOS] Fix SelectedItem TableViewDataSource
* [Nuget] Add Mac to Maps nuspec
* [Nuget]Fix path
* [macOS] Fixed Tab NSImage crash in TabbedPageRenderer (#705)
* [macOS] Fixed Tab NSImage crash in TabbedPageRenderer
* Coding Style
* Coding Style
* [MacOS] Fix previous merge with master
* [MacOS] Possible simple fix for click on views overlapping
* [MacOS] Rename to IsOnViewCell
* [MacOS] Cleanup, Address feedback from Samantha’s review
Diffstat (limited to 'Xamarin.Forms.Platform.MacOS/Controls')
7 files changed, 246 insertions, 0 deletions
diff --git a/Xamarin.Forms.Platform.MacOS/Controls/FormsImageView.cs b/Xamarin.Forms.Platform.MacOS/Controls/FormsImageView.cs new file mode 100644 index 00000000..33ed73b6 --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Controls/FormsImageView.cs @@ -0,0 +1,16 @@ +using AppKit; + +namespace Xamarin.Forms.Platform.MacOS +{ + internal class FormsNSImageView : NSImageView + { + bool _isOpaque; + + public void SetIsOpaque(bool isOpaque) + { + _isOpaque = isOpaque; + } + + public override bool IsOpaque => _isOpaque; + } +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.MacOS/Controls/FormsPageControllerDelegate.cs b/Xamarin.Forms.Platform.MacOS/Controls/FormsPageControllerDelegate.cs new file mode 100644 index 00000000..5fb7455c --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Controls/FormsPageControllerDelegate.cs @@ -0,0 +1,29 @@ +using System; +using AppKit; +using Foundation; + +namespace Xamarin.Forms.Platform.MacOS +{ + internal class FormsPageControllerDelegate : NSPageControllerDelegate + { + readonly Func<NSObject, string> _getIdentifier; + readonly Func<string, NSViewController> _getViewController; + + public FormsPageControllerDelegate(Func<NSObject, string> getIdentifier, + Func<string, NSViewController> getViewController) + { + _getIdentifier = getIdentifier; + _getViewController = getViewController; + } + + public override NSViewController GetViewController(NSPageController pageController, string identifier) + { + return _getViewController(identifier); + } + + public override string GetIdentifier(NSPageController pv, NSObject obj) + { + return _getIdentifier(obj); + } + } +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.MacOS/Controls/MacOSOpenGLView.cs b/Xamarin.Forms.Platform.MacOS/Controls/MacOSOpenGLView.cs new file mode 100644 index 00000000..1fc23876 --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Controls/MacOSOpenGLView.cs @@ -0,0 +1,12 @@ +using AppKit; + +namespace Xamarin.Forms.Platform.MacOS +{ + //TODO: Still not implemented on MacOS + public class MacOSOpenGLView : NSView + { + public MacOSOpenGLView() + { + } + } +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.MacOS/Controls/NSToolbarItemGroup.cs b/Xamarin.Forms.Platform.MacOS/Controls/NSToolbarItemGroup.cs new file mode 100644 index 00000000..ee02293c --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Controls/NSToolbarItemGroup.cs @@ -0,0 +1,102 @@ +using System; +using System.Runtime.InteropServices; +using AppKit; +using Foundation; +using ObjCRuntime; + +[Register("NSToolbarItemGroup", true)] +// ReSharper disable once CheckNamespace +// ReSharper disable once InconsistentNaming +public class NSToolbarItemGroup : NSToolbarItem +{ + const string SelSetSubitems = "setSubitems:"; + const string SelSubitems = "subitems"; + const string SelInitWithItemIdentifier = "initWithItemIdentifier:"; + static readonly IntPtr s_selSetSubitemsHandle = Selector.GetHandle(SelSetSubitems); + static readonly IntPtr s_selSubitemsHandle = Selector.GetHandle(SelSubitems); + static readonly IntPtr s_selInitWithItemIdentifierHandle = Selector.GetHandle(SelInitWithItemIdentifier); + static readonly IntPtr s_classPtr = Class.GetHandle("NSToolbarItemGroup"); + + [Export("init")] + public NSToolbarItemGroup() : base(NSObjectFlag.Empty) + { + InitializeHandle( + IsDirectBinding + ? IntPtr_objc_msgSend(Handle, Selector.GetHandle("init")) + : IntPtr_objc_msgSendSuper(SuperHandle, Selector.GetHandle("init")), "init"); + } + + [Export("initWithItemIdentifier:")] + public NSToolbarItemGroup(string itemIdentifier) + : base(NSObjectFlag.Empty) + { + NSApplication.EnsureUIThread(); + if (itemIdentifier == null) + throw new ArgumentNullException(nameof(itemIdentifier)); + IntPtr nsitemIdentifier = NSString.CreateNative(itemIdentifier); + + InitializeHandle( + IsDirectBinding + ? IntPtr_objc_msgSend_IntPtr(Handle, s_selInitWithItemIdentifierHandle, nsitemIdentifier) + : IntPtr_objc_msgSendSuper_IntPtr(SuperHandle, s_selInitWithItemIdentifierHandle, nsitemIdentifier), + "initWithItemIdentifier:"); + NSString.ReleaseNative(nsitemIdentifier); + } + + protected internal NSToolbarItemGroup(IntPtr handle) : base(handle) + { + } + + protected NSToolbarItemGroup(NSObjectFlag t) : base(t) + { + } + + public override IntPtr ClassHandle => s_classPtr; + + public virtual NSToolbarItem[] Subitems + { + [Export(SelSubitems, ArgumentSemantic.Copy)] + get + { + NSApplication.EnsureUIThread(); + NSToolbarItem[] ret = + NSArray.ArrayFromHandle<NSToolbarItem>(IsDirectBinding + ? IntPtr_objc_msgSend(Handle, s_selSubitemsHandle) + : IntPtr_objc_msgSendSuper(SuperHandle, s_selSubitemsHandle)); + return ret; + } + + [Export(SelSetSubitems, ArgumentSemantic.Copy)] + set + { + NSApplication.EnsureUIThread(); + if (value == null) + throw new ArgumentNullException(nameof(value)); + // ReSharper disable once CoVariantArrayConversion + NSArray nsaValue = NSArray.FromNSObjects(value); + + if (IsDirectBinding) + void_objc_msgSend_IntPtr(Handle, s_selSetSubitemsHandle, nsaValue.Handle); + else void_objc_msgSendSuper_IntPtr(SuperHandle, s_selSetSubitemsHandle, nsaValue.Handle); + nsaValue.Dispose(); + } + } + + [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] + public static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, IntPtr selector); + + [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] + public static extern IntPtr IntPtr_objc_msgSend_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1); + + [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSendSuper")] + public static extern IntPtr IntPtr_objc_msgSendSuper(IntPtr receiver, IntPtr selector); + + [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSendSuper")] + public static extern IntPtr IntPtr_objc_msgSendSuper_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1); + + [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSend")] + public static extern void void_objc_msgSend_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1); + + [DllImport("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSendSuper")] + public static extern void void_objc_msgSendSuper_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1); +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.MacOS/Controls/NavigationChildPageWrapper.cs b/Xamarin.Forms.Platform.MacOS/Controls/NavigationChildPageWrapper.cs new file mode 100644 index 00000000..a0e6dd41 --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Controls/NavigationChildPageWrapper.cs @@ -0,0 +1,41 @@ +using System; +using Foundation; + +namespace Xamarin.Forms.Platform.MacOS +{ + internal class NavigationChildPageWrapper : NSObject + { + bool _disposed; + + public NavigationChildPageWrapper(Page page) + { + Page = page; + Page.PropertyChanged += PagePropertyChanged; + Identifier = Guid.NewGuid().ToString(); + } + + protected override void Dispose(bool disposing) + { + if (disposing && !_disposed) + { + _disposed = true; + if (Page != null) + Page.PropertyChanged -= PagePropertyChanged; + Page = null; + } + base.Dispose(disposing); + } + + void PagePropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + { + if (e.PropertyName == NavigationPage.HasNavigationBarProperty.PropertyName + || e.PropertyName == Page.TitleProperty.PropertyName + || e.PropertyName == NavigationPage.HasBackButtonProperty.PropertyName) + Platform.NativeToolbarTracker.UpdateToolBar(); + } + + public string Identifier { get; set; } + + public Page Page { get; private set; } + } +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.MacOS/Controls/ScrollViewScrollChangedEventArgs.cs b/Xamarin.Forms.Platform.MacOS/Controls/ScrollViewScrollChangedEventArgs.cs new file mode 100644 index 00000000..a8a825c0 --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Controls/ScrollViewScrollChangedEventArgs.cs @@ -0,0 +1,10 @@ +using System; +using PointF = CoreGraphics.CGPoint; + +namespace Xamarin.Forms.Platform.MacOS +{ + internal class ScrollViewScrollChangedEventArgs : EventArgs + { + public PointF CurrentScrollPoint { get; set; } + } +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.MacOS/Controls/VerticallyCenteredTextFieldCell.cs b/Xamarin.Forms.Platform.MacOS/Controls/VerticallyCenteredTextFieldCell.cs new file mode 100644 index 00000000..397f632c --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Controls/VerticallyCenteredTextFieldCell.cs @@ -0,0 +1,36 @@ +using System; +using AppKit; +using CoreGraphics; + +namespace Xamarin.Forms.Platform.MacOS +{ + sealed class VerticallyCenteredTextFieldCell : NSTextFieldCell + { + readonly nfloat _yOffset; + + public VerticallyCenteredTextFieldCell(nfloat yOffset, NSFont font = null) + { + if (font != null) + Font = font; + _yOffset = yOffset; + } + + public override CGRect DrawingRectForBounds(CGRect theRect) + { + // Get the parent's idea of where we should draw. + CGRect newRect = base.DrawingRectForBounds(theRect); + + // Ideal size for the text. + CGSize textSize = CellSizeForBounds(theRect); + + // Center in the rect. + nfloat heightDelta = newRect.Size.Height - textSize.Height; + if (heightDelta > 0) + { + newRect.Size = new CGSize(newRect.Width, newRect.Height - heightDelta); + newRect.Location = new CGPoint(newRect.X, newRect.Y + heightDelta / 2 + _yOffset); + } + return newRect; + } + } +}
\ No newline at end of file |