diff --git a/Aurora/Design/Components/TabView/TabView.cs b/Aurora/Design/Components/TabView/TabView.cs index 2c54d59..659e42f 100644 --- a/Aurora/Design/Components/TabView/TabView.cs +++ b/Aurora/Design/Components/TabView/TabView.cs @@ -9,10 +9,10 @@ using Aurora.Design.Converters; namespace Aurora.Design.Components.TabView { - public delegate void PositionChangingEventHandler(object sender, PositionChangingEventArgs e); + public delegate void PositionChangingEventHandler(object sender, TabChangingEventArgs e); public delegate void PositionChangedEventHandler(object sender, TabChangedEventArgs e); - public class PositionChangingEventArgs : EventArgs + public class TabChangingEventArgs : EventArgs { public bool Canceled { get; set; } public int NewPosition { get; set; } @@ -36,15 +36,12 @@ namespace Aurora.Design.Components.TabView { private StackLayout _mainContainerSL; private Grid _headerContainerGrid; - // private CarouselViewControl _carouselView; private ScrollView _tabHeadersContainerSv; - private ContentPresenter _tabPresenter; - public event PositionChangingEventHandler PositionChanging; public event PositionChangedEventHandler PositionChanged; - protected virtual void OnTabChanging(ref PositionChangingEventArgs e) + protected virtual void OnTabChanging(ref TabChangingEventArgs e) { PositionChangingEventHandler handler = PositionChanging; handler?.Invoke(this, e); @@ -109,41 +106,6 @@ namespace Aurora.Design.Components.TabView tab.HeaderTabTextFontAttributes = HeaderTabTextFontAttributes; } - private bool _supressCarouselViewPositionChangedEvent; - - /// - /// Allows for intercepting carousel property changing - /// - /// - /// - // private void _carouselView_PropertyChanged(object sender, PropertyChangedEventArgs e) - // { - // if (e.PropertyName == nameof(_carouselView.Position) && !_supressCarouselViewPositionChangedEvent) - // { - // var positionChangingArgs = new PositionChangingEventArgs() - // { - // Canceled = false, - // NewPosition = _carouselView.Position, - // OldPosition = SelectedTabIndex - // }; - - // OnPositionChanging(ref positionChangingArgs); - - // if (positionChangingArgs != null && positionChangingArgs.Canceled) - // { - // _supressCarouselViewPositionChangedEvent = true; - // _carouselView.PositionSelected -= _carouselView_PositionSelected; - // _carouselView.PropertyChanged -= _carouselView_PropertyChanged; - // _carouselView.Position = SelectedTabIndex; - // _carouselView.PositionSelected += _carouselView_PositionSelected; - // _carouselView.PropertyChanged += _carouselView_PropertyChanged; - // _supressCarouselViewPositionChangedEvent = false; - // } - - // SetPosition(positionChangingArgs.NewPosition); - // } - // } - private void Init() { ItemSource = new ObservableCollection(); @@ -166,32 +128,16 @@ namespace Aurora.Design.Components.TabView HorizontalOptions = LayoutOptions.FillAndExpand }; - _tabPresenter = new ContentPresenter(); - // _carouselView = new CarouselViewControl - // { - // HorizontalOptions = LayoutOptions.FillAndExpand, - // VerticalOptions = LayoutOptions.FillAndExpand, - // HeightRequest = ContentHeight, - // ShowArrows = false, - // ShowIndicators = false, - // BindingContext = this - // }; - - // _carouselView.PropertyChanged += _carouselView_PropertyChanged; - // _carouselView.PositionSelected += _carouselView_PositionSelected; - _mainContainerSL = new StackLayout { HorizontalOptions = LayoutOptions.FillAndExpand, VerticalOptions = LayoutOptions.FillAndExpand, - Children = { _tabHeadersContainerSv, _tabPresenter }, - // Children = { _tabHeadersContainerSv, _carouselView }, //Need to set new child in place of carousel + Children = { _tabHeadersContainerSv }, Spacing = 0 }; Content = _mainContainerSL; ItemSource.CollectionChanged += ItemSource_CollectionChanged; - SetCurrentTab(SelectedTabIndex, true); } protected override void OnBindingContextChanged() @@ -206,17 +152,11 @@ namespace Aurora.Design.Components.TabView view.Content.BindingContext = BindingContext; } } + + SetCurrentTab(0, true); } } - // private void _carouselView_PositionSelected(object sender, PositionSelectedEventArgs e) - // { - // if (_carouselView.Position != e.NewValue || SelectedTabIndex != e.NewValue) - // { - // SetPosition(e.NewValue); - // } - // } - private void AddTabToView(TabItem tab) { var tabSize = (TabSizeOption.IsAbsolute && TabSizeOption.Value.Equals(0)) ? new GridLength(1, GridUnitType.Star) : TabSizeOption; @@ -261,9 +201,7 @@ namespace Aurora.Design.Components.TabView HeightRequest = HeaderSelectionUnderlineThickness, WidthRequest = HeaderSelectionUnderlineWidth }; - //selectionBarBoxView.SetBinding(IsVisibleProperty, nameof(TabItem.IsCurrent)); var underlineColorBinding = new Binding(nameof(TabItem.IsCurrent), BindingMode.OneWay, new SelectedTabHeaderToTabBackgroundColorConverter(), this); - //selectionBarBoxView.SetBinding(BoxView.ColorProperty, nameof(TabItem.HeaderSelectionUnderlineColor), BindingMode.OneWay, new SelectedTabHeaderToTabBackgroundColorConverter(), ); selectionBarBoxView.SetBinding(BoxView.BackgroundColorProperty, underlineColorBinding); selectionBarBoxView.SetBinding(WidthRequestProperty, nameof(TabItem.HeaderSelectionUnderlineWidth)); @@ -293,19 +231,14 @@ namespace Aurora.Design.Components.TabView }; var tapRecognizer = new TapGestureRecognizer(); - //Appears to set the current view tapRecognizer.Tapped += (object s, EventArgs e) => { - // _supressCarouselViewPositionChangedEvent = true; var capturedIndex = _headerContainerGrid.Children.IndexOf((View)s); SetCurrentTab(capturedIndex); - // _supressCarouselViewPositionChangedEvent = false; }; + headerItemSL.GestureRecognizers.Add(tapRecognizer); _headerContainerGrid.Children.Add(headerItemSL, _headerContainerGrid.ColumnDefinitions.Count - 1, 0); - - //Sets caourselview itemssource to current tab - // _carouselView.ItemsSource = ItemSource.Select(t => t.Content); } #region HeaderBackgroundColor @@ -529,56 +462,34 @@ namespace Aurora.Design.Components.TabView } int oldPosition = SelectedTabIndex; - var positionChangingArgs = new PositionChangingEventArgs() + var tabChangingArgs = new TabChangingEventArgs() { Canceled = false, NewPosition = position, OldPosition = oldPosition }; - OnTabChanging(ref positionChangingArgs); + OnTabChanging(ref tabChangingArgs); - if (positionChangingArgs != null && positionChangingArgs.Canceled) + if (tabChangingArgs != null && tabChangingArgs.Canceled) { return; } - if (((position >= 0 && position < ItemSource.Count) || initialRun) && - oldPosition != position) + if (((position >= 0 && position < ItemSource.Count) || initialRun)) { - if (oldPosition < ItemSource.Count) + if (oldPosition < ItemSource.Count && _mainContainerSL.Children.Count == 2) { ItemSource[oldPosition].IsCurrent = false; + //Remove second child + _mainContainerSL.Children.RemoveAt(1); } - _tabPresenter.Content = ItemSource[position].Content; + _mainContainerSL.Children.Add(ItemSource[position].Content); ItemSource[position].IsCurrent = true; SelectedTabIndex = position; Device.BeginInvokeOnMainThread(async () => await _tabHeadersContainerSv.ScrollToAsync(_headerContainerGrid.Children[position], ScrollToPosition.MakeVisible, false)); } - //Need to change to not use carouselView - // if ((position >= 0 && position < ItemSource.Count) || initialRun) - // { - - // if (_carouselView.Position != position || initialRun) - // { - // _carouselView.PositionSelected -= _carouselView_PositionSelected; - // _carouselView.Position = position; - // _carouselView.PositionSelected += _carouselView_PositionSelected; - // } - // if (oldPosition != position) - // { - // if (oldPosition < ItemSource.Count) - // { - // ItemSource[oldPosition].IsCurrent = false; - // } - // ItemSource[position].IsCurrent = true; - // SelectedTabIndex = position; - - // Device.BeginInvokeOnMainThread(async () => await _tabHeadersContainerSv.ScrollToAsync(_headerContainerGrid.Children[position], ScrollToPosition.MakeVisible, false)); - // } - // } - var tabChangedArgs = new TabChangedEventArgs() { NewPosition = SelectedTabIndex, @@ -637,7 +548,6 @@ namespace Aurora.Design.Components.TabView _headerContainerGrid.Children.RemoveAt(_headerContainerGrid.Children.Count - 1); _headerContainerGrid.ColumnDefinitions.Remove(_headerContainerGrid.ColumnDefinitions.Last()); } - // _carouselView.ItemsSource = ItemSource.Select(t => t.Content); SelectedTabIndex = position >= 0 && position < ItemSource.Count ? position : ItemSource.Count - 1; } } diff --git a/Aurora/Design/Views/Party/PartyView.xaml b/Aurora/Design/Views/Party/PartyView.xaml index ad79ae7..818fb62 100644 --- a/Aurora/Design/Views/Party/PartyView.xaml +++ b/Aurora/Design/Views/Party/PartyView.xaml @@ -18,6 +18,11 @@ VerticalOptions="FillAndExpand" x:Name="TabView"> + + - -