From: huiyu.eun Date: Mon, 8 Mar 2021 00:42:04 +0000 (+0900) Subject: [NUI] Format all files X-Git-Tag: submit/tizen/20210309.005232~1^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6482ba3a9b24352faf3ee7d128bd4ec96766aa9;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Format all files Signed-off-by: huiyu.eun --- diff --git a/src/Tizen.NUI.Components/Controls/Button.Internal.cs b/src/Tizen.NUI.Components/Controls/Button.Internal.cs index 11171c42b..8ddec6dca 100755 --- a/src/Tizen.NUI.Components/Controls/Button.Internal.cs +++ b/src/Tizen.NUI.Components/Controls/Button.Internal.cs @@ -446,9 +446,9 @@ namespace Tizen.NUI.Components AccessibilityManager.Instance.SetAccessibilityAttribute(this, AccessibilityManager.AccessibilityAttribute.Trait, "Button"); - #if PROFILE_MOBILE +#if PROFILE_MOBILE Feedback = true; - #endif +#endif } private void UpdateUIContent() diff --git a/src/Tizen.NUI.Components/Controls/Loading.cs b/src/Tizen.NUI.Components/Controls/Loading.cs index 2e192f8eb..7b22f2b04 100755 --- a/src/Tizen.NUI.Components/Controls/Loading.cs +++ b/src/Tizen.NUI.Components/Controls/Loading.cs @@ -87,7 +87,7 @@ namespace Tizen.NUI.Components { int frameRate = (int)newValue; if (0 != frameRate) //It will crash if 0 - { + { instance.loadingStyle.FrameRate = frameRate; instance.imageVisual.FrameDelay = 1000.0f / frameRate; } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs old mode 100644 new mode 100755 index fc699685d..5c30941e9 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs @@ -36,7 +36,7 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty SelectedItemProperty = BindableProperty.Create(nameof(SelectedItem), typeof(object), typeof(CollectionView), null, - propertyChanged: (bindable, oldValue, newValue)=> + propertyChanged: (bindable, oldValue, newValue) => { var colView = (CollectionView)bindable; oldValue = colView.selectedItem; @@ -52,7 +52,7 @@ namespace Tizen.NUI.Components SelectionPropertyChanged(colView, args); }, - defaultValueCreator: (bindable)=> + defaultValueCreator: (bindable) => { var colView = (CollectionView)bindable; return colView.selectedItem; @@ -64,7 +64,7 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty SelectedItemsProperty = BindableProperty.Create(nameof(SelectedItems), typeof(IList), typeof(CollectionView), null, - propertyChanged: (bindable, oldValue, newValue)=> + propertyChanged: (bindable, oldValue, newValue) => { var colView = (CollectionView)bindable; var oldSelection = colView.selectedItems ?? selectEmpty; @@ -86,7 +86,7 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty SelectionModeProperty = BindableProperty.Create(nameof(SelectionMode), typeof(ItemSelectionMode), typeof(CollectionView), ItemSelectionMode.None, - propertyChanged: (bindable, oldValue, newValue)=> + propertyChanged: (bindable, oldValue, newValue) => { var colView = (CollectionView)bindable; oldValue = colView.selectionMode; @@ -134,7 +134,7 @@ namespace Tizen.NUI.Components /// Base constructor with ItemsSource /// /// item's data source - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public CollectionView(IEnumerable itemsSource) : this() { ItemsSource = itemsSource; @@ -146,7 +146,7 @@ namespace Tizen.NUI.Components /// item's data source /// item's layout manager /// item's view template with data bindings - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public CollectionView(IEnumerable itemsSource, ItemsLayouter layouter, DataTemplate template) : this() { ItemsSource = itemsSource; @@ -164,7 +164,7 @@ namespace Tizen.NUI.Components /// /// Align item in the viewport when ScrollTo() calls. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public enum ItemScrollTo { /// @@ -400,8 +400,8 @@ namespace Tizen.NUI.Components /// Boolean flag of group feature existence. /// [EditorBrowsable(EditorBrowsableState.Never)] - public bool IsGrouped - { + public bool IsGrouped + { get => isGrouped; set { @@ -560,28 +560,28 @@ namespace Tizen.NUI.Components switch (direction) { case View.FocusDirection.Left: - { - nextFocusedView = LeftFocusableView; - break; - } + { + nextFocusedView = LeftFocusableView; + break; + } case View.FocusDirection.Right: - { - nextFocusedView = RightFocusableView; - break; - } + { + nextFocusedView = RightFocusableView; + break; + } case View.FocusDirection.Up: - { - nextFocusedView = UpFocusableView; - break; - } + { + nextFocusedView = UpFocusableView; + break; + } case View.FocusDirection.Down: - { - nextFocusedView = DownFocusableView; - break; - } + { + nextFocusedView = DownFocusableView; + break; + } } - if(nextFocusedView != null) + if (nextFocusedView != null) { focusedView = null; } @@ -669,13 +669,13 @@ namespace Tizen.NUI.Components { case ItemScrollTo.Start: //nothing necessary. - break; + break; case ItemScrollTo.Center: scrollPos = scrollPos - (curSize / 2) + (curItemSize / 2); - break; + break; case ItemScrollTo.End: scrollPos = scrollPos - curSize + curItemSize; - break; + break; case ItemScrollTo.Nearest: if (scrollPos < curPos - curItemSize) { @@ -691,7 +691,7 @@ namespace Tizen.NUI.Components // item is in the scroller. ScrollTo() is ignored. return; } - break; + break; } //Console.WriteLine("[NUI] ScrollTo [{0}]-------------------", scrollPos); diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs old mode 100644 new mode 100755 index b618bc739..72a29b31f --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs @@ -59,7 +59,7 @@ namespace Tizen.NUI.Components } } - static DefaultGridItem() {} + static DefaultGridItem() { } /// /// Creates a new instance of DefaultGridItem. @@ -126,7 +126,7 @@ namespace Tizen.NUI.Components { get { - if ( itemImage == null) + if (itemImage == null) { itemImage = CreateImage(ItemStyle.Image); if (itemImage != null) @@ -173,23 +173,23 @@ namespace Tizen.NUI.Components } } -/* open when ImageView using Uri not string - /// - /// Image image's resource url in DefaultGridItem. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public string ImageUrl - { - get - { - return Image.ResourceUrl; - } - set - { - Image.ResourceUrl = value; - } - } -*/ + /* open when ImageView using Uri not string + /// + /// Image image's resource url in DefaultGridItem. + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public string ImageUrl + { + get + { + return Image.ResourceUrl; + } + set + { + Image.ResourceUrl = value; + } + } + */ /// /// DefaultGridItem's text part. @@ -295,7 +295,7 @@ namespace Tizen.NUI.Components return new ImageView(imageStyle); } - /// + /// [EditorBrowsable(EditorBrowsableState.Never)] protected override void MeasureChild() { diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs old mode 100644 new mode 100755 index 0e9972f9a..6fbb8d244 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs @@ -62,7 +62,7 @@ namespace Tizen.NUI.Components } } - static DefaultLinearItem() {} + static DefaultLinearItem() { } /// /// Creates a new instance of DefaultLinearItem. @@ -171,7 +171,7 @@ namespace Tizen.NUI.Components /// /// The text of DefaultLinearItem. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public string Text { get @@ -213,7 +213,7 @@ namespace Tizen.NUI.Components /// /// The text of DefaultLinearItem. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public string SubText { get @@ -316,7 +316,7 @@ namespace Tizen.NUI.Components var margin = itemSeperator.Margin; itemSeperator.SizeWidth = SizeWidth - margin.Start - margin.End; itemSeperator.SizeHeight = itemSeperator.HeightSpecification; - itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom -itemSeperator.SizeHeight); + itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom - itemSeperator.SizeHeight); } } } @@ -479,7 +479,7 @@ namespace Tizen.NUI.Components var margin = itemSeperator.Margin; itemSeperator.SizeWidth = SizeWidth - margin.Start - margin.End; itemSeperator.SizeHeight = itemSeperator.HeightSpecification; - itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom -itemSeperator.SizeHeight); + itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom - itemSeperator.SizeHeight); } } } @@ -560,6 +560,6 @@ namespace Tizen.NUI.Components { MeasureChild(); LayoutChild(); - } + } } } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs old mode 100644 new mode 100755 index 432f61be0..b57da304c --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs @@ -58,7 +58,7 @@ namespace Tizen.NUI.Components } } - static DefaultTitleItem() {} + static DefaultTitleItem() { } /// /// Creates a new instance of DefaultTitleItem. @@ -167,7 +167,7 @@ namespace Tizen.NUI.Components /// /// The text of DefaultTitleItem. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public string Text { get @@ -238,7 +238,7 @@ namespace Tizen.NUI.Components var margin = itemSeperator.Margin; itemSeperator.SizeWidth = SizeWidth - margin.Start - margin.End; itemSeperator.SizeHeight = itemSeperator.HeightSpecification; - itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom -itemSeperator.SizeHeight); + itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom - itemSeperator.SizeHeight); } } } @@ -331,7 +331,7 @@ namespace Tizen.NUI.Components var margin = itemSeperator.Margin; itemSeperator.SizeWidth = SizeWidth - margin.Start - margin.End; itemSeperator.SizeHeight = itemSeperator.HeightSpecification; - itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom -itemSeperator.SizeHeight); + itemSeperator.Position = new Position(margin.Start, SizeHeight - margin.Bottom - itemSeperator.SizeHeight); } } } @@ -404,6 +404,6 @@ namespace Tizen.NUI.Components { MeasureChild(); LayoutChild(); - } + } } } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.Internal.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.Internal.cs old mode 100644 new mode 100755 index 980dca2e0..0a95f1559 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.Internal.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.Internal.cs @@ -130,15 +130,15 @@ namespace Tizen.NUI.Components CollectionView colView = ParentItemsView as CollectionView; switch (colView.SelectionMode) { - case ItemSelectionMode.SingleSelection : + case ItemSelectionMode.SingleSelection: colView.SelectedItem = IsSelected ? null : BindingContext; break; - case ItemSelectionMode.MultipleSelections : + case ItemSelectionMode.MultipleSelections: var selectedItems = colView.SelectedItems; if (selectedItems.Contains(BindingContext)) selectedItems.Remove(BindingContext); else selectedItems.Add(BindingContext); break; - case ItemSelectionMode.None : + case ItemSelectionMode.None: break; } } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.cs old mode 100644 new mode 100755 index 5f3e882a6..ac8245a6d --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/RecyclerViewItem.cs @@ -131,7 +131,7 @@ namespace Tizen.NUI.Components } } - static RecyclerViewItem() {} + static RecyclerViewItem() { } /// /// Creates a new instance of RecyclerViewItem. @@ -194,8 +194,8 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public bool IsEnabled { - get => (bool)GetValue(IsEnabledProperty); - set => SetValue(IsEnabledProperty, value); + get => (bool)GetValue(IsEnabledProperty); + set => SetValue(IsEnabledProperty, value); } /// @@ -218,7 +218,7 @@ namespace Tizen.NUI.Components public bool IsRealized { get; internal set; } internal bool IsHeader { get; set; } internal bool IsFooter { get; set; } - internal bool IsPressed { get; set; } = false; + internal bool IsPressed { get; set; } = false; /// /// Called after a key event is received by the view that has had its focus set. @@ -257,15 +257,15 @@ namespace Tizen.NUI.Components CollectionView colView = ParentItemsView as CollectionView; switch (colView.SelectionMode) { - case ItemSelectionMode.SingleSelection : + case ItemSelectionMode.SingleSelection: colView.SelectedItem = IsSelected ? null : BindingContext; break; - case ItemSelectionMode.MultipleSelections : + case ItemSelectionMode.MultipleSelections: var selectedItems = colView.SelectedItems; if (selectedItems.Contains(BindingContext)) selectedItems.Remove(BindingContext); else selectedItems.Add(BindingContext); break; - case ItemSelectionMode.None : + case ItemSelectionMode.None: break; } } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSelectionMode.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSelectionMode.cs old mode 100644 new mode 100755 index 3156bf254..de8f8458e --- a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSelectionMode.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSelectionMode.cs @@ -27,17 +27,17 @@ namespace Tizen.NUI.Components /// /// None of item can be selected. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] None, /// /// Single selection. select item exculsively so previous selected item will be unselected. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] SingleSelection, /// /// Multiple selections. select multiple items and previous selected item still remains selected. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] MultipleSelections } } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/IItemSource.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/IItemSource.cs old mode 100644 new mode 100755 index 4a4d86ba4..5cf4b7bad --- a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/IItemSource.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/IItemSource.cs @@ -28,31 +28,31 @@ namespace Tizen.NUI.Components /// /// Count of data source. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] int Count { get; } /// /// Position integer value of data object. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] int GetPosition(object item); /// /// Item object in position. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] object GetItem(int position); /// /// Flag of header existence. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] bool HasHeader { get; set; } /// /// Flag of Footer existence. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] bool HasFooter { get; set; } /// @@ -61,7 +61,7 @@ namespace Tizen.NUI.Components /// warning: if header exist, all item index will be increased. /// /// The position for checking header. - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] bool IsHeader(int position); /// @@ -70,7 +70,7 @@ namespace Tizen.NUI.Components /// warning: footer will be place original data count or data count + 1. /// /// The position for checking footer. - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] bool IsFooter(int position); } @@ -84,21 +84,21 @@ namespace Tizen.NUI.Components /// Boolean checker for position is group header or not /// /// The position for checking group header. - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] bool IsGroupHeader(int position); /// /// Boolean checker for position is group footer or not /// /// The position for checking group footer. - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] bool IsGroupFooter(int position); /// /// Boolean checker for position is group footer or not /// /// The position for checking group footer. - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] object GetGroupParent(int position); } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/MarshalingObservableCollection.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/MarshalingObservableCollection.cs old mode 100644 new mode 100755 index 92fac699f..92dc48f5a --- a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/MarshalingObservableCollection.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/MarshalingObservableCollection.cs @@ -72,16 +72,16 @@ namespace Tizen.NUI.Components args = new ResetNotifyCollectionChangedEventArgs(items); } -/* - if (Device.IsInvokeRequired) - { - Device.BeginInvokeOnMainThread(() => HandleCollectionChange(args)); - } - else - { - HandleCollectionChange(args); - } -*/ + /* + if (Device.IsInvokeRequired) + { + Device.BeginInvokeOnMainThread(() => HandleCollectionChange(args)); + } + else + { + HandleCollectionChange(args); + } + */ HandleCollectionChange(args); } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableGroupedSource.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableGroupedSource.cs old mode 100644 new mode 100755 index 0602f8704..a68f33c32 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableGroupedSource.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableGroupedSource.cs @@ -218,7 +218,7 @@ namespace Tizen.NUI.Components return; } - disposed = true; + disposed = true; if (disposing) { @@ -263,7 +263,7 @@ namespace Tizen.NUI.Components else { */ - CollectionChanged(args); + CollectionChanged(args); //} } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableItemSource.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableItemSource.cs old mode 100644 new mode 100755 index f5581a420..616485dfe --- a/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableItemSource.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/ItemSource/ObservableItemSource.cs @@ -111,7 +111,7 @@ namespace Tizen.NUI.Components } else {*/ - CollectionChanged(args); + CollectionChanged(args); //} } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/ItemsLayouter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/ItemsLayouter.cs old mode 100644 new mode 100755 index 19b1a19d8..dcb29384b --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/ItemsLayouter.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/ItemsLayouter.cs @@ -34,13 +34,13 @@ namespace Tizen.NUI.Components /// Container which contains ViewItems. /// [EditorBrowsable(EditorBrowsableState.Never)] - protected View Container{ get ; set; } + protected View Container { get; set; } /// /// Parent ItemsView. /// [EditorBrowsable(EditorBrowsableState.Never)] - protected RecyclerView ItemsView{ get; set; } + protected RecyclerView ItemsView { get; set; } /// /// The last scrolled position which is calculated by ScrollableBase. The value should be updated in the Recycle() method. @@ -114,7 +114,7 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public virtual void RequestLayout(float scrollPosition, bool force = false) { - // Layouting Items in scrollPosition. + // Layouting Items in scrollPosition. } /// @@ -139,9 +139,9 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public virtual (float X, float Y) GetItemPosition(object item) { - if (item == null) throw new ArgumentNullException(nameof(item)); - // Layouting Items in scrollPosition. - return (0, 0); + if (item == null) throw new ArgumentNullException(nameof(item)); + // Layouting Items in scrollPosition. + return (0, 0); } /// @@ -151,9 +151,9 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public virtual (float X, float Y) GetItemSize(object item) { - if (item == null) throw new ArgumentNullException(nameof(item)); - // Layouting Items in scrollPosition. - return (0, 0); + if (item == null) throw new ArgumentNullException(nameof(item)); + // Layouting Items in scrollPosition. + return (0, 0); } /// diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs old mode 100644 new mode 100755 index a247d0e72..840990505 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/LinearLayouter.cs @@ -86,7 +86,7 @@ namespace Tizen.NUI.Components headerSize = IsHorizontal ? width : height; hasHeader = true; - + colView.UnrealizeItem(header); } else hasHeader = false; @@ -101,13 +101,13 @@ namespace Tizen.NUI.Components footerSize = IsHorizontal ? width : height; footer.Index = count - 1; hasFooter = true; - + colView.UnrealizeItem(footer); } else hasFooter = false; //No Internal Source exist. - if (count == (hasHeader? (hasFooter? 2 : 1) : 0)) return; + if (count == (hasHeader ? (hasFooter ? 2 : 1) : 0)) return; int firstIndex = hasHeader ? 1 : 0; @@ -124,12 +124,12 @@ namespace Tizen.NUI.Components RecyclerViewItem groupHeader = colView.RealizeItem(firstIndex); firstIndex++; - if (groupHeader == null) throw new Exception("["+firstIndex+"] Group Header failed to realize!"); + if (groupHeader == null) throw new Exception("[" + firstIndex + "] Group Header failed to realize!"); // Need to Set proper hieght or width on scroll direciton. if (groupHeader.Layout == null) { - width = groupHeader.WidthSpecification; + width = groupHeader.WidthSpecification; height = groupHeader.HeightSpecification; } else @@ -159,11 +159,11 @@ namespace Tizen.NUI.Components { RecyclerViewItem groupFooter = colView.RealizeItem(firstFooter); - if (groupFooter == null) throw new Exception("["+firstFooter+"] Group Footer failed to realize!"); + if (groupFooter == null) throw new Exception("[" + firstFooter + "] Group Footer failed to realize!"); // Need to Set proper hieght or width on scroll direciton. if (groupFooter.Layout == null) { - width = groupFooter.WidthSpecification; + width = groupFooter.WidthSpecification; height = groupFooter.HeightSpecification; } else @@ -215,7 +215,7 @@ namespace Tizen.NUI.Components // Need to Set proper hieght or width on scroll direciton. if (sizeDeligate.Layout == null) { - width = sizeDeligate.WidthSpecification; + width = sizeDeligate.WidthSpecification; height = sizeDeligate.HeightSpecification; } else @@ -229,7 +229,7 @@ namespace Tizen.NUI.Components // pick the StepCandidate. StepCandidate = IsHorizontal ? width : height; if (StepCandidate == 0) StepCandidate = 1; //???? - + colView.UnrealizeItem(sizeDeligate); } @@ -242,7 +242,7 @@ namespace Tizen.NUI.Components { if (i == 0 && hasHeader) ItemSize.Add(headerSize); - else if (i == count -1 && hasFooter) + else if (i == count - 1 && hasFooter) ItemSize.Add(footerSize); else if (source.IsGroupHeader(i)) ItemSize.Add(groupHeaderSize); @@ -257,7 +257,7 @@ namespace Tizen.NUI.Components //ItemPosition.Add(Current); Current += headerSize; } - else if (i == count -1 && hasFooter) + else if (i == count - 1 && hasFooter) { //ItemPosition.Add(Current); Current += footerSize; @@ -304,7 +304,7 @@ namespace Tizen.NUI.Components ItemPosition.Add(Current); if (i == 0 && hasHeader) Current += headerSize; - else if (i == count -1 && hasFooter) Current += footerSize; + else if (i == count - 1 && hasFooter) Current += footerSize; else Current += StepCandidate; } } @@ -328,7 +328,7 @@ namespace Tizen.NUI.Components { // Layouting is only possible after once it intialized. if (!IsInitialized) return; - int LastIndex = colView.InternalItemSource.Count -1; + int LastIndex = colView.InternalItemSource.Count - 1; if (!force && PrevScrollPosition == Math.Abs(scrollPosition)) return; PrevScrollPosition = Math.Abs(scrollPosition); @@ -344,7 +344,7 @@ namespace Tizen.NUI.Components int prevLastVisible = LastVisible; (float X, float Y) visibleArea = (PrevScrollPosition, - PrevScrollPosition + ( IsHorizontal ? colView.Size.Width : colView.Size.Height) + PrevScrollPosition + (IsHorizontal ? colView.Size.Width : colView.Size.Height) ); // 1. Set First/Last Visible Item Index. @@ -358,9 +358,9 @@ namespace Tizen.NUI.Components { if (item.Index < FirstVisible || item.Index > LastVisible) { - //Console.WriteLine("[NUI] Unrealize{0}!", item.Index); - unrealizedItems.Add(item); - colView.UnrealizeItem(item); + //Console.WriteLine("[NUI] Unrealize{0}!", item.Index); + unrealizedItems.Add(item); + colView.UnrealizeItem(item); } } VisibleItems.RemoveAll(unrealizedItems.Contains); @@ -392,7 +392,7 @@ namespace Tizen.NUI.Components else if (colView.Footer == item) { posX = (IsHorizontal ? ScrollContentSize - item.SizeWidth : 0F); - posY =(IsHorizontal ? 0F : ScrollContentSize - item.SizeHeight); + posY = (IsHorizontal ? 0F : ScrollContentSize - item.SizeHeight); } else { @@ -416,23 +416,23 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public override (float X, float Y) GetItemPosition(object item) { - if (item == null) throw new ArgumentNullException(nameof(item)); - // Layouting Items in scrollPosition. - float pos = ItemPosition[colView.InternalItemSource.GetPosition(item)]; + if (item == null) throw new ArgumentNullException(nameof(item)); + // Layouting Items in scrollPosition. + float pos = ItemPosition[colView.InternalItemSource.GetPosition(item)]; - return (IsHorizontal ? (pos, 0.0F) : (0.0F, pos)); + return (IsHorizontal ? (pos, 0.0F) : (0.0F, pos)); } /// [EditorBrowsable(EditorBrowsableState.Never)] public override (float X, float Y) GetItemSize(object item) { - if (item == null) throw new ArgumentNullException(nameof(item)); - // Layouting Items in scrollPosition. - float size = GetItemSize(colView.InternalItemSource.GetPosition(item)); - float view = (IsHorizontal ? colView.Size.Height : colView.Size.Width); + if (item == null) throw new ArgumentNullException(nameof(item)); + // Layouting Items in scrollPosition. + float size = GetItemSize(colView.InternalItemSource.GetPosition(item)); + float view = (IsHorizontal ? colView.Size.Height : colView.Size.Width); - return (IsHorizontal ? (size, view) : (view, size)); + return (IsHorizontal ? (size, view) : (view, size)); } /// @@ -449,7 +449,7 @@ namespace Tizen.NUI.Components return; float PrevSize, CurrentSize; - if (item.Index == (colView.InternalItemSource.Count-1)) + if (item.Index == (colView.InternalItemSource.Count - 1)) { PrevSize = ScrollContentSize - ItemPosition[item.Index]; } @@ -463,9 +463,9 @@ namespace Tizen.NUI.Components if (CurrentSize != PrevSize) { if (colView.SizingStrategy == ItemSizingStrategy.MeasureAll) - ItemSize[item.Index] = CurrentSize; + ItemSize[item.Index] = CurrentSize; else - StepCandidate = CurrentSize; + StepCandidate = CurrentSize; } if (ItemSizeChanged == -1) ItemSizeChanged = item.Index; else ItemSizeChanged = Math.Min(ItemSizeChanged, item.Index); @@ -499,34 +499,34 @@ namespace Tizen.NUI.Components View nextFocusedView = null; int targetSibling = -1; - switch(direction) + switch (direction) { - case View.FocusDirection.Left : - { - targetSibling = IsHorizontal ? currentFocusedView.SiblingOrder - 1 : targetSibling; - break; - } - case View.FocusDirection.Right : - { - targetSibling = IsHorizontal ? currentFocusedView.SiblingOrder + 1 : targetSibling; - break; - } - case View.FocusDirection.Up : - { - targetSibling = IsHorizontal ? targetSibling : currentFocusedView.SiblingOrder - 1; - break; - } - case View.FocusDirection.Down : - { - targetSibling = IsHorizontal ? targetSibling : currentFocusedView.SiblingOrder + 1; - break; - } + case View.FocusDirection.Left: + { + targetSibling = IsHorizontal ? currentFocusedView.SiblingOrder - 1 : targetSibling; + break; + } + case View.FocusDirection.Right: + { + targetSibling = IsHorizontal ? currentFocusedView.SiblingOrder + 1 : targetSibling; + break; + } + case View.FocusDirection.Up: + { + targetSibling = IsHorizontal ? targetSibling : currentFocusedView.SiblingOrder - 1; + break; + } + case View.FocusDirection.Down: + { + targetSibling = IsHorizontal ? targetSibling : currentFocusedView.SiblingOrder + 1; + break; + } } - if(targetSibling > -1 && targetSibling < Container.Children.Count) + if (targetSibling > -1 && targetSibling < Container.Children.Count) { RecyclerViewItem candidate = Container.Children[targetSibling] as RecyclerViewItem; - if(candidate.Index >= 0 && candidate.Index < colView.InternalItemSource.Count) + if (candidate.Index >= 0 && candidate.Index < colView.InternalItemSource.Count) { nextFocusedView = candidate; } @@ -555,7 +555,7 @@ namespace Tizen.NUI.Components if (isGrouped) { bool failed = true; - foreach(GroupInfo gInfo in groups) + foreach (GroupInfo gInfo in groups) { skipGroup++; // in the Group @@ -570,7 +570,7 @@ namespace Tizen.NUI.Components found.start = gInfo.StartIndex + i - adds; failed = false; break; - + } else if (gInfo.ItemPosition[i] <= visibleArea.X - gInfo.GroupPosition && gInfo.ItemPosition[i + 1] >= visibleArea.X - gInfo.GroupPosition) @@ -608,7 +608,7 @@ namespace Tizen.NUI.Components bool failed = true; // can it be start from founded group...? //foreach(GroupInfo gInfo in groups.Skip(skipGroup)) - foreach(GroupInfo gInfo in groups) + foreach (GroupInfo gInfo in groups) { // in the Group if (gInfo.GroupPosition <= visibleArea.Y && @@ -622,7 +622,7 @@ namespace Tizen.NUI.Components found.end = gInfo.StartIndex + i + adds; failed = false; break; - + } else if (gInfo.ItemPosition[i] <= visibleArea.Y - gInfo.GroupPosition && gInfo.ItemPosition[i + 1] >= visibleArea.Y - gInfo.GroupPosition) @@ -638,7 +638,7 @@ namespace Tizen.NUI.Components } else { - float visibleAreaY = visibleArea.Y - (hasHeader ? headerSize : 0); + float visibleAreaY = visibleArea.Y - (hasHeader ? headerSize : 0); found.end = (Convert.ToInt32(Math.Abs(visibleAreaY / StepCandidate)) + adds); if (hasHeader) found.end += 1; } @@ -670,14 +670,14 @@ namespace Tizen.NUI.Components if (index <= 0) return; if (index >= colView.InternalItemSource.Count) - if (IsGroup) - { - //IsGroupHeader = (colView.InternalItemSource as IGroupableItemSource).IsGroupHeader(index); - //IsGroupFooter = (colView.InternalItemSource as IGroupableItemSource).IsGroupFooter(index); - //Do Something - } + if (IsGroup) + { + //IsGroupHeader = (colView.InternalItemSource as IGroupableItemSource).IsGroupHeader(index); + //IsGroupFooter = (colView.InternalItemSource as IGroupableItemSource).IsGroupFooter(index); + //Do Something + } - ItemPosition[index] = ItemPosition[index-1] + GetItemSize(index-1); + ItemPosition[index] = ItemPosition[index - 1] + GetItemSize(index - 1); } private RecyclerViewItem GetVisibleItem(int index) @@ -694,7 +694,7 @@ namespace Tizen.NUI.Components if (Visited != null) { if (Visited.StartIndex <= index && Visited.StartIndex + Visited.Count > index) - return Visited; + return Visited; } if (hasHeader && index == 0) return null; foreach (GroupInfo group in groups) @@ -708,34 +708,34 @@ namespace Tizen.NUI.Components Visited = null; return null; } -/* - private object GetGroupParent(int index) - { - if (Visited != null) - { - if (Visited.StartIndex <= index && Visited.StartIndex + Visited.Count > index) - return Visited.GroupParent; - } - if (hasHeader && index == 0) return null; - foreach (GroupInfo group in groups) - { - if (group.StartIndex <= index && group.StartIndex + group.Count > index) + /* + private object GetGroupParent(int index) { - Visited = group; - return group.GroupParent; + if (Visited != null) + { + if (Visited.StartIndex <= index && Visited.StartIndex + Visited.Count > index) + return Visited.GroupParent; + } + if (hasHeader && index == 0) return null; + foreach (GroupInfo group in groups) + { + if (group.StartIndex <= index && group.StartIndex + group.Count > index) + { + Visited = group; + return group.GroupParent; + } + } + Visited = null; + return null; } - } - Visited = null; - return null; - } -*/ + */ class GroupInfo { public object GroupParent; public int StartIndex; public int Count; public float GroupSize; - public float GroupPosition; + public float GroupPosition; //Items relative position from the GroupPosition public List ItemPosition = new List(); } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs index 548aea06d..100072fb4 100755 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs @@ -32,7 +32,7 @@ namespace Tizen.NUI.Components /// /// Base Constructor /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public RecyclerView() : base() { Scrolling += OnScrolling; @@ -53,7 +53,7 @@ namespace Tizen.NUI.Components /// /// Internal encapsulated items data source. /// - internal IItemSource InternalItemSource { get; set;} + internal IItemSource InternalItemSource { get; set; } /// /// RecycleCache of ViewItem. @@ -65,7 +65,7 @@ namespace Tizen.NUI.Components /// Internal Items Layouter. /// [EditorBrowsable(EditorBrowsableState.Never)] - protected ItemsLayouter InternalItemsLayouter {get; set; } + protected ItemsLayouter InternalItemsLayouter { get; set; } /// /// Max size of RecycleCache. Default is 50. @@ -79,7 +79,7 @@ namespace Tizen.NUI.Components { //Console.WriteLine("[NUI] On ReLayout [{0} {0}]", size.X, size.Y); base.OnRelayout(size, container); - if (InternalItemsLayouter != null && ItemsSource != null && ItemTemplate != null) + if (InternalItemsLayouter != null && ItemsSource != null && ItemTemplate != null) { InternalItemsLayouter.Initialize(this); InternalItemsLayouter.RequestLayout(ScrollingDirection == Direction.Horizontal ? ContentContainer.CurrentPosition.X : ContentContainer.CurrentPosition.Y, true); @@ -225,13 +225,13 @@ namespace Tizen.NUI.Components } else { - // pop item - RecyclerViewItem item = PopRecycleCache(ItemTemplate); - if (item != null) - { + // pop item + RecyclerViewItem item = PopRecycleCache(ItemTemplate); + if (item != null) + { DecorateItem(item, index, context); return item; - } + } } object content = DataTemplateExtensions.CreateContent(ItemTemplate, context, (BindableObject)this) ?? throw new Exception("Template return null object."); @@ -311,17 +311,17 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] protected virtual RecyclerViewItem PopRecycleCache(DataTemplate Template) { - for (int i = 0; i < RecycleCache.Count; i++) - { - RecyclerViewItem item = RecycleCache[i]; - if (item.Template == Template) - { - RecycleCache.Remove(item); - item.Show(); - return item; - } - } - return null; + for (int i = 0; i < RecycleCache.Count; i++) + { + RecyclerViewItem item = RecycleCache[i]; + if (item.Template == Template) + { + RecycleCache.Remove(item); + item.Show(); + return item; + } + } + return null; } /// diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/SelectionChangedEventArgs.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/SelectionChangedEventArgs.cs old mode 100644 new mode 100755 index 6041b22df..7a1dd1f9f --- a/src/Tizen.NUI.Components/Controls/RecyclerView/SelectionChangedEventArgs.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/SelectionChangedEventArgs.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI.Components /// /// Previous selection list. /// - [EditorBrowsable(EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public IReadOnlyList PreviousSelection { get; } /// diff --git a/src/Tizen.NUI.Components/Controls/Scrollbar.cs b/src/Tizen.NUI.Components/Controls/Scrollbar.cs index 30246034f..2480bf2e8 100755 --- a/src/Tizen.NUI.Components/Controls/Scrollbar.cs +++ b/src/Tizen.NUI.Components/Controls/Scrollbar.cs @@ -555,7 +555,7 @@ namespace Tizen.NUI.Components } } - private PaddingType EnsurePadding(Extents padding) => padding == null ? new PaddingType(0, 0, 0 ,0) : new PaddingType(padding.Start, padding.End, padding.Top, padding.Bottom); + private PaddingType EnsurePadding(Extents padding) => padding == null ? new PaddingType(0, 0, 0, 0) : new PaddingType(padding.Start, padding.End, padding.Top, padding.Bottom); #endregion Methods diff --git a/src/Tizen.NUI.Components/Controls/SelectButton.cs b/src/Tizen.NUI.Components/Controls/SelectButton.cs index 9bf9aac79..faca83890 100755 --- a/src/Tizen.NUI.Components/Controls/SelectButton.cs +++ b/src/Tizen.NUI.Components/Controls/SelectButton.cs @@ -228,7 +228,7 @@ namespace Tizen.NUI.Components { EmitAccessibilityStateChangedEvent(AccessibilityState.Checked, info.CurrentState.Contains(ControlState.Selected)); } - + // SelectedChanged is invoked when button or key is unpressed. if (invokeSelectedChanged == false) { diff --git a/src/Tizen.NUI.Components/Controls/Slider.cs b/src/Tizen.NUI.Components/Controls/Slider.cs index a307642b9..24c9d747a 100755 --- a/src/Tizen.NUI.Components/Controls/Slider.cs +++ b/src/Tizen.NUI.Components/Controls/Slider.cs @@ -732,7 +732,7 @@ namespace Tizen.NUI.Components } set { - if (value == null || thumbImage == null) + if (value == null || thumbImage == null) { throw new NullReferenceException("Slider.WarningThumbImageUri is null"); } diff --git a/src/Tizen.NUI.Components/Controls/Switch.cs b/src/Tizen.NUI.Components/Controls/Switch.cs index bd181e8cc..c8fedd60b 100755 --- a/src/Tizen.NUI.Components/Controls/Switch.cs +++ b/src/Tizen.NUI.Components/Controls/Switch.cs @@ -338,9 +338,9 @@ namespace Tizen.NUI.Components private void Initialize() { IsSelectable = true; - #if PROFILE_MOBILE +#if PROFILE_MOBILE Feedback = true; - #endif +#endif } private void OnSelect() diff --git a/src/Tizen.NUI.Components/Style/DefaultGridItemStyle.cs b/src/Tizen.NUI.Components/Style/DefaultGridItemStyle.cs old mode 100644 new mode 100755 index 1149b2826..40a7f1c35 --- a/src/Tizen.NUI.Components/Style/DefaultGridItemStyle.cs +++ b/src/Tizen.NUI.Components/Style/DefaultGridItemStyle.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + using System.ComponentModel; using Tizen.NUI.BaseComponents; using Tizen.NUI.Binding; @@ -28,7 +28,7 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public class DefaultGridItemStyle : RecyclerViewItemStyle { - + static DefaultGridItemStyle() { } /// diff --git a/src/Tizen.NUI.Components/Style/DefaultLinearItemStyle.cs b/src/Tizen.NUI.Components/Style/DefaultLinearItemStyle.cs old mode 100644 new mode 100755 index f990a7cfb..f7de066e1 --- a/src/Tizen.NUI.Components/Style/DefaultLinearItemStyle.cs +++ b/src/Tizen.NUI.Components/Style/DefaultLinearItemStyle.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + using System.ComponentModel; using Tizen.NUI.BaseComponents; using Tizen.NUI.Binding; diff --git a/src/Tizen.NUI.Components/Style/DefaultTitleItemStyle.cs b/src/Tizen.NUI.Components/Style/DefaultTitleItemStyle.cs old mode 100644 new mode 100755 index d68c2b990..637e0e1d0 --- a/src/Tizen.NUI.Components/Style/DefaultTitleItemStyle.cs +++ b/src/Tizen.NUI.Components/Style/DefaultTitleItemStyle.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + using System.ComponentModel; using Tizen.NUI.BaseComponents; using Tizen.NUI.Binding; diff --git a/src/Tizen.NUI.Components/Style/RecyclerViewItemStyle.cs b/src/Tizen.NUI.Components/Style/RecyclerViewItemStyle.cs old mode 100644 new mode 100755 index 8fa63111d..395987a52 --- a/src/Tizen.NUI.Components/Style/RecyclerViewItemStyle.cs +++ b/src/Tizen.NUI.Components/Style/RecyclerViewItemStyle.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + using System.ComponentModel; using Tizen.NUI.BaseComponents; using Tizen.NUI.Binding; diff --git a/src/Tizen.NUI.Components/Theme/DefaultTheme.cs b/src/Tizen.NUI.Components/Theme/DefaultTheme.cs old mode 100644 new mode 100755 index 4c39c3f8e..981ee35f9 --- a/src/Tizen.NUI.Components/Theme/DefaultTheme.cs +++ b/src/Tizen.NUI.Components/Theme/DefaultTheme.cs @@ -113,7 +113,7 @@ namespace Tizen.NUI.Components Instance.GetExternalThemeKeyListSet(); } - private static void SetBackgroundColor(ViewStyle style, Selector value) => style.BackgroundColor = value; + private static void SetBackgroundColor(ViewStyle style, Selector value) => style.BackgroundColor = value; private static void SetBackgroundImage(ViewStyle style, Selector value) => style.BackgroundImage = value; diff --git a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs old mode 100644 new mode 100755 index 01812728a..53ccc234f --- a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs +++ b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs @@ -272,7 +272,7 @@ namespace Tizen.NUI.Components Selected = new Color(0.701f, 0.898f, 0.937f, 1), }, }); - + theme.AddStyleWithoutClone("Tizen.NUI.Components.DefaultLinearItem", new DefaultLinearItemStyle() { SizeHeight = 130, diff --git a/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Common.xaml b/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Common.xaml old mode 100644 new mode 100755 index 57a36a5fb..4dc78a5de --- a/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Common.xaml +++ b/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Common.xaml @@ -5,229 +5,234 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" Id="Tizen.NUI.Theme.Common" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Wearable.xaml b/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Wearable.xaml old mode 100644 new mode 100755 index 812f2d19a..8acbf1886 --- a/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Wearable.xaml +++ b/src/Tizen.NUI.Components/res/Theme/Tizen.NUI.Components_Tizen.NUI.Theme.Wearable.xaml @@ -6,54 +6,55 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" Id="Tizen.NUI.Theme.Wearable"> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/Accessibility/AccessibilityDoGestureSignal.cs b/src/Tizen.NUI/src/internal/Accessibility/AccessibilityDoGestureSignal.cs index 27526e733..bb3f872c4 100755 --- a/src/Tizen.NUI/src/internal/Accessibility/AccessibilityDoGestureSignal.cs +++ b/src/Tizen.NUI/src/internal/Accessibility/AccessibilityDoGestureSignal.cs @@ -30,25 +30,29 @@ namespace Tizen.NUI public class AccessibilityDoGestureSignal : Disposable { [EditorBrowsable(EditorBrowsableState.Never)] - internal AccessibilityDoGestureSignal(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn) { + internal AccessibilityDoGestureSignal(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn) + { } [EditorBrowsable(EditorBrowsableState.Never)] - static internal uint GetSizeOfGestureInfo() { + static internal uint GetSizeOfGestureInfo() + { uint ret = Interop.DoGestureSignal.GetSizeOfGestureInfo(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } [EditorBrowsable(EditorBrowsableState.Never)] - static internal int GetResult(global::System.IntPtr data) { + static internal int GetResult(global::System.IntPtr data) + { int ret = Interop.DoGestureSignal.GetResult(data); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } [EditorBrowsable(EditorBrowsableState.Never)] - static internal void SetResult(global::System.IntPtr data, int res) { + static internal void SetResult(global::System.IntPtr data, int res) + { Interop.DoGestureSignal.SetResult(data, res); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/Common/DaliEnumConstants.cs b/src/Tizen.NUI/src/internal/Common/DaliEnumConstants.cs index 8c17cc6b0..6c0c7d61f 100755 --- a/src/Tizen.NUI/src/internal/Common/DaliEnumConstants.cs +++ b/src/Tizen.NUI/src/internal/Common/DaliEnumConstants.cs @@ -75,7 +75,7 @@ namespace Tizen.NUI /// The properties used for a Tooltip. /// /// 3 - [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1716: Identifiers should not match keywords")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1716: Identifiers should not match keywords")] public struct Property { /// diff --git a/src/Tizen.NUI/src/internal/Common/DisposeQueue.cs b/src/Tizen.NUI/src/internal/Common/DisposeQueue.cs index 8046906df..6bb216a09 100755 --- a/src/Tizen.NUI/src/internal/Common/DisposeQueue.cs +++ b/src/Tizen.NUI/src/internal/Common/DisposeQueue.cs @@ -38,7 +38,7 @@ namespace Tizen.NUI ~DisposeQueue() { - Tizen.Log.Debug("NUI",$"DisposeQueue is destroyed\n"); + Tizen.Log.Debug("NUI", $"DisposeQueue is destroyed\n"); } public static DisposeQueue Instance diff --git a/src/Tizen.NUI/src/internal/Common/Model3dView.cs b/src/Tizen.NUI/src/internal/Common/Model3dView.cs index bf63bd996..cff0d2eb6 100755 --- a/src/Tizen.NUI/src/internal/Common/Model3dView.cs +++ b/src/Tizen.NUI/src/internal/Common/Model3dView.cs @@ -104,7 +104,7 @@ namespace Tizen.NUI { get { - string retVal = "" ; + string retVal = ""; PropertyValue material = GetProperty(Model3dView.Property.MaterialUrl); material?.Get(out retVal); material?.Dispose(); diff --git a/src/Tizen.NUI/src/internal/Common/PropertyHelper.cs b/src/Tizen.NUI/src/internal/Common/PropertyHelper.cs index 14b9c3183..658464be2 100755 --- a/src/Tizen.NUI/src/internal/Common/PropertyHelper.cs +++ b/src/Tizen.NUI/src/internal/Common/PropertyHelper.cs @@ -45,7 +45,7 @@ namespace Tizen.NUI { "shadow.CornerRadius", new VisualPropertyData(View.Property.SHADOW, Visual.Property.CornerRadius, ObjectIntToFloat) }, }; - static PropertyHelper() {} + static PropertyHelper() { } /// /// Returns a Property if stringProperty is a valid index @@ -74,7 +74,7 @@ namespace Tizen.NUI private static SearchResult SearchProperty(View view, string lowercasePropertyString) { Property property = new Property(view, lowercasePropertyString); - + if (property.propertyIndex == Property.InvalidIndex) { property.Dispose(); @@ -137,7 +137,7 @@ namespace Tizen.NUI var colorValue = value as Vector4; return new Vector3(colorValue.R, colorValue.G, colorValue.B); } - + if (value is Color) { var colorValue = value as Color; diff --git a/src/Tizen.NUI/src/internal/Common/StringToVoidSignal.cs b/src/Tizen.NUI/src/internal/Common/StringToVoidSignal.cs index 6668d20d8..fd94101be 100755 --- a/src/Tizen.NUI/src/internal/Common/StringToVoidSignal.cs +++ b/src/Tizen.NUI/src/internal/Common/StringToVoidSignal.cs @@ -35,7 +35,8 @@ namespace Tizen.NUI } [EditorBrowsable(EditorBrowsableState.Never)] - static internal string ConvertParam1(global::System.IntPtr data) { + static internal string ConvertParam1(global::System.IntPtr data) + { string result = Interop.StringToVoidSignal.ConvertParam1(data); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return result; diff --git a/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs b/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs index 69716cdba..1665e1bde 100755 --- a/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs +++ b/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs @@ -105,14 +105,14 @@ namespace Tizen.NUI providerImage.Show(); int propertyCount = transition.AnimationDataList.Count; - animation = new Animation(transition.DurationMilliSeconds+80); + animation = new Animation(transition.DurationMilliSeconds + 80); for (int i = 0; i < propertyCount; i++) { animation.PropertyList.Add(transition.AnimationDataList[i].Property); animation.DestValueList.Add(transition.AnimationDataList[i].DestinationValue); - animation.StartTimeList.Add(80 +transition.AnimationDataList[i].StartTime); - animation.EndTimeList.Add(80 +transition.AnimationDataList[i].EndTime); + animation.StartTimeList.Add(80 + transition.AnimationDataList[i].StartTime); + animation.EndTimeList.Add(80 + transition.AnimationDataList[i].EndTime); } animation.PlayAnimateTo(providerImage); animation.Finished += Ani_Finished; diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Actor.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Actor.cs index 64c13c0db..9cfc1062e 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Actor.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Actor.cs @@ -23,7 +23,7 @@ namespace Tizen.NUI { [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_SWIGUpcast")] public static extern global::System.IntPtr Upcast(global::System.IntPtr jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Actor__SWIG_0")] public static extern global::System.IntPtr NewActor(); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs old mode 100644 new mode 100755 index 9e3570342..3b1db59cc --- a/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs @@ -65,11 +65,11 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AppendAccessibilityRelation")] - public static extern void DaliToolkitDevelControlAppendAccessibilityRelation(global::System.Runtime.InteropServices.HandleRef arg1, global::System.Runtime.InteropServices.HandleRef arg2, int arg3); + public static extern void DaliToolkitDevelControlAppendAccessibilityRelation(global::System.Runtime.InteropServices.HandleRef arg1, global::System.Runtime.InteropServices.HandleRef arg2, int arg3); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_RemoveAccessibilityRelation")] - public static extern void DaliToolkitDevelControlRemoveAccessibilityRelation(global::System.Runtime.InteropServices.HandleRef arg1, global::System.Runtime.InteropServices.HandleRef arg2, int arg3); + public static extern void DaliToolkitDevelControlRemoveAccessibilityRelation(global::System.Runtime.InteropServices.HandleRef arg1, global::System.Runtime.InteropServices.HandleRef arg2, int arg3); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_new_GetAccessibilityRelations")] @@ -77,35 +77,35 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityRelations_RelationSize")] - public static extern uint DaliToolkitDevelControlAccessibilityRelationsRelationSize(Tizen.NUI.BaseComponents.AddressCollection arg1, int relation); + public static extern uint DaliToolkitDevelControlAccessibilityRelationsRelationSize(Tizen.NUI.BaseComponents.AddressCollection arg1, int relation); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibilityRelations_At")] - public static extern string DaliToolkitDevelControlAccessibilityRelationsAt(Tizen.NUI.BaseComponents.AddressCollection arg1, int rel, int pos, int id); + public static extern string DaliToolkitDevelControlAccessibilityRelationsAt(Tizen.NUI.BaseComponents.AddressCollection arg1, int rel, int pos, int id); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_delete_AccessibilityRelations")] - public static extern void DaliToolkitDevelControlDeleteAccessibilityRelations(IntPtr arg1); + public static extern void DaliToolkitDevelControlDeleteAccessibilityRelations(IntPtr arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityRelations")] - public static extern void DaliToolkitDevelControlClearAccessibilityRelations(global::System.Runtime.InteropServices.HandleRef arg1); + public static extern void DaliToolkitDevelControlClearAccessibilityRelations(global::System.Runtime.InteropServices.HandleRef arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AppendAccessibilityAttribute")] - public static extern void DaliToolkitDevelControlAppendAccessibilityAttribute(global::System.Runtime.InteropServices.HandleRef arg1, string arg2, string arg3); + public static extern void DaliToolkitDevelControlAppendAccessibilityAttribute(global::System.Runtime.InteropServices.HandleRef arg1, string arg2, string arg3); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_RemoveAccessibilityAttribute")] - public static extern void DaliToolkitDevelControlRemoveAccessibilityAttribute(global::System.Runtime.InteropServices.HandleRef arg1, string arg2); + public static extern void DaliToolkitDevelControlRemoveAccessibilityAttribute(global::System.Runtime.InteropServices.HandleRef arg1, string arg2); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityAttributes")] - public static extern void DaliToolkitDevelControlClearAccessibilityAttributes(global::System.Runtime.InteropServices.HandleRef arg1); + public static extern void DaliToolkitDevelControlClearAccessibilityAttributes(global::System.Runtime.InteropServices.HandleRef arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_SetAccessibilityReadingInfoType")] - public static extern void DaliToolkitDevelControlSetAccessibilityReadingInfoType(global::System.Runtime.InteropServices.HandleRef arg1, Tizen.NUI.BaseComponents.ReadingInfoTypes arg2); + public static extern void DaliToolkitDevelControlSetAccessibilityReadingInfoType(global::System.Runtime.InteropServices.HandleRef arg1, Tizen.NUI.BaseComponents.ReadingInfoTypes arg2); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_new_ReadingInfoType")] @@ -117,23 +117,23 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_delete_ReadingInfoType")] - public static extern void DaliToolkitDevelControlDeleteReadingInfoType(IntPtr arg1); + public static extern void DaliToolkitDevelControlDeleteReadingInfoType(IntPtr arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ReadingInfoTypes_Get")] - public static extern bool DaliToolkitDevelControlReadingInfoTypesGet(Tizen.NUI.BaseComponents.ReadingInfoTypes arg1, int arg2); + public static extern bool DaliToolkitDevelControlReadingInfoTypesGet(Tizen.NUI.BaseComponents.ReadingInfoTypes arg1, int arg2); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ReadingInfoTypes_Set")] - public static extern void DaliToolkitDevelControlReadingInfoTypesSet(Tizen.NUI.BaseComponents.ReadingInfoTypes arg1, int arg2, int arg3); + public static extern void DaliToolkitDevelControlReadingInfoTypesSet(Tizen.NUI.BaseComponents.ReadingInfoTypes arg1, int arg2, int arg3); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityHighlight")] - public static extern bool DaliToolkitDevelControlClearAccessibilityHighlight(global::System.Runtime.InteropServices.HandleRef arg1); + public static extern bool DaliToolkitDevelControlClearAccessibilityHighlight(global::System.Runtime.InteropServices.HandleRef arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_GrabAccessibilityHighlight")] - public static extern bool DaliToolkitDevelControlGrabAccessibilityHighlight(global::System.Runtime.InteropServices.HandleRef arg1); + public static extern bool DaliToolkitDevelControlGrabAccessibilityHighlight(global::System.Runtime.InteropServices.HandleRef arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_new_GetAccessibilityStates")] @@ -145,19 +145,19 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_delete_States")] - public static extern void DaliToolkitDevelControlDeleteStates(IntPtr arg1); + public static extern void DaliToolkitDevelControlDeleteStates(IntPtr arg1); [EditorBrowsable(EditorBrowsableState.Never)] [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_States_Copy")] - public static extern IntPtr DaliToolkitDevelControlStatesCopy(Tizen.NUI.BaseComponents.AccessibilityStates arg1); + public static extern IntPtr DaliToolkitDevelControlStatesCopy(Tizen.NUI.BaseComponents.AccessibilityStates arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_States_Get")] - public static extern bool DaliToolkitDevelControlStatesGet(Tizen.NUI.BaseComponents.AccessibilityStates arg1, int arg2); + public static extern bool DaliToolkitDevelControlStatesGet(Tizen.NUI.BaseComponents.AccessibilityStates arg1, int arg2); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_States_Set")] - public static extern void DaliToolkitDevelControlStatesSet(Tizen.NUI.BaseComponents.AccessibilityStates arg1, int arg2, int arg3); + public static extern void DaliToolkitDevelControlStatesSet(Tizen.NUI.BaseComponents.AccessibilityStates arg1, int arg2, int arg3); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_NotifyAccessibilityStateChange")] @@ -193,15 +193,15 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_delete_Range")] - public static extern void DaliAccessibilityDeleteRange(IntPtr arg1); + public static extern void DaliAccessibilityDeleteRange(IntPtr arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_Bridge_Add_Popup")] - public static extern void DaliAccessibilityBridgeAddPopup(global::System.Runtime.InteropServices.HandleRef arg1); + public static extern void DaliAccessibilityBridgeAddPopup(global::System.Runtime.InteropServices.HandleRef arg1); [EditorBrowsable(EditorBrowsableState.Never)] [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_Bridge_Remove_Popup")] - public static extern void DaliAccessibilityBridgeRemovePopup(global::System.Runtime.InteropServices.HandleRef arg1); + public static extern void DaliAccessibilityBridgeRemovePopup(global::System.Runtime.InteropServices.HandleRef arg1); // SetAccessibilityConstructor @@ -327,7 +327,7 @@ namespace Tizen.NUI } [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_SetAccessibilityConstructor_NUI")] - public static extern void DaliToolkitDevelControlSetAccessibilityConstructor(HandleRef arg1_self, int arg2_role, int arg3_iface, IntPtr arg4_vtable, int arg5_vtableSize); + public static extern void DaliToolkitDevelControlSetAccessibilityConstructor(HandleRef arg1_self, int arg2_role, int arg3_iface, IntPtr arg4_vtable, int arg5_vtableSize); [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_AccessibleImpl_NUI_DuplicateString")] public static extern IntPtr DaliToolkitDevelControlAccessibleImplNUIDuplicateString(string arg); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.RenderTask.cs b/src/Tizen.NUI/src/internal/Interop/Interop.RenderTask.cs index 93060dbff..0aa259ba7 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.RenderTask.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.RenderTask.cs @@ -203,7 +203,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_RenderTaskSignal")] public static extern void DeleteRenderTaskSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_RenderTaskList_SWIGUpcast")] public static extern global::System.IntPtr RenderTaskListUpcast(global::System.IntPtr jarg1); diff --git a/src/Tizen.NUI/src/internal/NativeBinding/NDalic.cs b/src/Tizen.NUI/src/internal/NativeBinding/NDalic.cs index 5294af418..a0d585a0b 100755 --- a/src/Tizen.NUI/src/internal/NativeBinding/NDalic.cs +++ b/src/Tizen.NUI/src/internal/NativeBinding/NDalic.cs @@ -1450,7 +1450,7 @@ namespace Tizen.NUI } } - public static Vector4 PAPAYA_WHIP + public static Vector4 PAPAYA_WHIP { get { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs b/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs index d39fb3925..44e721b43 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs @@ -153,7 +153,7 @@ namespace Tizen.NUI.Binding { if ((needsGetter && part.LastGetter == null) || (needsSetter && part.NextPart == null && part.LastSetter == null)) { - Console.WriteLine($"Binding, {PropertyNotFoundErrorMessage}, {part.Content}, {current}, {target.GetType()}, {property.PropertyName}"); + Console.WriteLine($"Binding, {PropertyNotFoundErrorMessage}, {part.Content}, {current}, {target.GetType()}, {property.PropertyName}"); break; } } diff --git a/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs b/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs index 87c62a58e..e824fb6ed 100755 --- a/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs +++ b/src/Tizen.NUI/src/public/Accessibility/Accessibility.cs @@ -46,7 +46,7 @@ namespace Tizen.NUI.Accessibility /// ~Accessibility() { - Tizen.Log.Debug("NUI",$"Accessibility is destroyed\n"); + Tizen.Log.Debug("NUI", $"Accessibility is destroyed\n"); } #endregion Constructor, Distructor, Dispose diff --git a/src/Tizen.NUI/src/public/Animation/Animation.cs b/src/Tizen.NUI/src/public/Animation/Animation.cs index f179d6017..81daefa31 100755 --- a/src/Tizen.NUI/src/public/Animation/Animation.cs +++ b/src/Tizen.NUI/src/public/Animation/Animation.cs @@ -694,13 +694,13 @@ namespace Tizen.NUI var current = result; using (var time = new TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime))) - while (current != null) - { - var targetValue = current.RefineValue(relativeValue) ?? throw new ArgumentException("Invalid " + nameof(relativeValue)); - AnimateBy(current.Property, targetValue, alphaFunction, time); - targetValue.Dispose(); - current = current.NextResult; - } + while (current != null) + { + var targetValue = current.RefineValue(relativeValue) ?? throw new ArgumentException("Invalid " + nameof(relativeValue)); + AnimateBy(current.Property, targetValue, alphaFunction, time); + targetValue.Dispose(); + current = current.NextResult; + } } } @@ -850,13 +850,13 @@ namespace Tizen.NUI var current = result; using (var time = new TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime))) - while (current != null) - { - var targetValue = current.RefineValue(destinationValue) ?? throw new ArgumentException("Invalid " + nameof(destinationValue)); - AnimateTo(current.Property, targetValue, alphaFunction, time); - targetValue.Dispose(); - current = current.NextResult; - } + while (current != null) + { + var targetValue = current.RefineValue(destinationValue) ?? throw new ArgumentException("Invalid " + nameof(destinationValue)); + AnimateTo(current.Property, targetValue, alphaFunction, time); + targetValue.Dispose(); + current = current.NextResult; + } } } @@ -897,7 +897,7 @@ namespace Tizen.NUI while (current != null) { // NOTE Do not dispose keyFrames object returned by GetRefinedKeyFrames() here. - AnimateBetween(current.Property, current.RefineKeyFrames(keyFrames) ?? throw new ArgumentException("Invalid " + nameof(keyFrames)), alphaFunction, interpolation); + AnimateBetween(current.Property, current.RefineKeyFrames(keyFrames) ?? throw new ArgumentException("Invalid " + nameof(keyFrames)), alphaFunction, interpolation); current = current.NextResult; } } @@ -940,12 +940,12 @@ namespace Tizen.NUI var current = result; using (var time = new TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime))) - while (current != null) - { - // NOTE Do not dispose keyFrames object returned by GetRefinedKeyFrames() here. - AnimateBetween(current.Property, current.RefineKeyFrames(keyFrames) ?? throw new ArgumentException("Invalid " + nameof(keyFrames)), alphaFunction, time, interpolation); - current = current.NextResult; - } + while (current != null) + { + // NOTE Do not dispose keyFrames object returned by GetRefinedKeyFrames() here. + AnimateBetween(current.Property, current.RefineKeyFrames(keyFrames) ?? throw new ArgumentException("Invalid " + nameof(keyFrames)), alphaFunction, time, interpolation); + current = current.NextResult; + } } } diff --git a/src/Tizen.NUI/src/public/Animation/TransitionAnimations.cs b/src/Tizen.NUI/src/public/Animation/TransitionAnimations.cs index 5dd08e366..112e51fd7 100755 --- a/src/Tizen.NUI/src/public/Animation/TransitionAnimations.cs +++ b/src/Tizen.NUI/src/public/Animation/TransitionAnimations.cs @@ -66,7 +66,7 @@ namespace Tizen.NUI private bool disposed = false; private ImageViewStyle defaultImageStyle; private List animationDataList; - + /// /// Create an instance of Transition. diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index 8c5fe025e..0087ad6eb 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -1247,31 +1247,31 @@ namespace Tizen.NUI.BaseComponents { if (_resourceUrl != null) { - Size2D imageSize = ImageLoading.GetOriginalImageSize(_resourceUrl, true); - - int adjustedDesiredWidth, adjustedDesiredHeight; - float aspectOfDesiredSize = (float)_desired_height / (float)_desired_width; - float aspectOfImageSize = (float)imageSize.Height / (float)imageSize.Width; - if( aspectOfImageSize > aspectOfDesiredSize) - { - adjustedDesiredWidth = _desired_width; - adjustedDesiredHeight = imageSize.Height * _desired_width / imageSize.Width; - } - else - { - adjustedDesiredWidth = imageSize.Width * _desired_height/ imageSize.Height; - adjustedDesiredHeight = _desired_height; - } - - PropertyValue returnWidth = new PropertyValue(adjustedDesiredWidth); - imageMap?.Insert(ImageVisualProperty.DesiredWidth, returnWidth); - returnWidth?.Dispose(); - PropertyValue returnHeight = new PropertyValue(adjustedDesiredHeight); - imageMap?.Insert(ImageVisualProperty.DesiredHeight, returnHeight); - returnHeight?.Dispose(); - PropertyValue scaleToFit = new PropertyValue((int)FittingModeType.ScaleToFill); - imageMap?.Insert(ImageVisualProperty.FittingMode, scaleToFit); - scaleToFit?.Dispose(); + Size2D imageSize = ImageLoading.GetOriginalImageSize(_resourceUrl, true); + + int adjustedDesiredWidth, adjustedDesiredHeight; + float aspectOfDesiredSize = (float)_desired_height / (float)_desired_width; + float aspectOfImageSize = (float)imageSize.Height / (float)imageSize.Width; + if (aspectOfImageSize > aspectOfDesiredSize) + { + adjustedDesiredWidth = _desired_width; + adjustedDesiredHeight = imageSize.Height * _desired_width / imageSize.Width; + } + else + { + adjustedDesiredWidth = imageSize.Width * _desired_height / imageSize.Height; + adjustedDesiredHeight = _desired_height; + } + + PropertyValue returnWidth = new PropertyValue(adjustedDesiredWidth); + imageMap?.Insert(ImageVisualProperty.DesiredWidth, returnWidth); + returnWidth?.Dispose(); + PropertyValue returnHeight = new PropertyValue(adjustedDesiredHeight); + imageMap?.Insert(ImageVisualProperty.DesiredHeight, returnHeight); + returnHeight?.Dispose(); + PropertyValue scaleToFit = new PropertyValue((int)FittingModeType.ScaleToFill); + imageMap?.Insert(ImageVisualProperty.FittingMode, scaleToFit); + scaleToFit?.Dispose(); } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs b/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs index 34edde256..79dd26ac5 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs @@ -522,7 +522,7 @@ namespace Tizen.NUI.BaseComponents /// The default constructor. /// [EditorBrowsable(EditorBrowsableState.Never)] - public SelectorItem() {} + public SelectorItem() { } /// /// The constructor with the specified state and value. diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs b/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs index d14607579..1d8967d6d 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs @@ -1127,10 +1127,12 @@ namespace Tizen.NUI.BaseComponents /// A float value for FontSizeScale property. /// [EditorBrowsable(EditorBrowsableState.Never)] - public static float GetFontSizeScale(SystemSettingsFontSize systemSettingsFontSize) { + public static float GetFontSizeScale(SystemSettingsFontSize systemSettingsFontSize) + { float ret = FontSizeScaleNormal; - switch (systemSettingsFontSize) { + switch (systemSettingsFontSize) + { case SystemSettingsFontSize.Small: ret = FontSizeScaleSmall; break; diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs index 40f1d4c3b..b38241538 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs @@ -23,9 +23,11 @@ using Tizen.NUI; namespace Tizen.NUI.BaseComponents { [EditorBrowsable(EditorBrowsableState.Never)] - public class Address { + public class Address + { [EditorBrowsable(EditorBrowsableState.Never)] - public Address(string xbus, string xpath) { + public Address(string xbus, string xpath) + { bus = xbus; path = xpath; } @@ -37,15 +39,17 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public class AddressCollection : SafeHandle { + public class AddressCollection : SafeHandle + { [EditorBrowsable(EditorBrowsableState.Never)] - public AddressCollection(IntPtr collection) : base(collection, true) {} + public AddressCollection(IntPtr collection) : base(collection, true) { } [EditorBrowsable(EditorBrowsableState.Never)] - public override bool IsInvalid { get { return this.handle == IntPtr.Zero; }} + public override bool IsInvalid { get { return this.handle == IntPtr.Zero; } } [EditorBrowsable(EditorBrowsableState.Never)] - public uint RelationSize(View.RelationType relation) { + public uint RelationSize(View.RelationType relation) + { uint result = Interop.ControlDevel.DaliToolkitDevelControlAccessibilityRelationsRelationSize(this, Convert.ToInt32(relation)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -53,7 +57,8 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public Address At(View.RelationType relation, int position) { + public Address At(View.RelationType relation, int position) + { var bus = Interop.ControlDevel.DaliToolkitDevelControlAccessibilityRelationsAt(this, Convert.ToInt32(relation), position, 0); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -66,7 +71,8 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - protected override bool ReleaseHandle() { + protected override bool ReleaseHandle() + { Interop.ControlDevel.DaliToolkitDevelControlDeleteAccessibilityRelations(handle); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -76,9 +82,11 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public partial class ReadingInfoTypes : SafeHandle { + public partial class ReadingInfoTypes : SafeHandle + { [EditorBrowsable(EditorBrowsableState.Never)] - public ReadingInfoTypes() : base (IntPtr.Zero, true) { + public ReadingInfoTypes() : base(IntPtr.Zero, true) + { var obj = Interop.ControlDevel.DaliToolkitDevelControlNewReadingInfoType(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -86,20 +94,22 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public ReadingInfoTypes(IntPtr ptr) : base(ptr, true) {} + public ReadingInfoTypes(IntPtr ptr) : base(ptr, true) { } [EditorBrowsable(EditorBrowsableState.Never)] - public override bool IsInvalid { get { return this.handle == IntPtr.Zero; }} + public override bool IsInvalid { get { return this.handle == IntPtr.Zero; } } [EditorBrowsable(EditorBrowsableState.Never)] - public void Set(ReadingInfoType type, bool v) { + public void Set(ReadingInfoType type, bool v) + { Interop.ControlDevel.DaliToolkitDevelControlReadingInfoTypesSet(this, (int)type, Convert.ToInt32(v)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public bool Get(ReadingInfoType type) { + public bool Get(ReadingInfoType type) + { bool result = Interop.ControlDevel.DaliToolkitDevelControlReadingInfoTypesGet(this, (int)type); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -107,7 +117,8 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - protected override bool ReleaseHandle() { + protected override bool ReleaseHandle() + { Interop.ControlDevel.DaliToolkitDevelControlDeleteReadingInfoType(handle); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -117,9 +128,11 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public partial class AccessibilityStates : SafeHandle { + public partial class AccessibilityStates : SafeHandle + { [EditorBrowsable(EditorBrowsableState.Never)] - public AccessibilityStates() : base (IntPtr.Zero, true) { + public AccessibilityStates() : base(IntPtr.Zero, true) + { var obj = Interop.ControlDevel.DaliToolkitDevelControlNewStates(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -127,20 +140,22 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public AccessibilityStates(IntPtr states) : base(states, true) {} + public AccessibilityStates(IntPtr states) : base(states, true) { } [EditorBrowsable(EditorBrowsableState.Never)] - public override bool IsInvalid { get { return this.handle == IntPtr.Zero; }} + public override bool IsInvalid { get { return this.handle == IntPtr.Zero; } } [EditorBrowsable(EditorBrowsableState.Never)] - public void Set(AccessibilityState type, bool v) { + public void Set(AccessibilityState type, bool v) + { Interop.ControlDevel.DaliToolkitDevelControlStatesSet(this, (int)type, Convert.ToInt32(v)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public bool Get(AccessibilityState type) { + public bool Get(AccessibilityState type) + { bool result = Interop.ControlDevel.DaliToolkitDevelControlStatesGet(this, (int)type); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -148,7 +163,8 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - protected override bool ReleaseHandle() { + protected override bool ReleaseHandle() + { Interop.ControlDevel.DaliToolkitDevelControlDeleteStates(handle); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -158,7 +174,8 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public class AccessibilityRange { + public class AccessibilityRange + { public int StartOffset { get; set; } = 0; public int EndOffset { get; set; } = 0; public string Content { get; set; } = ""; @@ -175,21 +192,24 @@ namespace Tizen.NUI.BaseComponents /////////////////////////////////////////////////////////////////// [EditorBrowsable(EditorBrowsableState.Never)] - public void AppendAccessibilityAttribute(string key, string val) { + public void AppendAccessibilityAttribute(string key, string val) + { Interop.ControlDevel.DaliToolkitDevelControlAppendAccessibilityAttribute(SwigCPtr, key, val); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void RemoveAccessibilityAttribute(string key) { + public void RemoveAccessibilityAttribute(string key) + { Interop.ControlDevel.DaliToolkitDevelControlRemoveAccessibilityAttribute(SwigCPtr, key); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void ClearAccessibilityAttributes() { + public void ClearAccessibilityAttributes() + { Interop.ControlDevel.DaliToolkitDevelControlClearAccessibilityAttributes(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -200,7 +220,8 @@ namespace Tizen.NUI.BaseComponents /////////////////////////////////////////////////////////////////// [EditorBrowsable(EditorBrowsableState.Never)] - public bool ClearAccessibilityHighlight() { + public bool ClearAccessibilityHighlight() + { bool result = Interop.ControlDevel.DaliToolkitDevelControlClearAccessibilityHighlight(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -208,7 +229,8 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public bool GrabAccessibilityHighlight() { + public bool GrabAccessibilityHighlight() + { bool result = Interop.ControlDevel.DaliToolkitDevelControlGrabAccessibilityHighlight(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -220,28 +242,32 @@ namespace Tizen.NUI.BaseComponents /////////////////////////////////////////////////////////////////// [EditorBrowsable(EditorBrowsableState.Never)] - public void AppendAccessibilityRelation(View second, RelationType relation) { + public void AppendAccessibilityRelation(View second, RelationType relation) + { Interop.ControlDevel.DaliToolkitDevelControlAppendAccessibilityRelation(SwigCPtr, second.SwigCPtr, (int)relation); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void RemoveAccessibilityRelation(View second, RelationType relation) { + public void RemoveAccessibilityRelation(View second, RelationType relation) + { Interop.ControlDevel.DaliToolkitDevelControlRemoveAccessibilityRelation(SwigCPtr, second.SwigCPtr, (int)relation); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void ClearAccessibilityRelations() { + public void ClearAccessibilityRelations() + { Interop.ControlDevel.DaliToolkitDevelControlClearAccessibilityRelations(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public AddressCollection GetAccessibilityRelations() { + public AddressCollection GetAccessibilityRelations() + { var result = new AddressCollection(Interop.ControlDevel.DaliToolkitDevelControlNewGetAccessibilityRelations(SwigCPtr)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -249,14 +275,16 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - public void SetAccessibilityReadingInfoType(ReadingInfoTypes types) { + public void SetAccessibilityReadingInfoType(ReadingInfoTypes types) + { Interop.ControlDevel.DaliToolkitDevelControlSetAccessibilityReadingInfoType(SwigCPtr, types); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public ReadingInfoTypes GetAccessibilityReadingInfoType() { + public ReadingInfoTypes GetAccessibilityReadingInfoType() + { var result = new ReadingInfoTypes(Interop.ControlDevel.DaliToolkitDevelControlNewGetAccessibilityReadingInfoType(SwigCPtr)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -268,14 +296,16 @@ namespace Tizen.NUI.BaseComponents /////////////////////////////////////////////////////////////////// [EditorBrowsable(EditorBrowsableState.Never)] - public void NotifyAccessibilityStateChange(AccessibilityStates states, bool recursive) { + public void NotifyAccessibilityStateChange(AccessibilityStates states, bool recursive) + { Interop.ControlDevel.DaliToolkitDevelControlNotifyAccessibilityStateChange(SwigCPtr, states, Convert.ToInt32(recursive)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public AccessibilityStates GetAccessibilityStates() { + public AccessibilityStates GetAccessibilityStates() + { var result = new AccessibilityStates(Interop.ControlDevel.DaliToolkitDevelControlNewGetAccessibilityStates(SwigCPtr)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -287,35 +317,40 @@ namespace Tizen.NUI.BaseComponents /////////////////////////////////////////////////////////////////// [EditorBrowsable(EditorBrowsableState.Never)] - public void EmitAccessibilityEvent(ObjectPropertyChangeEvent e) { + public void EmitAccessibilityEvent(ObjectPropertyChangeEvent e) + { Interop.ControlDevel.DaliAccessibilityEmitAccessibilityEvent(SwigCPtr, Convert.ToInt32(e)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void EmitAccessibilityStateChangedEvent(AccessibilityState e, bool b) { + public void EmitAccessibilityStateChangedEvent(AccessibilityState e, bool b) + { Interop.ControlDevel.DaliAccessibilityEmitAccessibilityStateChangedEvent(SwigCPtr, Convert.ToInt32(e), Convert.ToInt32(b)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void EmitTextInsertedEvent(int position, int length, string content) { + public void EmitTextInsertedEvent(int position, int length, string content) + { Interop.ControlDevel.DaliAccessibilityEmitTextInsertedEvent(SwigCPtr, position, length, content); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void EmitTextDeletedEvent(int position, int length, string content) { + public void EmitTextDeletedEvent(int position, int length, string content) + { Interop.ControlDevel.DaliAccessibilityEmitTextDeletedEvent(SwigCPtr, position, length, content); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void EmitTextCaretMovedEvent(int position) { + public void EmitTextCaretMovedEvent(int position) + { Interop.ControlDevel.DaliAccessibilityEmitTextCaretMovedEvent(SwigCPtr, position); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -326,14 +361,16 @@ namespace Tizen.NUI.BaseComponents /////////////////////////////////////////////////////////////////// [EditorBrowsable(EditorBrowsableState.Never)] - public void AddPopup() { + public void AddPopup() + { Interop.ControlDevel.DaliAccessibilityBridgeAddPopup(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } [EditorBrowsable(EditorBrowsableState.Never)] - public void RemovePopup() { + public void RemovePopup() + { Interop.ControlDevel.DaliAccessibilityBridgeRemovePopup(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs index 9fda02bfc..766a3be2d 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs @@ -51,7 +51,7 @@ namespace Tizen.NUI.BaseComponents [EditorBrowsable(EditorBrowsableState.Never)] public override bool Equals(System.Object obj) { - if(obj is GestureInfoType) + if (obj is GestureInfoType) { return this.Equals((GestureInfoType)obj); } @@ -121,18 +121,22 @@ namespace Tizen.NUI.BaseComponents /// 3 public partial class View { - internal class ControlHandle : SafeHandle { - public ControlHandle() : base (IntPtr.Zero, true) {} + internal class ControlHandle : SafeHandle + { + public ControlHandle() : base(IntPtr.Zero, true) { } - public ControlHandle(IntPtr ptr) : base(ptr, true) {} + public ControlHandle(IntPtr ptr) : base(ptr, true) { } - public override bool IsInvalid { - get { + public override bool IsInvalid + { + get + { return this.handle == IntPtr.Zero; } } - protected override bool ReleaseHandle() { + protected override bool ReleaseHandle() + { Interop.View.DeleteControlHandleView(handle); this.SetHandle(IntPtr.Zero); return true; @@ -140,7 +144,8 @@ namespace Tizen.NUI.BaseComponents } [EditorBrowsable(EditorBrowsableState.Never)] - ControlHandle GetControl() { + ControlHandle GetControl() + { var ret = new ControlHandle(Interop.View.DownCast(SwigCPtr)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -154,11 +159,13 @@ namespace Tizen.NUI.BaseComponents private GestureInfoHandlerType gestureInfoCallback; private EventHandler gestureInfoHandler; - private void OnGestureInfoEvent(IntPtr data) { + private void OnGestureInfoEvent(IntPtr data) + { if (data == IntPtr.Zero) return; - if (Marshal.SizeOf() != AccessibilityDoGestureSignal.GetSizeOfGestureInfo()) { + if (Marshal.SizeOf() != AccessibilityDoGestureSignal.GetSizeOfGestureInfo()) + { throw new global::System.ApplicationException("ABI mismatch SizeOf(C# GestureInfo) != SizeOf(c++ GestureInfo)"); } @@ -174,22 +181,27 @@ namespace Tizen.NUI.BaseComponents // This uses DoGestureInfo signal from C++ API. [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler GestureInfoReceived { - add { - if (gestureInfoHandler == null) { + public event EventHandler GestureInfoReceived + { + add + { + if (gestureInfoHandler == null) + { gestureInfoCallback = OnGestureInfoEvent; GestureInfoSignal().Connect(gestureInfoCallback); } gestureInfoHandler += value; } - remove { + remove + { gestureInfoHandler -= value; if (gestureInfoHandler == null && GestureInfoSignal().Empty() == false) GestureInfoSignal().Disconnect(gestureInfoCallback); } } - internal AccessibilityDoGestureSignal GestureInfoSignal() { + internal AccessibilityDoGestureSignal GestureInfoSignal() + { var handle = GetControl(); AccessibilityDoGestureSignal ret = new AccessibilityDoGestureSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityDoGestureSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -204,7 +216,8 @@ namespace Tizen.NUI.BaseComponents private GetDescriptionHandlerType getDescriptionCallback; private EventHandler getDescriptionHandler; - private void OnGetDescriptionEvent(IntPtr data) { + private void OnGetDescriptionEvent(IntPtr data) + { if (data == IntPtr.Zero) return; @@ -216,22 +229,27 @@ namespace Tizen.NUI.BaseComponents // This uses GetDescription signal from C++ API. [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler DescriptionRequested { - add { - if (getDescriptionHandler == null) { + public event EventHandler DescriptionRequested + { + add + { + if (getDescriptionHandler == null) + { getDescriptionCallback = OnGetDescriptionEvent; GetDescriptionSignal().Connect(getDescriptionCallback); } getDescriptionHandler += value; } - remove { + remove + { getDescriptionHandler -= value; if (getDescriptionHandler == null && GetDescriptionSignal().Empty() == false) GetDescriptionSignal().Disconnect(getDescriptionCallback); } } - internal StringToVoidSignal GetDescriptionSignal() { + internal StringToVoidSignal GetDescriptionSignal() + { var handle = GetControl(); StringToVoidSignal ret = new StringToVoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityGetDescriptionSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -246,7 +264,8 @@ namespace Tizen.NUI.BaseComponents private GetNameHandlerType getNameCallback; private EventHandler getNameHandler; - private void OnGetNameEvent(IntPtr data) { + private void OnGetNameEvent(IntPtr data) + { if (data == IntPtr.Zero) return; @@ -258,22 +277,27 @@ namespace Tizen.NUI.BaseComponents // This uses GetName signal from C++ API. [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler NameRequested { - add { - if (getNameHandler == null) { + public event EventHandler NameRequested + { + add + { + if (getNameHandler == null) + { getNameCallback = OnGetNameEvent; GetNameSignal().Connect(getNameCallback); } getNameHandler += value; } - remove { + remove + { getNameHandler -= value; if (getNameHandler == null && GetNameSignal().Empty() == false) GetNameSignal().Disconnect(getNameCallback); } } - internal StringToVoidSignal GetNameSignal() { + internal StringToVoidSignal GetNameSignal() + { var handle = GetControl(); StringToVoidSignal ret = new StringToVoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityGetNameSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -288,27 +312,33 @@ namespace Tizen.NUI.BaseComponents private VoidHandlerType activateCallback; private EventHandler activateHandler; - private void OnActivateEvent() { + private void OnActivateEvent() + { activateHandler?.Invoke(this, null); } [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler Activate { - add { - if (activateHandler == null) { + public event EventHandler Activate + { + add + { + if (activateHandler == null) + { activateCallback = OnActivateEvent; ActivateSignal().Connect(activateCallback); } activateHandler += value; } - remove { + remove + { activateHandler -= value; if (activateHandler == null && ActivateSignal().Empty() == false) ActivateSignal().Disconnect(activateCallback); } } - internal VoidSignal ActivateSignal() { + internal VoidSignal ActivateSignal() + { var handle = GetControl(); VoidSignal ret = new VoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityActivateSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -322,27 +352,33 @@ namespace Tizen.NUI.BaseComponents private VoidHandlerType readingSkippedCallback; private EventHandler readingSkippedHandler; - private void OnReadingSkippedEvent() { + private void OnReadingSkippedEvent() + { readingSkippedHandler?.Invoke(this, null); } [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler ReadingSkipped { - add { - if (readingSkippedHandler == null) { + public event EventHandler ReadingSkipped + { + add + { + if (readingSkippedHandler == null) + { readingSkippedCallback = OnReadingSkippedEvent; ReadingSkippedSignal().Connect(readingSkippedCallback); } readingSkippedHandler += value; } - remove { + remove + { readingSkippedHandler -= value; if (readingSkippedHandler == null && ReadingSkippedSignal().Empty() == false) ReadingSkippedSignal().Disconnect(readingSkippedCallback); } } - internal VoidSignal ReadingSkippedSignal() { + internal VoidSignal ReadingSkippedSignal() + { var handle = GetControl(); VoidSignal ret = new VoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityReadingSkippedSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -356,27 +392,33 @@ namespace Tizen.NUI.BaseComponents private VoidHandlerType readingPausedCallback; private EventHandler readingPausedHandler; - private void OnReadingPausedEvent() { + private void OnReadingPausedEvent() + { readingPausedHandler?.Invoke(this, null); } [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler ReadingPaused { - add { - if (readingPausedHandler == null) { + public event EventHandler ReadingPaused + { + add + { + if (readingPausedHandler == null) + { readingPausedCallback = OnReadingPausedEvent; ReadingPausedSignal().Connect(readingPausedCallback); } readingPausedHandler += value; } - remove { + remove + { readingPausedHandler -= value; if (readingPausedHandler == null && ReadingPausedSignal().Empty() == false) ReadingPausedSignal().Disconnect(readingPausedCallback); } } - internal VoidSignal ReadingPausedSignal() { + internal VoidSignal ReadingPausedSignal() + { var handle = GetControl(); VoidSignal ret = new VoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityReadingPausedSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -390,27 +432,33 @@ namespace Tizen.NUI.BaseComponents private VoidHandlerType readingResumedCallback; private EventHandler readingResumedHandler; - private void OnReadingResumedEvent() { + private void OnReadingResumedEvent() + { readingResumedHandler?.Invoke(this, null); } [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler ReadingResumed { - add { - if (readingResumedHandler == null) { + public event EventHandler ReadingResumed + { + add + { + if (readingResumedHandler == null) + { readingResumedCallback = OnReadingResumedEvent; ReadingResumedSignal().Connect(readingResumedCallback); } readingResumedHandler += value; } - remove { + remove + { readingResumedHandler -= value; if (readingResumedHandler == null && ReadingResumedSignal().Empty() == false) ReadingResumedSignal().Disconnect(readingResumedCallback); } } - internal VoidSignal ReadingResumedSignal() { + internal VoidSignal ReadingResumedSignal() + { var handle = GetControl(); VoidSignal ret = new VoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityReadingResumedSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -424,27 +472,33 @@ namespace Tizen.NUI.BaseComponents private VoidHandlerType readingCancelledCallback; private EventHandler readingCancelledHandler; - private void OnReadingCancelledEvent() { + private void OnReadingCancelledEvent() + { readingCancelledHandler?.Invoke(this, null); } [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler ReadingCancelled { - add { - if (readingCancelledHandler == null) { + public event EventHandler ReadingCancelled + { + add + { + if (readingCancelledHandler == null) + { readingCancelledCallback = OnReadingCancelledEvent; ReadingCancelledSignal().Connect(readingCancelledCallback); } readingCancelledHandler += value; } - remove { + remove + { readingCancelledHandler -= value; if (readingCancelledHandler == null && ReadingCancelledSignal().Empty() == false) ReadingCancelledSignal().Disconnect(readingCancelledCallback); } } - internal VoidSignal ReadingCancelledSignal() { + internal VoidSignal ReadingCancelledSignal() + { var handle = GetControl(); VoidSignal ret = new VoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityReadingCancelledSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -458,27 +512,33 @@ namespace Tizen.NUI.BaseComponents private VoidHandlerType readingStoppedCallback; private EventHandler readingStoppedHandler; - private void OnReadingStoppedEvent() { + private void OnReadingStoppedEvent() + { readingStoppedHandler?.Invoke(this, null); } [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler ReadingStopped { - add { - if (readingStoppedHandler == null) { + public event EventHandler ReadingStopped + { + add + { + if (readingStoppedHandler == null) + { readingStoppedCallback = OnReadingStoppedEvent; ReadingStoppedSignal().Connect(readingStoppedCallback); } readingStoppedHandler += value; } - remove { + remove + { readingStoppedHandler -= value; if (readingStoppedHandler == null && ReadingStoppedSignal().Empty() == false) ReadingStoppedSignal().Disconnect(readingStoppedCallback); } } - internal VoidSignal ReadingStoppedSignal() { + internal VoidSignal ReadingStoppedSignal() + { var handle = GetControl(); VoidSignal ret = new VoidSignal(Interop.ControlDevel.DaliToolkitDevelControlAccessibilityReadingStoppedSignal(handle), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/Common/BlendEquationType.cs b/src/Tizen.NUI/src/public/Common/BlendEquationType.cs index 96b14a5fa..7d2ce251a 100755 --- a/src/Tizen.NUI/src/public/Common/BlendEquationType.cs +++ b/src/Tizen.NUI/src/public/Common/BlendEquationType.cs @@ -20,70 +20,70 @@ using System.ComponentModel; namespace Tizen.NUI { /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public enum BlendEquationType { /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Add = 0x8006, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Subtract = 0x800A, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] ReverseSubtract = 0x800B, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Min = 0x8007, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Max = 0x8008, //Advanced Blend Equation /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Multiply = 0x9294, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Screen = 0x9295, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Overlay = 0x9296, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Darken = 0x9297, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Lighten = 0x9298, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] ColorDodge = 0x9299, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] ColorBurn = 0x929A, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] HardLight = 0x929B, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] SoftLight = 0x929C, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Difference = 0x929E, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Exclusion = 0x92A0, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Hue = 0x92AD, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Saturation = 0x92AE, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Color = 0x92AF, /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] Luminosity = 0x92B0 } } diff --git a/src/Tizen.NUI/src/public/Common/Color.cs b/src/Tizen.NUI/src/public/Common/Color.cs index 04eb181b4..c81c0a2c7 100755 --- a/src/Tizen.NUI/src/public/Common/Color.cs +++ b/src/Tizen.NUI/src/public/Common/Color.cs @@ -703,7 +703,7 @@ namespace Tizen.NUI /// Gets the Papaya_whip colored Color class. /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly Color PapayaWhip = NDalic.PAPAYA_WHIP ; + public static readonly Color PapayaWhip = NDalic.PAPAYA_WHIP; /// /// Gets the Peach_puff colored Color class. @@ -973,7 +973,7 @@ namespace Tizen.NUI textColor = textColor.ToUpperInvariant(); textColor = textColor.Replace(" ", ""); - if ( textColor.Length > 0 && textColor[0] == '#') + if (textColor.Length > 0 && textColor[0] == '#') { textColor = textColor.Replace("#", ""); int textColorLength = textColor.Length; @@ -1002,29 +1002,29 @@ namespace Tizen.NUI bool isRGBA = textColor.StartsWith("RGBA("); bool isRGB = textColor.StartsWith("RGB("); - if(!isRGBA && !isRGB) + if (!isRGBA && !isRGB) { throw new global::System.ArgumentException("Please check your color text code"); } - if(isRGBA) + if (isRGBA) textColor = textColor.Substring(4); - if(isRGB) + if (isRGB) textColor = textColor.Substring(3); - textColor = textColor.Replace(")",""); - textColor = textColor.Replace("(",""); + textColor = textColor.Replace(")", ""); + textColor = textColor.Replace("(", ""); string[] components = textColor.Split(','); - if(components.Length == 3 && isRGB) + if (components.Length == 3 && isRGB) { R = Math.Min(1.0f, ((float)Convert.ToInt32(components[0], 10)) / 255.0f); G = Math.Min(1.0f, ((float)Convert.ToInt32(components[1], 10)) / 255.0f); B = Math.Min(1.0f, ((float)Convert.ToInt32(components[2], 10)) / 255.0f); A = 1.0f; } - else if(components.Length == 4 && isRGBA) + else if (components.Length == 4 && isRGBA) { R = Math.Min(1.0f, ((float)Convert.ToInt32(components[0], 10)) / 255.0f); G = Math.Min(1.0f, ((float)Convert.ToInt32(components[1], 10)) / 255.0f); diff --git a/src/Tizen.NUI/src/public/Common/Layer.cs b/src/Tizen.NUI/src/public/Common/Layer.cs index 3c40e9b52..75d406391 100755 --- a/src/Tizen.NUI/src/public/Common/Layer.cs +++ b/src/Tizen.NUI/src/public/Common/Layer.cs @@ -284,7 +284,7 @@ namespace Tizen.NUI { child.InternalParent = this; } - Interop.Actor.Add( SwigCPtr , View.getCPtr(child)); + Interop.Actor.Add(SwigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); Children.Add(child); @@ -305,7 +305,7 @@ namespace Tizen.NUI { throw new ArgumentNullException(nameof(child)); } - Interop.Actor.Remove( SwigCPtr, View.getCPtr(child)); + Interop.Actor.Remove(SwigCPtr, View.getCPtr(child)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/Layouting/LayoutItem.cs b/src/Tizen.NUI/src/public/Layouting/LayoutItem.cs index 83b466ae5..a963d0045 100755 --- a/src/Tizen.NUI/src/public/Layouting/LayoutItem.cs +++ b/src/Tizen.NUI/src/public/Layouting/LayoutItem.cs @@ -609,7 +609,7 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] protected virtual void Dispose(bool disposing) { - if(disposed) + if (disposed) { return; } diff --git a/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs b/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs old mode 100644 new mode 100755 index 94136a5e8..c78e17fbb --- a/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs +++ b/src/Tizen.NUI/src/public/Layouting/RelativeLayout.cs @@ -361,7 +361,7 @@ namespace Tizen.NUI } } - (float childrenWidth, float childrenHeight) = CalculateChildrenSize(widthMeasureSpec.Size.AsDecimal(), heightMeasureSpec.Size.AsDecimal()); + (float childrenWidth, float childrenHeight) = CalculateChildrenSize(widthMeasureSpec.Size.AsDecimal(), heightMeasureSpec.Size.AsDecimal()); SetMeasuredDimensions(ResolveSizeAndState(new LayoutLength(childrenWidth), widthMeasureSpec, childWidthState), ResolveSizeAndState(new LayoutLength(childrenHeight), heightMeasureSpec, childHeightState)); } diff --git a/src/Tizen.NUI/src/public/Theme/ExternalThemeKeyList.cs b/src/Tizen.NUI/src/public/Theme/ExternalThemeKeyList.cs old mode 100644 new mode 100755 index c63a3148f..ab3b37d17 --- a/src/Tizen.NUI/src/public/Theme/ExternalThemeKeyList.cs +++ b/src/Tizen.NUI/src/public/Theme/ExternalThemeKeyList.cs @@ -173,7 +173,8 @@ namespace Tizen.NUI private Action GenSelectorAction(ControlState state) { - return (ViewStyle viewStyle, string stringInput) => { + return (ViewStyle viewStyle, string stringInput) => + { if (ParseXamlStringToObject(stringInput) is T tValue) { if (selectorData == null) @@ -187,7 +188,8 @@ namespace Tizen.NUI private Action GenBackgroundSelectorAction(ControlState state) { - return (ViewStyle viewStyle, string stringInput) => { + return (ViewStyle viewStyle, string stringInput) => + { var imageUrl = TryConvertToResourcePath(stringInput); if (imageUrl != null) @@ -211,7 +213,8 @@ namespace Tizen.NUI private Action GenSelectorFinalizer(Action> setter) { - return (ViewStyle viewStyle, string value) => { + return (ViewStyle viewStyle, string value) => + { if (selectorData == null || viewStyle == null) { return; @@ -223,7 +226,8 @@ namespace Tizen.NUI private Action GenColorOrImageSelectorFinalizer(Action> colorSetter, Action> imageSetter) { - return (ViewStyle viewStyle, string value) => { + return (ViewStyle viewStyle, string value) => + { if (viewStyle == null) { return; diff --git a/src/Tizen.NUI/src/public/Utility/GraphicsCapabilities.cs b/src/Tizen.NUI/src/public/Utility/GraphicsCapabilities.cs index 9e8d41a3f..220c50094 100755 --- a/src/Tizen.NUI/src/public/Utility/GraphicsCapabilities.cs +++ b/src/Tizen.NUI/src/public/Utility/GraphicsCapabilities.cs @@ -14,19 +14,19 @@ * limitations under the License. * */ - + using System.ComponentModel; namespace Tizen.NUI { /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public static class GraphicsCapabilities { - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable(EditorBrowsableState.Never)] public static bool IsBlendEquationSupported(BlendEquationType blendEquation) { - return Interop.GraphicsCapabilities.IsBlendEquationSupported((int)blendEquation); + return Interop.GraphicsCapabilities.IsBlendEquationSupported((int)blendEquation); } } } diff --git a/src/Tizen.NUI/src/public/Utility/Timer.cs b/src/Tizen.NUI/src/public/Utility/Timer.cs index daebbb786..f7976b30d 100755 --- a/src/Tizen.NUI/src/public/Utility/Timer.cs +++ b/src/Tizen.NUI/src/public/Utility/Timer.cs @@ -71,7 +71,7 @@ namespace Tizen.NUI /// ~Timer() { - Tizen.Log.Debug("NUI",$"(0x{SwigCPtr.Handle:X})Timer() distructor!, disposed={disposed}"); + Tizen.Log.Debug("NUI", $"(0x{SwigCPtr.Handle:X})Timer() distructor!, disposed={disposed}"); } [UnmanagedFunctionPointer(CallingConvention.StdCall)] diff --git a/src/Tizen.NUI/src/public/Visuals/VisualConstants.cs b/src/Tizen.NUI/src/public/Visuals/VisualConstants.cs index c1a7dd54d..7531c74de 100755 --- a/src/Tizen.NUI/src/public/Visuals/VisualConstants.cs +++ b/src/Tizen.NUI/src/public/Visuals/VisualConstants.cs @@ -451,7 +451,7 @@ namespace Tizen.NUI /// This specifies visual properties. /// /// 3 - [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1716: Identifiers should not match keywords")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1716: Identifiers should not match keywords")] public struct Property { /// diff --git a/src/Tizen.NUI/src/public/Window/WindowEvent.cs b/src/Tizen.NUI/src/public/Window/WindowEvent.cs index c709cfd90..91b5849dd 100755 --- a/src/Tizen.NUI/src/public/Window/WindowEvent.cs +++ b/src/Tizen.NUI/src/public/Window/WindowEvent.cs @@ -558,7 +558,7 @@ namespace Tizen.NUI if (windowFocusChangedEventCallback2 != null) { - windowFocusChangedSignal2?.Disconnect(windowFocusChangedEventCallback2); + windowFocusChangedSignal2?.Disconnect(windowFocusChangedEventCallback2); } if (transitionEffectSignal != null) diff --git a/src/Tizen.NUI/src/public/Xaml/XamlParseException.cs b/src/Tizen.NUI/src/public/Xaml/XamlParseException.cs index 5b62047fd..da1c3f5a8 100755 --- a/src/Tizen.NUI/src/public/Xaml/XamlParseException.cs +++ b/src/Tizen.NUI/src/public/Xaml/XamlParseException.cs @@ -54,14 +54,14 @@ namespace Tizen.NUI.Xaml [EditorBrowsable(EditorBrowsableState.Never)] public XamlParseException(string message) : base(message) { - unformattedMessage = message; + unformattedMessage = message; } /// Initializes a new instance with message and inner exception. [EditorBrowsable(EditorBrowsableState.Never)] public XamlParseException(string message, Exception innerException = null) : base(message, innerException) { - unformattedMessage = message; + unformattedMessage = message; } /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. diff --git a/src/Tizen.NUI/src/public/XamlBinding/Interactivity/EventTrigger.cs b/src/Tizen.NUI/src/public/XamlBinding/Interactivity/EventTrigger.cs index ce5780cbb..06bc0008d 100755 --- a/src/Tizen.NUI/src/public/XamlBinding/Interactivity/EventTrigger.cs +++ b/src/Tizen.NUI/src/public/XamlBinding/Interactivity/EventTrigger.cs @@ -94,7 +94,7 @@ namespace Tizen.NUI.Binding } catch (Exception) { - Console.WriteLine($"EventTrigger", "Can not attach EventTrigger to {binding.GetType()}.{Evnet}. Check if the handler exists and if the signature is right."); + Console.WriteLine($"EventTrigger", "Can not attach EventTrigger to {binding.GetType()}.{Evnet}. Check if the handler exists and if the signature is right."); } if (eventinfo != null && handlerdelegate != null) eventinfo.AddEventHandler(bindable, handlerdelegate); diff --git a/src/Tizen.NUI/src/public/XamlBinding/Internals/INameScope.cs b/src/Tizen.NUI/src/public/XamlBinding/Internals/INameScope.cs index 37ed6dad3..31175cb90 100755 --- a/src/Tizen.NUI/src/public/XamlBinding/Internals/INameScope.cs +++ b/src/Tizen.NUI/src/public/XamlBinding/Internals/INameScope.cs @@ -40,6 +40,6 @@ namespace Tizen.NUI.Binding.Internals /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] [ObsoleteAttribute(" ", false)] - void RegisterName(string name, object scopedElement, IXmlLineInfo xmlLineInfo); + void RegisterName(string name, object scopedElement, IXmlLineInfo xmlLineInfo); } }