From 52fc04724fc163c68c54cf33a5931871f8c1ee8e Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 26 Jan 2017 15:33:15 +0000 Subject: MacOS (#650) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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 --- .../Renderers/TabbedPageRenderer.cs | 403 +++++++++++++++++++++ 1 file changed, 403 insertions(+) create mode 100644 Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs (limited to 'Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs') diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs new file mode 100644 index 00000000..3aee095d --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs @@ -0,0 +1,403 @@ +using System; +using System.Collections.Specialized; +using System.ComponentModel; +using AppKit; +using CoreGraphics; +using Xamarin.Forms.Internals; +using Xamarin.Forms.PlatformConfiguration.macOSSpecific; + +namespace Xamarin.Forms.Platform.MacOS +{ + public class TabbedPageRenderer : NSTabViewController, IVisualElementRenderer, IEffectControlProvider + { + const float DefaultImageSizeSegmentedButton = 19; + const int TabHolderHeight = 30; + + bool _disposed; + bool _updatingControllers; + bool _barBackgroundColorWasSet; + bool _barTextColorWasSet; + bool _defaultBarTextColorSet; + bool _defaultBarColorSet; + VisualElementTracker _tracker; + bool _loaded; + Size _queuedSize; + + + public VisualElement Element { get; private set; } + + public event EventHandler ElementChanged; + + public SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint) + { + return NativeView.GetSizeRequest(widthConstraint, heightConstraint); + } + + public NSView NativeView => View; + + public void SetElement(VisualElement element) + { + var oldElement = Element; + Element = element; + + if (oldElement != null) + { + oldElement.PropertyChanged -= OnPropertyChanged; + var tabbedPage = oldElement as TabbedPage; + if (tabbedPage != null) tabbedPage.PagesChanged -= OnPagesChanged; + } + + if (element != null) + { + if (_tracker == null) + { + _tracker = new VisualElementTracker(this); + _tracker.NativeControlUpdated += (sender, e) => UpdateNativeWidget(); + } + } + + OnElementChanged(new VisualElementChangedEventArgs(oldElement, element)); + + ConfigureTabView(); + + OnPagesChanged(null, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset)); + + Tabbed.PropertyChanged += OnPropertyChanged; + Tabbed.PagesChanged += OnPagesChanged; + + UpdateBarBackgroundColor(); + + UpdateBarTextColor(); + + EffectUtilities.RegisterEffectControlProvider(this, oldElement, element); + } + + IPageController PageController => Element as IPageController; + + IElementController ElementController => Element; + + void IEffectControlProvider.RegisterEffect(Effect effect) + { + var platformEffect = effect as PlatformEffect; + if (platformEffect != null) + platformEffect.Container = View; + } + + public void SetElementSize(Size size) + { + if (_loaded) + Element.Layout(new Rectangle(Element.X, Element.Y, size.Width, size.Height)); + else + _queuedSize = size; + } + + public NSViewController ViewController => this; + + public override void ViewWillLayout() + { + base.ViewWillLayout(); + + if (Element == null) + return; + + if (!Element.Bounds.IsEmpty) + View.Frame = new System.Drawing.RectangleF((float)Element.X, (float)Element.Y, (float)Element.Width, (float)Element.Height); + + var frame = View.Frame; + PageController.ContainerArea = new Rectangle(0, 0, frame.Width, frame.Height - TabHolderHeight); + + if (!_queuedSize.IsZero) + { + Element.Layout(new Rectangle(Element.X, Element.Y, _queuedSize.Width, _queuedSize.Height)); + _queuedSize = Size.Zero; + } + + _loaded = true; + } + + + public override nint SelectedTabViewItemIndex + { + get { return base.SelectedTabViewItemIndex; } + set + { + base.SelectedTabViewItemIndex = value; + if (!_updatingControllers) + UpdateCurrentPage(); + } + } + + public override void ViewDidAppear() + { + PageController.SendAppearing(); + base.ViewDidAppear(); + } + + public override void ViewDidDisappear() + { + base.ViewDidDisappear(); + PageController.SendDisappearing(); + } + + protected override void Dispose(bool disposing) + { + if (disposing && !_disposed) + { + _disposed = true; + PageController.SendDisappearing(); + Tabbed.PropertyChanged -= OnPropertyChanged; + Tabbed.PagesChanged -= OnPagesChanged; + + if (_tracker != null) + { + _tracker.Dispose(); + _tracker = null; + } + } + + base.Dispose(disposing); + } + + protected virtual void ConfigureTabView() + { + View.WantsLayer = true; + TabView.WantsLayer = true; + TabView.DrawsBackground = false; + var tabStyle = Tabbed.OnThisPlatform().GetTabsStyle(); + switch (tabStyle) + { + case TabsStyle.OnNavigation: + case TabsStyle.Hidden: + TabStyle = NSTabViewControllerTabStyle.Unspecified; + break; + case TabsStyle.Icons: + TabStyle = NSTabViewControllerTabStyle.Toolbar; + break; + case TabsStyle.OnBottom: + TabStyle = NSTabViewControllerTabStyle.SegmentedControlOnBottom; + break; + default: + TabStyle = NSTabViewControllerTabStyle.SegmentedControlOnTop; + break; + } + + TabView.TabViewType = NSTabViewType.NSNoTabsNoBorder; + } + + protected virtual void OnElementChanged(VisualElementChangedEventArgs e) + { + ElementChanged?.Invoke(this, e); + } + + protected virtual NSTabViewItem GetTabViewItem(Page page, IVisualElementRenderer pageRenderer) + { + var tvi = new NSTabViewItem { ViewController = pageRenderer.ViewController, Label = page.Title ?? "" }; + if (!string.IsNullOrEmpty (page.Icon)) { + var image = GetTabViewItemIcon (page.Icon); + if (image != null) + tvi.Image = image; + } + return tvi; + } + + protected virtual NSImage GetTabViewItemIcon(string imageName) + { + var image = NSImage.ImageNamed (imageName); + if(image == null) + image = new NSImage (imageName); + + if (image == null) + return null; + + bool shouldResize = TabStyle == NSTabViewControllerTabStyle.SegmentedControlOnTop || + TabStyle == NSTabViewControllerTabStyle.SegmentedControlOnBottom; + if (shouldResize) + image = image.ResizeTo(new CGSize(DefaultImageSizeSegmentedButton, DefaultImageSizeSegmentedButton)); + return image; + } + + protected virtual void UpdateNativeWidget() + { + TabView.Layout(); + } + + protected TabbedPage Tabbed => (TabbedPage)Element; + + void OnPagePropertyChanged(object sender, PropertyChangedEventArgs e) + { + if (e.PropertyName == Page.TitleProperty.PropertyName) + { + var page = (Page)sender; + var index = TabbedPage.GetIndex(page); + TabViewItems[index].Label = page.Title; + } + else if (e.PropertyName == Page.IconProperty.PropertyName) + { + var page = (Page)sender; + + var index = TabbedPage.GetIndex(page); + TabViewItems[index].Label = page.Title; + + if (!string.IsNullOrEmpty(page.Icon)) + { + TabViewItems[index].Image = new NSImage(page.Icon); + } + else if (TabViewItems[index].Image != null) + { + TabViewItems[index].Image = new NSImage(); + } + } + } + + void OnPagesChanged(object sender, NotifyCollectionChangedEventArgs e) + { + e.Apply((o, i, c) => SetupPage((Page)o, i), (o, i) => TeardownPage((Page)o), Reset); + + SetControllers(); + + UpdateChildrenOrderIndex(); + + SetSelectedTabViewItem(); + } + + void OnPropertyChanged(object sender, PropertyChangedEventArgs e) + { + if (e.PropertyName == nameof(TabbedPage.CurrentPage)) + { + var current = Tabbed.CurrentPage; + if (current == null) + return; + + SetSelectedTabViewItem(); + } + else if (e.PropertyName == TabbedPage.BarBackgroundColorProperty.PropertyName) + UpdateBarBackgroundColor(); + else if (e.PropertyName == TabbedPage.BarTextColorProperty.PropertyName) + UpdateBarTextColor(); + } + + void Reset() + { + var i = 0; + foreach (var page in Tabbed.Children) + SetupPage(page, i++); + } + + void SetControllers() + { + _updatingControllers = true; + for (var i = 0; i < ElementController.LogicalChildren.Count; i++) + { + var child = ElementController.LogicalChildren[i]; + var page = child as Page; + if (page == null) + continue; + + var pageRenderer = Platform.GetRenderer(page); + if (pageRenderer != null) + { + pageRenderer.ViewController.Identifier = i.ToString(); + + NSTabViewItem newTvi = GetTabViewItem(page, pageRenderer); + + AddTabViewItem(newTvi); + } + } + _updatingControllers = false; + } + + void SetupPage(Page page, int index) + { + var renderer = Platform.GetRenderer(page); + if (renderer == null) + { + renderer = Platform.CreateRenderer(page); + Platform.SetRenderer(page, renderer); + } + + renderer.ViewController.Identifier = index.ToString(); + + page.PropertyChanged += OnPagePropertyChanged; + } + + void TeardownPage(Page page) + { + page.PropertyChanged -= OnPagePropertyChanged; + + Platform.SetRenderer(page, null); + } + + void SetSelectedTabViewItem() + { + if (Tabbed.CurrentPage == null) + return; + var selectedIndex = TabbedPage.GetIndex(Tabbed.CurrentPage); + SelectedTabViewItemIndex = selectedIndex; + } + + void UpdateChildrenOrderIndex() + { + for (var i = 0; i < TabViewItems.Length; i++) + { + int originalIndex; + if (int.TryParse(TabViewItems[i].ViewController.Identifier, out originalIndex)) + { + var page = PageController.InternalChildren[originalIndex]; + TabbedPage.SetIndex(page as Page, i); + } + } + } + + void UpdateCurrentPage() + { + var count = PageController.InternalChildren.Count; + Tabbed.CurrentPage = SelectedTabViewItemIndex >= 0 && SelectedTabViewItemIndex < count + ? Tabbed.GetPageByIndex((int)SelectedTabViewItemIndex) + : null; + } + + //TODO: Implement UpdateBarBackgroundColor + void UpdateBarBackgroundColor() + { + if (Tabbed == null || TabView == null) + return; + + var barBackgroundColor = Tabbed.BarBackgroundColor; + var isDefaultColor = barBackgroundColor.IsDefault; + + if (isDefaultColor && !_barBackgroundColorWasSet) + return; + + if (!_defaultBarColorSet) + { + //_defaultBarColor = TabView.color; + _defaultBarColorSet = true; + } + + if (!isDefaultColor) + _barBackgroundColorWasSet = true; + } + + //TODO: Implement UpdateBarTextColor + void UpdateBarTextColor() + { + if (Tabbed == null || TabView == null) + return; + + var barTextColor = Tabbed.BarTextColor; + var isDefaultColor = barTextColor.IsDefault; + + if (isDefaultColor && !_barTextColorWasSet) + return; + + if (!_defaultBarTextColorSet) + { + // _defaultBarTextColor = TabBar.TintColor; + _defaultBarTextColorSet = true; + } + + if (!isDefaultColor) + _barTextColorWasSet = true; + } + } +} \ No newline at end of file -- cgit v1.2.3