diff options
author | Rui Marinho <me@ruimarinho.net> | 2017-01-27 12:52:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 12:52:38 (GMT) |
commit | 004197380ae45d394fcf3b0e8cc53ab840135433 (patch) | |
tree | 4445d8507e6b05db8d5d729afb8e3089002507a3 /Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs | |
parent | de96051a2eef9073574e0b45470b4a0feefc4930 (diff) | |
download | xamarin-forms-004197380ae45d394fcf3b0e8cc53ab840135433.zip xamarin-forms-004197380ae45d394fcf3b0e8cc53ab840135433.tar.gz xamarin-forms-004197380ae45d394fcf3b0e8cc53ab840135433.tar.bz2 |
Add MacOS gallery and UITest (#721)
* [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] dix formatting
* [MacOS] Fix build
* [MacOS] Fix bug on TabbedPageRenderer no title
* [MacOS,UITest] Update packages
* [MacOS ,UITest] Add delay when tapping something, and focus with double click
* [MacOS,UITest] Ignore UITest, not possible to test with current version
* [MacOS,UITest] Ignore test that uses Frame, UITest doesn’t return it
* [MacOS] Fix bug when no title on toolbar items
* [MacOS] Remove FormsNSView
* [MacOS] Cleanup on dispose on MDP renderer
* [MacOS] Different way to test leak of MDP, need to look at this again after
* [MacOS] Update current page when source changes
* [MacOS] More cleanup
* [MacOS,UITest] Implement ClearText
* [MacOS,UITest] ClearText doesn’t work for now on MacOS uitest
* [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,UITest] Don’t try to scroll for the element
* [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
* [Controls] Add missing image
* [MacOS] Clear renderers before setting them MDP
* [MacOS] Update tabbedPage ContainerArea
* [Controls] Add Custom renderers tests
* [MacOS] Fix ListViewRenderer
* [MacOS,UITest] Refactoring, implement index
* [MacOS] Make sure we don’t pass null to TextField string value
* [MacOS] Support for multiple clicks in same selected item on NSTableView
* [MacOS, UITest] Fix bug on Back because of refactoring
* [MacOS,UITest] Ignore UITest because we’d-not have ScrollDownTo yet
* [MacOS] Support Focus on EntryRenderer
* [MacOS,UITest] Ignore more a couple of tests that we can’t test on UITest Desktop
* [MacOS,UITest] MacOSApp looks for StaticText fields too
* [MacOS, UITest] Fix EnterText for marked Entry
* [MacOS] Fix index bug on TablevIewDataSource
* [MacOS] Fix SelectedItem TableViewDataSource
* [Nuget] Add Mac to Maps nuspec
* [Nuget]Fix path
* [Controls] Add basic FormsGallery sample
* [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
* [UItest] Ignore this part of the test we can’t click on NSViews yet
* [MacOS] Rename to IsOnViewCell
* fix docs
* [MacOS] Cleanup, Address feedback from Samantha’s review
* [MacOS] Add ContextActions
* [Controls] Remove FormsGalery for now
* [Docs] Update docs
* [MacOS] Implement ContextActions
* [MacOS,UITests] Enable and support UITests of ContextActions
Diffstat (limited to 'Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs')
-rw-r--r-- | Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs | 346 |
1 files changed, 346 insertions, 0 deletions
diff --git a/Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs b/Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs new file mode 100644 index 0000000..ae05889 --- /dev/null +++ b/Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs @@ -0,0 +1,346 @@ +using System; +using System.Collections.Generic; +using AppKit; +using CoreGraphics; +using Foundation; +using Xamarin.Forms; +using Xamarin.Forms.ControlGallery.MacOS; +using Xamarin.Forms.Controls.Issues; +using Xamarin.Forms.Platform.MacOS; + +[assembly: ExportRenderer(typeof(NativeCell), typeof(NativeMacCellRenderer))] +[assembly: ExportRenderer(typeof(NativeListView2), typeof(NativeMacOSListViewRenderer))] +[assembly: ExportRenderer(typeof(NativeListView), typeof(NativeListViewRenderer))] +namespace Xamarin.Forms.ControlGallery.MacOS +{ + public class NativeMacOSListViewRenderer : ViewRenderer<NativeListView2, NSView> + { + NSTableView _nsTableView; + public NativeMacOSListViewRenderer() + { + } + + protected override void OnElementChanged(ElementChangedEventArgs<NativeListView2> e) + { + base.OnElementChanged(e); + + if (Control == null) + { + var scroller = new NSScrollView + { + AutoresizingMask = NSViewResizingMask.HeightSizable | NSViewResizingMask.WidthSizable, + DocumentView = _nsTableView = new NSTableView().AsListViewLook() + }; + + _nsTableView.RowHeight = 60; + SetNativeControl(scroller); + } + + if (e.OldElement != null) + { + // unsubscribe + } + + if (e.NewElement != null) + { + // subscribe + + var s = new NativeiOSListViewSource(e.NewElement, _nsTableView); + _nsTableView.Source = s; + } + } + + protected override void OnElementPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + { + base.OnElementPropertyChanged(sender, e); + + if (e.PropertyName == NativeListView.ItemsProperty.PropertyName) + { + // update the Items list in the UITableViewSource + var s = new NativeiOSListViewSource(Element, _nsTableView); + _nsTableView.Source = s; + } + } + + public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint) + { + return Control.GetSizeRequest(widthConstraint, heightConstraint, 44, 44); + } + } + + public class NativeListViewRenderer : ViewRenderer<NativeListView, NSView> + { + public NativeListViewRenderer() + { + } + NSTableView table; + protected override void OnElementChanged(ElementChangedEventArgs<NativeListView> e) + { + base.OnElementChanged(e); + + if (Control == null) + { + var scroller = new NSScrollView + { + AutoresizingMask = NSViewResizingMask.HeightSizable | NSViewResizingMask.WidthSizable, + DocumentView = table = new NSTableView().AsListViewLook() + }; + + table.RowHeight = 60; + + SetNativeControl(scroller); + } + + if (e.OldElement != null) + { + // unsubscribe + } + + if (e.NewElement != null) + { + // subscribe + + var s = new NativeListViewSource(e.NewElement, table); + table.Source = s; + } + } + + protected override void OnElementPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) + { + base.OnElementPropertyChanged(sender, e); + + if (e.PropertyName == NativeListView.ItemsProperty.PropertyName) + { + // update the Items list in the UITableViewSource + var s = new NativeListViewSource(Element, table); + table.Source = s; + } + } + + public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint) + { + return Control.GetSizeRequest(widthConstraint, heightConstraint, 44, 44); + } + } + + public class NativeiOSListViewSource : NSTableViewSource + { + IList<DataSource> _tableItems; + NativeListView2 _listView; + readonly NSTableView _nsTableView; + readonly NSString _cellIdentifier = new NSString("TableCell"); + + public IEnumerable<DataSource> Items + { + set { _tableItems = new List<DataSource>(value); } + } + + public NativeiOSListViewSource(NativeListView2 view, NSTableView nsTableView) + { + _tableItems = new List<DataSource>(view.Items); + _listView = view; + _nsTableView = nsTableView; + } + + public override nint GetRowCount(NSTableView tableView) + { + return _tableItems.Count; + } + + public override void SelectionDidChange(NSNotification notification) + { + var selectedRow = (int)_nsTableView.SelectedRow; + if (selectedRow == -1) + return; + _listView.NotifyItemSelected(_tableItems[selectedRow]); + Console.WriteLine("Row " + selectedRow.ToString() + " selected"); + _nsTableView.DeselectRow(selectedRow); + } + + public override NSView GetViewForItem(NSTableView tableView, NSTableColumn tableColumn, nint row) + { + NativeMacOsCell cell = tableView.MakeView(_cellIdentifier, tableView) as NativeMacOsCell; + + if (cell == null) + { + cell = new NativeMacOsCell(_cellIdentifier); + } + int rowNumber = (int)row; + if (string.IsNullOrWhiteSpace(_tableItems[rowNumber].ImageFilename)) + { + cell.UpdateCell(_tableItems[rowNumber].Name + , _tableItems[rowNumber].Category + , null); + } + else + { + cell.UpdateCell(_tableItems[rowNumber].Name + , _tableItems[rowNumber].Category + , new NSImage("Images/" + _tableItems[rowNumber].ImageFilename + ".jpg")); + } + + return cell; + } + } + + public class NativeListViewSource : NSTableViewSource + { + // declare vars + IList<string> _tableItems; + string _cellIdentifier = "TableCell"; + NativeListView _listView; + readonly NSTableView _nsTableView; + + public IEnumerable<string> Items + { + set + { + _tableItems = new List<string>(value); + } + } + + public NativeListViewSource(NativeListView view, NSTableView nsTableView) + { + _tableItems = new List<string>(view.Items); + _listView = view; + _nsTableView = nsTableView; + } + + public override nint GetRowCount(NSTableView tableView) + { + return _tableItems.Count; + } + + public override void SelectionDidChange(NSNotification notification) + { + var selectedRow = (int)_nsTableView.SelectedRow; + if (selectedRow == -1) + return; + _listView.NotifyItemSelected(_tableItems[selectedRow]); + Console.WriteLine("Row " + selectedRow.ToString() + " selected"); + _nsTableView.DeselectRow(selectedRow); + } + + public override NSView GetViewForItem(NSTableView tableView, NSTableColumn tableColumn, nint row) + { + var cell = tableView.MakeView(_cellIdentifier, tableView); + + if (cell == null) + { + cell = new NSView(new CGRect(0, 0, tableView.Frame.Width, tableView.RowHeight)); + var textLabel = new NSTextField(new CGRect(1, 1, tableView.Frame.Width, tableView.RowHeight - 10)); + cell.AddSubview(textLabel); + } + var label = cell.Subviews[0] as NSTextField; + label.StringValue = _tableItems[(int)row]; + return cell; + } + } + + public class NativeMacCellRenderer : ViewCellRenderer + { + static NSString s_rid = new NSString("NativeCell"); + + public NativeMacCellRenderer() + { + } + + public override NSView GetCell(Cell item, NSView reusableView, NSTableView tv) + { + var x = (NativeCell)item; + Console.WriteLine(x); + + NativeMacOsCell c = reusableView as NativeMacOsCell; + + if (c == null) + { + c = new NativeMacOsCell(s_rid); + } + + NSImage i = null; + if (!string.IsNullOrWhiteSpace(x.ImageFilename)) + { + i = new NSImage("Images/" + x.ImageFilename + ".jpg"); + } + + base.WireUpForceUpdateSizeRequested(item, c, tv); + + c.UpdateCell(x.Name, x.Category, i); + + return c; + } + } + + public class NativeMacOsCell : NSView + { + NSTextField _headingLabel; + NSTextField _subheadingLabel; + NSImageView _imageView; + + public NativeMacOsCell() : this(new NSString("NativeMacOsCell")) + { + } + public NativeMacOsCell(NSString cellId) + { + Identifier = cellId; + WantsLayer = true; + Layer.BackgroundColor = NSColor.FromRgb(218, 255, 127).CGColor; + + _imageView = new NSImageView(); + + _headingLabel = new NSTextField() + { + Font = NSFont.FromFontName("Cochin-BoldItalic", 22f), + TextColor = NSColor.FromRgb(127, 51, 0), + BackgroundColor = NSColor.Clear + }; + + _subheadingLabel = new NSTextField() + { + Font = NSFont.FromFontName("AmericanTypewriter", 12f), + TextColor = NSColor.FromRgb(38, 127, 0), + Alignment = NSTextAlignment.Center, + BackgroundColor = NSColor.Clear + }; + + AddSubview(_headingLabel); + AddSubview(_subheadingLabel); + AddSubview(_imageView); + } + + public void UpdateCell(string caption, string subtitle, NSImage image) + { + _imageView.Image = image; + _headingLabel.StringValue = caption; + _subheadingLabel.StringValue = subtitle; + } + + public override void Layout() + { + base.Layout(); + + _imageView.Frame = new CGRect(Bounds.Width - 63, 5, 33, 33); + _headingLabel.Frame = new CGRect(5, 4, Bounds.Width - 63, 25); + _subheadingLabel.Frame = new CGRect(100, 18, 100, 20); + } + } + + public static class NSTableViewExtensions + { + public static NSTableView AsListViewLook(this NSTableView self) + { + self.SelectionHighlightStyle = NSTableViewSelectionHighlightStyle.SourceList; + + self.AllowsColumnReordering = false; + self.AllowsColumnResizing = false; + self.AllowsColumnSelection = false; + + //this is needed .. can we go around it ? + self.AddColumn(new NSTableColumn("1")); + //this line hides the header by default + self.HeaderView = null; + return self; + } + } + +} |