From 59970b38bb97cee7b6ff8afb9388996c022c9010 Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Thu, 30 May 2019 18:20:23 +0900 Subject: [PATCH] [NUI] Split NUI Assemblies (#865) * Split Tizen.NUI (#848) * Split Tizen.NUI (#848) (#854) * Fix compile error (#857) * Split Tizen.NUI (#848) * [NUI]Fix compile error * Fix API break (#859) * Split Tizen.NUI (#848) * [NUI]Fix compile error * [NUI]Fix API break * [NUI]Fix API break * [Build] Update APITool * Fix build error of Tizen.NUI.Design (#863) * [NUI] Fix NUI version (#842) Signed-off-by: huiyu.eun * [NUI] Add Registry return (#831) Signed-off-by: huiyu.eun * [NUI] Xaml intellisense support (#853) * [NUI] Add XAML intellisense support (#834) I merge this PR to xaml-support branch first to fix some build and packaging files with other commits. After works in xaml-support branch, I will merge it to master later. * [Build] Add Tizen.NUI.Design and dependent runtime assemblies to nuget * [Build] Add dummy assemblies to nuget instead of reference assemblies * Update .travis.yml * [VoiceControlManager][TCSACR-213] Add VoiceControlManager APIs (#841) * Add Tizen.Uix.VoiceControlManager Signed-off-by: sungrae jo * [VoiceControlManager] Modified code by API review * [MediaContent] Deprecate filter keyword (#832) * [Build] Resolve conflict APITool with master branch * [NUI]Fix the API break (Tizen.NUI.BaseHandle) * [NUI]Fix PR check warning --- src/Tizen.NUI.Design/Tizen.NUI.Design.csproj | 4 +- src/Tizen.NUI.Design/Tizen.NUI.Design.sln | 14 + .../Tizen.NUI.Design/AttributeTableBuilder.cs | 2 +- .../Tizen.NUI/AttributeTableBuilder.cs | 1 + src/Tizen.NUI.Xaml/Properties/AssemblyInfo.cs | 18 + .../Properties/GlobalAssemblyInfo.cs | 6 + src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.csproj | 19 + src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.sln | 55 + .../internal/Xaml/ApplyPropertiesVisitor.cs | 8 +- .../src/internal/Xaml/CreateValuesVisitor.cs | 45 +- .../src/internal/Xaml/DesignMode.cs | 0 .../src/internal/Xaml/ExpandMarkupsVisitor.cs | 2 +- .../Xaml/FillResourceDictionariesVisitor.cs | 2 +- .../src/internal/Xaml/HydrationContext.cs | 0 .../src/internal/Xaml/IConverterOptions.cs | 0 .../internal/Xaml/IDictionaryExtensions.cs | 0 .../src/internal/Xaml/IExpressionParser.cs | 0 .../Xaml/INativeValueConverterService.cs | 0 .../src/internal/Xaml/IProvideParentValues.cs | 0 .../src/internal/Xaml/IResourcesLoader.cs | 0 .../src/internal/Xaml/IRootObjectProvider.cs | 0 .../internal/Xaml/IValueConverterProvider.cs | 0 .../internal/Xaml/MarkupExpressionParser.cs | 0 .../internal/Xaml/MarkupExtensionParser.cs | 2 +- .../src/internal/Xaml/NamescopingVisitor.cs | 2 +- .../Xaml/ProvideCompiledAttribute.cs | 0 .../internal/Xaml/PruneIgnoredNodesVisitor.cs | 0 .../src/internal/Xaml/ReflectionExtensions.cs | 2 +- .../internal/Xaml/RegisterXNamesVisitor.cs | 2 +- .../src/internal/Xaml/ResourcesLoader.cs | 4 +- .../Xaml/RuntimeNamePropertyAttribute.cs | 0 .../src/internal/Xaml/TypeArgumentsParser.cs | 0 .../internal/Xaml/TypeConversionAttribute.cs | 0 .../internal/Xaml/TypeConversionExtensions.cs | 39 +- .../internal/Xaml/ValueConverterProvider.cs | 1 - .../src/internal/Xaml/VisualStateManager.cs | 15 +- .../src/internal/Xaml/XamlLoader.cs | 41 +- .../src/internal/Xaml/XamlNode.cs | 4 +- .../src/internal/Xaml/XamlNodeVisitor.cs | 0 .../src/internal/Xaml/XamlParseException.cs | 2 +- .../src/internal/Xaml/XamlParser.cs | 7 +- .../src/internal/Xaml/XmlName.cs | 0 .../src/internal/Xaml/XmlnsHelper.cs | 0 .../src/internal/XamlBinding/Accelerator.cs | 2 +- .../XamlBinding/AcceleratorTypeConverter.cs | 2 +- .../XamlBinding/ActionSheetArguments.cs | 4 +- .../internal/XamlBinding/AlertArguments.cs | 4 +- .../src/internal/XamlBinding/BaseMenuItem.cs | 4 +- .../XamlBinding/BindableObjectExtensions.cs | 2 +- .../XamlBinding/BindingBaseExtensions.cs | 2 +- .../internal/XamlBinding/BindingExpression.cs | 64 +- .../XamlBinding/BindingTypeConverter.cs | 4 +- .../CollectionSynchronizationContext.cs | 2 +- .../src/internal/XamlBinding/Configuration.cs | 2 +- .../XamlBinding/ContentPropertyAttribute.cs | 4 +- .../internal/XamlBinding/ControlTemplate.cs | 4 +- .../src/internal/XamlBinding/DataTemplate.cs | 2 +- .../XamlBinding/DataTemplateExtensions.cs | 5 +- .../XamlBinding/DataTemplateSelector.cs | 6 +- .../XamlBinding/DependencyAttribute.cs | 2 +- .../XamlBinding/DependencyFetchTarget.cs | 2 +- .../XamlBinding/DependencyResolver.cs | 4 +- .../internal/XamlBinding/DependencyService.cs | 8 +- .../src/internal/XamlBinding/Device.cs | 20 +- .../src/internal/XamlBinding/DeviceInfo.cs | 9 +- .../internal/XamlBinding/DeviceOrientation.cs | 5 +- .../src/internal/XamlBinding/Effect.cs | 6 +- .../XamlBinding/EffectiveFlowDirection.cs | 2 +- .../EffectiveFlowDirectionExtensions.cs | 5 +- .../internal/XamlBinding/ElementCollection.cs | 2 +- .../internal/XamlBinding/ElementEventArgs.cs | 2 +- .../internal/XamlBinding/ElementTemplate.cs | 6 +- .../XamlBinding/EnumerableExtensions.cs | 4 +- .../src/internal/XamlBinding/EventArg.cs | 4 +- .../XamlBinding/ExportEffectAttribute.cs | 2 +- .../XamlBinding/ExtentsTypeConverter.cs | 6 +- .../internal/XamlBinding/FileImageSource.cs | 2 +- .../XamlBinding/FileImageSourceConverter.cs | 2 +- .../src/internal/XamlBinding/FlowDirection.cs | 2 +- .../internal/XamlBinding/GestureRecognizer.cs | 2 +- .../internal/XamlBinding/HandlerAttribute.cs | 2 +- .../XamlBinding/IAppIndexingProvider.cs | 2 +- .../src/internal/XamlBinding/IAppLinkEntry.cs | 2 +- .../src/internal/XamlBinding/IAppLinks.cs | 2 +- .../internal/XamlBinding/IConfigElement.cs | 5 +- .../internal/XamlBinding/IConfigPlatform.cs | 5 +- .../internal/XamlBinding/IControlTemplated.cs | 2 +- .../XamlBinding/IEffectControlProvider.cs | 5 +- .../src/internal/XamlBinding/IElement.cs | 4 +- .../XamlBinding/IElementConfiguration.cs | 2 +- .../XamlBinding/IElementController.cs | 4 +- .../XamlBinding/IGestureRecognizer.cs | 2 +- .../XamlBinding/IIsolatedStorageFile.cs | 4 +- .../src/internal/XamlBinding/ILayout.cs | 2 +- .../internal/XamlBinding/ILayoutController.cs | 2 +- .../XamlBinding/IMenuItemController.cs | 2 +- .../XamlBinding/INativeBindingService.cs | 2 +- .../src/internal/XamlBinding/INavigation.cs | 5 +- .../XamlBinding/INavigationMenuController.cs | 7 + .../XamlBinding/INavigationPageController.cs | 5 +- .../internal/XamlBinding/IPaddingElement.cs | 2 +- .../internal/XamlBinding/IPageContainer.cs | 7 + .../internal/XamlBinding/IPageController.cs | 3 +- .../src/internal/XamlBinding/IPlatform.cs | 5 +- .../IPlatformElementConfiguration.cs | 5 +- .../internal/XamlBinding/IPlatformServices.cs | 6 +- .../src/internal/XamlBinding/IRegisterable.cs | 2 +- .../XamlBinding/IResourceDictionary.cs | 4 +- .../XamlBinding/ISystemResourcesProvider.cs | 5 +- .../src/internal/XamlBinding/ITimer.cs | 2 +- .../internal/XamlBinding/IViewContainer.cs | 9 + .../internal/XamlBinding/IViewController.cs | 2 +- .../XamlBinding/IVisualElementController.cs | 8 +- .../src/internal/XamlBinding/ImageSource.cs | 2 +- .../XamlBinding/ImageSourceConverter.cs | 2 +- .../Interactivity/AttachedCollection.cs | 2 +- .../Interactivity/BindingCondition.cs | 4 +- .../XamlBinding/Interactivity/Condition.cs | 2 +- .../Interactivity/IAttachedObject.cs | 2 +- .../Interactivity/MultiCondition.cs | 2 +- .../XamlBinding/Interactivity/MultiTrigger.cs | 2 +- .../Interactivity/PropertyCondition.cs | 8 +- .../Interactivity/XamlPropertyCondition.cs | 4 +- .../XamlBinding/Internals/IDataTemplate.cs | 3 +- .../XamlBinding/Internals/IDeserializer.cs | 3 +- .../Internals/INamescopeProvider.cs | 2 +- .../Internals/InvalidationTrigger.cs | 3 +- .../Internals/NumericExtensions.cs | 3 +- .../internal/XamlBinding/Internals/Ticker.cs | 4 +- .../XamlBinding/InvalidNavigationException.cs | 2 +- .../XamlBinding/InvalidationEventArgs.cs | 4 +- .../internal/XamlBinding/LayoutAlignment.cs | 2 +- .../internal/XamlBinding/LayoutExpandFlag.cs | 2 +- .../src/internal/XamlBinding/LayoutOptions.cs | 2 +- .../XamlBinding/LayoutOptionsConverter.cs | 8 +- .../XamlBinding/ListStringTypeConverter.cs | 4 +- .../src/internal/XamlBinding/MenuItem.cs | 2 +- .../src/internal/XamlBinding/MergedStyle.cs | 10 +- .../internal/XamlBinding/MessagingCenter.cs | 2 +- .../internal/XamlBinding/ModalEventArgs.cs | 3 +- .../XamlBinding/ModalPoppedEventArgs.cs | 9 + .../XamlBinding/ModalPoppingEventArgs.cs | 4 +- .../XamlBinding/ModalPushedEventArgs.cs | 9 + .../XamlBinding/ModalPushingEventArgs.cs | 9 + .../XamlBinding/NUIConstantExtension.cs | 6 +- .../src/internal/XamlBinding/NamedSize.cs | 2 +- .../XamlBinding/NavigationEventArgs.cs | 8 +- .../internal/XamlBinding/NavigationMenu.cs | 11 +- .../internal/XamlBinding/NavigationModel.cs | 5 +- .../internal/XamlBinding/NavigationProxy.cs | 5 +- .../NavigationRequestedEventArgs.cs | 6 +- .../src/internal/XamlBinding/NullEffect.cs | 2 +- .../internal/XamlBinding/ObservableWrapper.cs | 10 +- .../src/internal/XamlBinding/OnIdiom.cs | 4 +- .../src/internal/XamlBinding/OnPlatform.cs | 2 +- .../internal/XamlBinding/PaddingElement.cs | 2 +- .../XamlBinding/ParameterAttribute.cs | 2 +- .../PlatformConfigurationRegistry.cs | 2 +- .../src/internal/XamlBinding/Registrar.cs | 8 +- .../XamlBinding/RenderWithAttribute.cs | 2 +- .../ResolutionGroupNameAttribute.cs | 2 +- .../XamlBinding/ResourcesChangedEventArgs.cs | 4 +- .../XamlBinding/ResourcesExtensions.cs | 30 +- .../XamlBinding/RotationTypeConverter.cs | 10 +- .../src/internal/XamlBinding/RoutingEffect.cs | 2 +- .../src/internal/XamlBinding/SizeRequest.cs | 5 +- .../XamlBinding/StyleSheets/CharExtensions.cs | 0 .../XamlBinding/StyleSheets/Selector.cs | 0 .../StyleSheets/StylePropertyAttribute.cs | 2 +- .../StyleSheets/StyleSheetExtensions.cs | 18 +- .../StyleSheets/StyleSheetServiceProvider.cs | 0 .../StyleSheets/TextReaderExtensions.cs | 0 .../internal/XamlBinding/SynchronizedList.cs | 2 +- .../src/internal/XamlBinding/TargetIdiom.cs | 2 +- .../internal/XamlBinding/TargetPlatform.cs | 2 +- .../internal/XamlBinding/TemplateBinding.cs | 2 +- .../internal/XamlBinding/TemplateUtilities.cs | 9 +- .../src/internal/XamlBinding/Thickness.cs | 4 +- .../XamlBinding/ThicknessTypeConverter.cs | 4 +- .../XamlBinding/TizenPlatformServices.cs | 6 +- .../src/internal/XamlBinding/ToolbarItem.cs | 2 +- .../XamlBinding/ToolbarItemEventArgs.cs | 2 +- .../internal/XamlBinding/ToolbarItemOrder.cs | 2 +- .../XamlBinding/TrackableCollection.cs | 2 +- .../XamlBinding/TypeConverterAttribute.cs | 4 +- .../internal/XamlBinding/WeakEventManager.cs | 2 +- .../public/Forms/BaseComponents/CustomView.cs | 838 +++++ .../Forms/BaseComponents/FlexContainer.cs | 237 ++ .../public/Forms/BaseComponents/ImageView.cs | 480 +++ .../public/Forms/BaseComponents/Scrollable.cs | 407 +++ .../public/Forms/BaseComponents/TableView.cs | 532 +++ .../public/Forms/BaseComponents/TextEditor.cs | 1759 +++++++++ .../public/Forms/BaseComponents/TextField.cs | 1712 +++++++++ .../public/Forms/BaseComponents/TextLabel.cs | 918 +++++ .../public/Forms/BaseComponents/VideoView.cs | 320 ++ .../src/public/Forms/BaseComponents/View.cs | 3173 +++++++++++++++++ .../public/Forms/BaseComponents/VisualView.cs | 199 ++ .../src/public/Forms/BaseHandle.cs | 402 +++ .../src/public/Forms/Container.cs | 149 + src/Tizen.NUI.Xaml/src/public/Forms/Layer.cs | 349 ++ .../src/public/UIComponents/Button.cs | 750 ++++ .../src/public/UIComponents/CheckBoxButton.cs | 65 + .../src/public/UIComponents/Popup.cs | 828 +++++ .../src/public/UIComponents/ProgressBar.cs | 365 ++ .../src/public/UIComponents/PushButton.cs | 99 + .../src/public/UIComponents/RadioButton.cs | 70 + .../src/public/UIComponents/ScrollBar.cs | 393 ++ .../src/public/UIComponents/ScrollView.cs | 1301 +++++++ .../src/public/UIComponents/Slider.cs | 592 +++ .../src/public/UIComponents/ToggleButton.cs | 152 + .../src/public/Xaml/IMarkupExtension.cs | 46 + .../src/public/Xaml/IProvideValueTarget.cs | 29 + .../src/public/Xaml/IReferenceProvider.cs | 21 + .../src/public/Xaml/IValueProvider.cs | 22 + .../src/public/Xaml/IXamlTypeResolver.cs | 30 + .../src/public/Xaml/IXmlLineInfoProvider.cs | 22 + .../Xaml/MarkupExtensions/ArrayExtension.cs | 72 + .../Xaml/MarkupExtensions/BindingExtension.cs | 124 + .../DynamicResourceExtension.cs | 47 + .../Xaml/MarkupExtensions/NullExtension.cs | 27 + .../MarkupExtensions/ReferenceExtension.cs | 25 +- .../Xaml/MarkupExtensions/StaticExtension.cs | 23 +- .../StaticResourceExtension.cs | 28 +- .../MarkupExtensions/StyleSheetExtension.cs | 26 +- .../TemplateBindingExtension.cs | 53 + .../Xaml/MarkupExtensions/TypeExtension.cs | 23 +- .../src/public/Xaml/ViewExtensions.cs | 41 +- .../public}/Xaml/XamlCompilationAttribute.cs | 18 +- .../src/public/Xaml/XamlFilePathAttribute.cs | 18 + .../public}/Xaml/XamlResourceIdAttribute.cs | 35 +- .../src/public}/Xaml/XamlServiceProvider.cs | 169 +- .../src/public/Xaml/XmlLineInfo.cs | 46 + .../src/public}/XamlBinding/Application.cs | 243 +- .../src/public/XamlBinding/BindableObject.cs | 128 +- .../public}/XamlBinding/BindableProperty.cs | 56 +- .../XamlBinding/BindablePropertyConverter.cs | 21 +- .../XamlBinding/BindablePropertyKey.cs | 6 +- .../src/public}/XamlBinding/Binding.cs | 25 +- .../src/public}/XamlBinding/BindingBase.cs | 22 +- .../src/public}/XamlBinding/BindingMode.cs | 4 +- .../CollectionSynchronizationCallback.cs | 10 + .../public}/XamlBinding/ColorTypeConverter.cs | 20 +- .../src/public/XamlBinding/Command.cs | 25 +- .../src/public/XamlBinding/ContentPage.cs | 176 +- .../src/public/XamlBinding/Element.cs | 195 +- .../public/XamlBinding/GraphicsTypeManager.cs | 40 + .../XamlBinding/IExtendedTypeConverter.cs | 20 + .../public/XamlBinding/IResourcesProvider.cs | 18 + .../src/public/XamlBinding/IValueConverter.cs | 19 + .../XamlBinding/Interactivity/Behavior.cs | 17 +- .../XamlBinding/Interactivity/DataTrigger.cs | 17 +- .../XamlBinding/Interactivity/EventTrigger.cs | 19 +- .../XamlBinding/Interactivity/Trigger.cs | 21 +- .../Interactivity/TriggerAction.cs | 15 +- .../XamlBinding/Interactivity/TriggerBase.cs | 19 +- .../XamlBinding/Internals/DynamicResource.cs | 24 + .../Internals/IDynamicResourceHandler.cs | 18 + .../XamlBinding/Internals/INameScope.cs | 31 + .../XamlBinding/Internals/NameScope.cs | 18 +- .../Internals/PreserveAttribute.cs | 37 + .../XamlBinding/Internals/ResourceLoader.cs | 53 + .../XamlBinding/Internals/TypedBinding.cs | 20 +- .../public/XamlBinding/NameScopeExtensions.cs | 13 +- .../src/public/XamlBinding/Page.cs | 146 +- .../src/public/XamlBinding/Performance.cs | 94 + .../XamlBinding/PositionTypeConverter.cs | 21 +- .../XamlBinding/RectangleTypeConverter.cs | 11 +- .../public/XamlBinding/ResourceDictionary.cs | 72 +- .../src/public}/XamlBinding/Setter.cs | 19 +- .../public/XamlBinding/SizeTypeConverter.cs | 60 + .../src/public}/XamlBinding/Style.cs | 34 +- .../XamlBinding/StyleSheets/CssReader.cs | 19 +- .../public/XamlBinding/StyleSheets/IStyle.cs | 23 + .../StyleSheets/IStyleSelectable.cs | 41 + .../public}/XamlBinding/StyleSheets/Style.cs | 21 +- .../XamlBinding/StyleSheets/StyleSheet.cs | 18 +- .../src/public/XamlBinding/TemplatedPage.cs | 5 +- .../src/public/XamlBinding/Transition.cs | 783 ++++ .../src/public/XamlBinding/TypeConverter.cs | 50 + .../public}/XamlBinding/TypeTypeConverter.cs | 11 +- .../public}/XamlBinding/UriTypeConverter.cs | 11 +- .../XamlBinding/VectorTypeConverter.cs | 41 +- .../XamlBinding/XmlnsDefinitionAttribute.cs | 18 +- src/Tizen.NUI/Properties/AssemblyInfo.cs | 15 - src/Tizen.NUI/src/internal/Application.cs | 432 +-- .../src/internal/BindableProperty.cs | 89 + .../src/internal/Xaml/IMarkupExtension.cs | 19 - .../src/internal/Xaml/IProvideValueTarget.cs | 8 - .../src/internal/Xaml/IReferenceProvider.cs | 7 - .../src/internal/Xaml/IValueProvider.cs | 9 - .../src/internal/Xaml/IXamlTypeResolver.cs | 10 - .../src/internal/Xaml/IXmlLineInfoProvider.cs | 9 - .../Xaml/MarkupExtensions/ArrayExtension.cs | 41 - .../Xaml/MarkupExtensions/BindingExtension.cs | 56 - .../DynamicResourceExtension.cs | 28 - .../Xaml/MarkupExtensions/NullExtension.cs | 14 - .../TemplateBindingExtension.cs | 36 - .../internal/Xaml/XamlFilePathAttribute.cs | 13 - .../src/internal/Xaml/XmlLineInfo.cs | 29 - .../CollectionSynchronizationCallback.cs | 7 - .../XamlBinding/IApplicationController.cs | 7 - .../XamlBinding/IExtendedTypeConverter.cs | 13 - .../XamlBinding/INavigationMenuController.cs | 7 - .../internal/XamlBinding/IPageContainer.cs | 7 - .../internal/XamlBinding/IViewContainer.cs | 9 - .../XamlBinding/Internals/DynamicResource.cs | 14 - .../Internals/IDynamicResourceHandler.cs | 10 - .../XamlBinding/Internals/INameScope.cs | 14 - .../Internals/PreserveAttribute.cs | 22 - .../XamlBinding/Internals/ResourceLoader.cs | 30 - .../src/internal/XamlBinding/Layout.cs | 319 -- .../XamlBinding/ModalPoppedEventArgs.cs | 9 - .../XamlBinding/ModalPushedEventArgs.cs | 9 - .../XamlBinding/ModalPushingEventArgs.cs | 9 - .../internal/XamlBinding/NavigationPage.cs | 627 ---- .../internal/XamlBinding/SizeTypeConverter.cs | 51 - .../XamlBinding/StyleSheets/IStyle.cs | 13 - .../StyleSheets/IStyleSelectable.cs | 20 - .../src/internal/XamlBinding/TypeConverter.cs | 35 - src/Tizen.NUI/src/public/Animation.cs | 231 +- .../src/public/BaseComponents/ImageView.cs | 40 +- .../src/public/BaseComponents/TableView.cs | 1 - .../src/public/BaseComponents/TextEditor.cs | 22 +- .../src/public/BaseComponents/TextField.cs | 22 +- .../src/public/BaseComponents/TextLabel.cs | 5 +- .../src/public/BaseComponents/View.cs | 99 +- src/Tizen.NUI/src/public/BaseHandle.cs | 35 +- src/Tizen.NUI/src/public/Color.cs | 2 - src/Tizen.NUI/src/public/Container.cs | 2 +- src/Tizen.NUI/src/public/Element.cs | 19 + src/Tizen.NUI/src/public/Extents.cs | 2 - .../src/public/GraphicsTypeManager.cs | 10 - src/Tizen.NUI/src/public/Layer.cs | 15 - src/Tizen.NUI/src/public/NUIApplication.cs | 4 - src/Tizen.NUI/src/public/Position.cs | 2 - src/Tizen.NUI/src/public/Position2D.cs | 2 - src/Tizen.NUI/src/public/Property.cs | 16 - src/Tizen.NUI/src/public/Rectangle.cs | 4 +- src/Tizen.NUI/src/public/RelativeVector2.cs | 4 +- src/Tizen.NUI/src/public/RelativeVector3.cs | 2 - src/Tizen.NUI/src/public/RelativeVector4.cs | 4 +- src/Tizen.NUI/src/public/Rotation.cs | 2 - src/Tizen.NUI/src/public/Size.cs | 2 - src/Tizen.NUI/src/public/Size2D.cs | 2 - .../src/public/UIComponents/Button.cs | 2 +- .../src/public/UIComponents/PushButton.cs | 34 +- .../src/public/UIComponents/Slider.cs | 25 +- src/Tizen.NUI/src/public/Vector2.cs | 2 - src/Tizen.NUI/src/public/Vector3.cs | 2 - src/Tizen.NUI/src/public/Vector4.cs | 2 - .../public/XamlBinding/IResourcesProvider.cs | 19 - .../src/public/XamlBinding/IValueConverter.cs | 31 - .../src/public/XamlBinding/Transition.cs | 216 -- 353 files changed, 19896 insertions(+), 3864 deletions(-) create mode 100755 src/Tizen.NUI.Xaml/Properties/AssemblyInfo.cs create mode 100755 src/Tizen.NUI.Xaml/Properties/GlobalAssemblyInfo.cs create mode 100755 src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.csproj create mode 100755 src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.sln rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/ApplyPropertiesVisitor.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/CreateValuesVisitor.cs (91%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/DesignMode.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/ExpandMarkupsVisitor.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/FillResourceDictionariesVisitor.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/HydrationContext.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/IConverterOptions.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/IDictionaryExtensions.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/IExpressionParser.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/INativeValueConverterService.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/IProvideParentValues.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/IResourcesLoader.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/IRootObjectProvider.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/IValueConverterProvider.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/MarkupExpressionParser.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/MarkupExtensionParser.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/NamescopingVisitor.cs (98%) rename src/{Tizen.NUI/src/public => Tizen.NUI.Xaml/src/internal}/Xaml/ProvideCompiledAttribute.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/PruneIgnoredNodesVisitor.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/ReflectionExtensions.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/RegisterXNamesVisitor.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/ResourcesLoader.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/RuntimeNamePropertyAttribute.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/TypeArgumentsParser.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/TypeConversionAttribute.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/TypeConversionExtensions.cs (89%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/ValueConverterProvider.cs (95%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/VisualStateManager.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/XamlLoader.cs (93%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/XamlNode.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/XamlNodeVisitor.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/XamlParseException.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/XamlParser.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/XmlName.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/Xaml/XmlnsHelper.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Accelerator.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/AcceleratorTypeConverter.cs (88%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ActionSheetArguments.cs (92%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/AlertArguments.cs (91%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/BaseMenuItem.cs (52%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/BindableObjectExtensions.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/BindingBaseExtensions.cs (89%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/BindingExpression.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/BindingTypeConverter.cs (68%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/CollectionSynchronizationContext.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Configuration.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ContentPropertyAttribute.cs (79%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ControlTemplate.cs (85%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DataTemplate.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DataTemplateExtensions.cs (83%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DataTemplateSelector.cs (81%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DependencyAttribute.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DependencyFetchTarget.cs (74%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DependencyResolver.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DependencyService.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Device.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DeviceInfo.cs (82%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/DeviceOrientation.cs (64%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Effect.cs (91%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/EffectiveFlowDirection.cs (80%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/EffectiveFlowDirectionExtensions.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ElementCollection.cs (88%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ElementEventArgs.cs (91%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ElementTemplate.cs (95%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/EnumerableExtensions.cs (95%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/EventArg.cs (71%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ExportEffectAttribute.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ExtentsTypeConverter.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/FileImageSource.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/FileImageSourceConverter.cs (93%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/FlowDirection.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/GestureRecognizer.cs (80%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/HandlerAttribute.cs (93%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IAppIndexingProvider.cs (72%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IAppLinkEntry.cs (91%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IAppLinks.cs (86%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IConfigElement.cs (75%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IConfigPlatform.cs (63%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IControlTemplated.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IEffectControlProvider.cs (81%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IElement.cs (84%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IElementConfiguration.cs (85%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IElementController.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IGestureRecognizer.cs (77%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IIsolatedStorageFile.cs (82%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ILayout.cs (75%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ILayoutController.cs (80%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IMenuItemController.cs (84%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/INativeBindingService.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/INavigation.cs (97%) create mode 100755 src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigationMenuController.cs rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/INavigationPageController.cs (89%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IPaddingElement.cs (90%) create mode 100755 src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPageContainer.cs rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IPageController.cs (86%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IPlatform.cs (83%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IPlatformElementConfiguration.cs (80%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IPlatformServices.cs (84%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IRegisterable.cs (62%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IResourceDictionary.cs (71%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ISystemResourcesProvider.cs (50%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ITimer.cs (90%) create mode 100755 src/Tizen.NUI.Xaml/src/internal/XamlBinding/IViewContainer.cs rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IViewController.cs (70%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/IVisualElementController.cs (69%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ImageSource.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ImageSourceConverter.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/AttachedCollection.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/BindingCondition.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/Condition.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/IAttachedObject.cs (82%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/MultiCondition.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/MultiTrigger.cs (94%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/PropertyCondition.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Internals/IDataTemplate.cs (62%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Internals/IDeserializer.cs (79%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Internals/INamescopeProvider.cs (70%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Internals/InvalidationTrigger.cs (82%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Internals/NumericExtensions.cs (88%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Internals/Ticker.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/InvalidNavigationException.cs (84%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/InvalidationEventArgs.cs (78%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/LayoutAlignment.cs (81%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/LayoutExpandFlag.cs (74%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/LayoutOptions.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/LayoutOptionsConverter.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ListStringTypeConverter.cs (81%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/MenuItem.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/MergedStyle.cs (95%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/MessagingCenter.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ModalEventArgs.cs (80%) create mode 100755 src/Tizen.NUI.Xaml/src/internal/XamlBinding/ModalPoppedEventArgs.cs rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ModalPoppingEventArgs.cs (57%) create mode 100755 src/Tizen.NUI.Xaml/src/internal/XamlBinding/ModalPushedEventArgs.cs create mode 100755 src/Tizen.NUI.Xaml/src/internal/XamlBinding/ModalPushingEventArgs.cs rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NUIConstantExtension.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NamedSize.cs (80%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NavigationEventArgs.cs (75%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NavigationMenu.cs (89%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NavigationModel.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NavigationProxy.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NavigationRequestedEventArgs.cs (92%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/NullEffect.cs (85%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ObservableWrapper.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/OnIdiom.cs (92%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/OnPlatform.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/PaddingElement.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ParameterAttribute.cs (88%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/PlatformConfigurationRegistry.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Registrar.cs (97%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/RenderWithAttribute.cs (88%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ResolutionGroupNameAttribute.cs (90%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ResourcesChangedEventArgs.cs (80%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ResourcesExtensions.cs (71%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/RotationTypeConverter.cs (83%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/RoutingEffect.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/SizeRequest.cs (93%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/StyleSheets/CharExtensions.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/StyleSheets/Selector.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/StyleSheets/StylePropertyAttribute.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/StyleSheets/StyleSheetExtensions.cs (51%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/StyleSheets/StyleSheetServiceProvider.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/StyleSheets/TextReaderExtensions.cs (100%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/SynchronizedList.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/TargetIdiom.cs (80%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/TargetPlatform.cs (82%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/TemplateBinding.cs (99%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/TemplateUtilities.cs (91%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/Thickness.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ThicknessTypeConverter.cs (96%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/TizenPlatformServices.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ToolbarItem.cs (98%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ToolbarItemEventArgs.cs (88%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/ToolbarItemOrder.cs (75%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/TrackableCollection.cs (91%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/TypeConverterAttribute.cs (95%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/internal/XamlBinding/WeakEventManager.cs (99%) create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/CustomView.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/FlexContainer.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/ImageView.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/Scrollable.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/TableView.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/TextEditor.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/TextField.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/TextLabel.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/VideoView.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/View.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseComponents/VisualView.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/BaseHandle.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/Container.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Forms/Layer.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/Button.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/CheckBoxButton.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/Popup.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/ProgressBar.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/PushButton.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/RadioButton.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/ScrollBar.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/ScrollView.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/Slider.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/UIComponents/ToggleButton.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/IMarkupExtension.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/IProvideValueTarget.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/IReferenceProvider.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/IValueProvider.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/IXamlTypeResolver.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/IXmlLineInfoProvider.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/MarkupExtensions/ArrayExtension.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/MarkupExtensions/BindingExtension.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/MarkupExtensions/DynamicResourceExtension.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/MarkupExtensions/NullExtension.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/MarkupExtensions/ReferenceExtension.cs (60%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/MarkupExtensions/StaticExtension.cs (69%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/MarkupExtensions/StaticResourceExtension.cs (79%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/MarkupExtensions/StyleSheetExtension.cs (66%) create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/MarkupExtensions/TemplateBindingExtension.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/MarkupExtensions/TypeExtension.cs (50%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/Xaml/ViewExtensions.cs (67%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/XamlCompilationAttribute.cs (54%) create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/XamlFilePathAttribute.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/XamlResourceIdAttribute.cs (58%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/Xaml/XamlServiceProvider.cs (57%) create mode 100755 src/Tizen.NUI.Xaml/src/public/Xaml/XmlLineInfo.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Application.cs (59%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/BindableObject.cs (90%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/BindableProperty.cs (90%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/BindablePropertyConverter.cs (88%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/BindablePropertyKey.cs (65%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Binding.cs (83%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/BindingBase.cs (77%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/BindingMode.cs (88%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/CollectionSynchronizationCallback.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/ColorTypeConverter.cs (83%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/Command.cs (88%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/ContentPage.cs (58%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/Element.cs (79%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/GraphicsTypeManager.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/IExtendedTypeConverter.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/IResourcesProvider.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/IValueConverter.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Interactivity/Behavior.cs (65%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Interactivity/DataTrigger.cs (61%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Interactivity/EventTrigger.cs (75%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Interactivity/Trigger.cs (60%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Interactivity/TriggerAction.cs (53%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Interactivity/TriggerBase.cs (85%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/Internals/DynamicResource.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/Internals/IDynamicResourceHandler.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/Internals/INameScope.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Internals/NameScope.cs (66%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/Internals/PreserveAttribute.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/Internals/ResourceLoader.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Internals/TypedBinding.cs (92%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/NameScopeExtensions.cs (76%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/Page.cs (78%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/Performance.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/PositionTypeConverter.cs (67%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/RectangleTypeConverter.cs (64%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/ResourceDictionary.cs (87%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Setter.cs (78%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/SizeTypeConverter.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/Style.cs (75%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/StyleSheets/CssReader.cs (75%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/StyleSheets/IStyle.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/StyleSheets/IStyleSelectable.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/StyleSheets/Style.cs (75%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/StyleSheets/StyleSheet.cs (79%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/TemplatedPage.cs (93%) create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/Transition.cs create mode 100755 src/Tizen.NUI.Xaml/src/public/XamlBinding/TypeConverter.cs rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/TypeTypeConverter.cs (69%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/UriTypeConverter.cs (51%) rename src/{Tizen.NUI/src/internal => Tizen.NUI.Xaml/src/public}/XamlBinding/VectorTypeConverter.cs (63%) rename src/{Tizen.NUI => Tizen.NUI.Xaml}/src/public/XamlBinding/XmlnsDefinitionAttribute.cs (69%) create mode 100755 src/Tizen.NUI/src/internal/BindableProperty.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/IMarkupExtension.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/IProvideValueTarget.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/IReferenceProvider.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/IValueProvider.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/IXamlTypeResolver.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/IXmlLineInfoProvider.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/ArrayExtension.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/BindingExtension.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/DynamicResourceExtension.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/NullExtension.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/MarkupExtensions/TemplateBindingExtension.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/XamlFilePathAttribute.cs delete mode 100755 src/Tizen.NUI/src/internal/Xaml/XmlLineInfo.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/CollectionSynchronizationCallback.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/IApplicationController.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/IExtendedTypeConverter.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/INavigationMenuController.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/IPageContainer.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/IViewContainer.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/Internals/DynamicResource.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/Internals/IDynamicResourceHandler.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/Internals/INameScope.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/Internals/PreserveAttribute.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/Internals/ResourceLoader.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/Layout.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/ModalPoppedEventArgs.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/ModalPushedEventArgs.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/ModalPushingEventArgs.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/NavigationPage.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/SizeTypeConverter.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/StyleSheets/IStyle.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/StyleSheets/IStyleSelectable.cs delete mode 100755 src/Tizen.NUI/src/internal/XamlBinding/TypeConverter.cs create mode 100755 src/Tizen.NUI/src/public/Element.cs delete mode 100755 src/Tizen.NUI/src/public/XamlBinding/IResourcesProvider.cs delete mode 100755 src/Tizen.NUI/src/public/XamlBinding/IValueConverter.cs delete mode 100755 src/Tizen.NUI/src/public/XamlBinding/Transition.cs diff --git a/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj b/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj index 4b9e740f9..da1aa4c14 100755 --- a/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj +++ b/src/Tizen.NUI.Design/Tizen.NUI.Design.csproj @@ -6,11 +6,11 @@ - + - + diff --git a/src/Tizen.NUI.Design/Tizen.NUI.Design.sln b/src/Tizen.NUI.Design/Tizen.NUI.Design.sln index 9ee267a3f..2d817695e 100755 --- a/src/Tizen.NUI.Design/Tizen.NUI.Design.sln +++ b/src/Tizen.NUI.Design/Tizen.NUI.Design.sln @@ -14,6 +14,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\Tizen\Tizen.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\Tizen.Log\Tizen.Log.csproj", "{837994B4-B99D-4EFE-B6FF-1BE17EE78711}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI.Xaml", "..\Tizen.NUI.Xaml\Tizen.NUI.Xaml.csproj", "{7940BB09-D1C6-45BC-A220-723F823C3DFB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -96,6 +98,18 @@ Global {837994B4-B99D-4EFE-B6FF-1BE17EE78711}.Release|x64.Build.0 = Release|Any CPU {837994B4-B99D-4EFE-B6FF-1BE17EE78711}.Release|x86.ActiveCfg = Release|Any CPU {837994B4-B99D-4EFE-B6FF-1BE17EE78711}.Release|x86.Build.0 = Release|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Debug|x64.ActiveCfg = Debug|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Debug|x64.Build.0 = Debug|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Debug|x86.ActiveCfg = Debug|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Debug|x86.Build.0 = Debug|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Release|Any CPU.Build.0 = Release|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Release|x64.ActiveCfg = Release|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Release|x64.Build.0 = Release|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Release|x86.ActiveCfg = Release|Any CPU + {7940BB09-D1C6-45BC-A220-723F823C3DFB}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Tizen.NUI.Design/Tizen.NUI.Design/AttributeTableBuilder.cs b/src/Tizen.NUI.Design/Tizen.NUI.Design/AttributeTableBuilder.cs index 3422de831..09c0cd491 100755 --- a/src/Tizen.NUI.Design/Tizen.NUI.Design/AttributeTableBuilder.cs +++ b/src/Tizen.NUI.Design/Tizen.NUI.Design/AttributeTableBuilder.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using Microsoft.Windows.Design; using Tizen.NUI.BaseComponents; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Design { diff --git a/src/Tizen.NUI.Design/Tizen.NUI/AttributeTableBuilder.cs b/src/Tizen.NUI.Design/Tizen.NUI/AttributeTableBuilder.cs index 94e9a440c..77a8fd815 100755 --- a/src/Tizen.NUI.Design/Tizen.NUI/AttributeTableBuilder.cs +++ b/src/Tizen.NUI.Design/Tizen.NUI/AttributeTableBuilder.cs @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Reflection; using Tizen.NUI.BaseComponents; using Tizen.NUI.UIComponents; +using Tizen.NUI.Xaml; namespace Tizen.NUI { diff --git a/src/Tizen.NUI.Xaml/Properties/AssemblyInfo.cs b/src/Tizen.NUI.Xaml/Properties/AssemblyInfo.cs new file mode 100755 index 000000000..3c78009c8 --- /dev/null +++ b/src/Tizen.NUI.Xaml/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +using System.Runtime.CompilerServices; + +using Tizen.NUI.XamlBinding; +using Tizen.NUI.Xaml; + +[assembly: XamlCompilationAttribute(XamlCompilationOptions.Compile)] + +[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI")] +[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.Xaml.Forms.BaseComponents")] +[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.UIComponents")] +[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.Xaml")] +[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.XamlBinding")] +[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "Tizen.NUI.Xaml")] +[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "Tizen.NUI.Xaml")] +[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] diff --git a/src/Tizen.NUI.Xaml/Properties/GlobalAssemblyInfo.cs b/src/Tizen.NUI.Xaml/Properties/GlobalAssemblyInfo.cs new file mode 100755 index 000000000..10ce69d28 --- /dev/null +++ b/src/Tizen.NUI.Xaml/Properties/GlobalAssemblyInfo.cs @@ -0,0 +1,6 @@ +using System.Reflection; + +//[assembly: AssemblyCompany("Tizen.NUI.Xaml Inc.")] +//[assembly: AssemblyProduct("Tizen.NUI.Xaml")] +[assembly: AssemblyCopyright("Copyright ?Xamarin Inc. 2013-2017")] +[assembly: AssemblyTrademark("")] diff --git a/src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.csproj b/src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.csproj new file mode 100755 index 000000000..14c6f107f --- /dev/null +++ b/src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.csproj @@ -0,0 +1,19 @@ + + + + netstandard2.0 + + + + + + + + + + TizenSystemSettings + + + + + \ No newline at end of file diff --git a/src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.sln b/src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.sln new file mode 100755 index 000000000..24d4d36fe --- /dev/null +++ b/src/Tizen.NUI.Xaml/Tizen.NUI.Xaml.sln @@ -0,0 +1,55 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI.Xaml", "Tizen.NUI.Xaml.csproj", "{473C3BEC-2F67-4285-85FC-BF4E96BFFF1C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.System.SystemSettings", "..\Tizen.System.SystemSettings\Tizen.System.SystemSettings.csproj", "{8D71B1B6-9901-436F-8914-9F812E1B10A7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen", "..\Tizen\Tizen.csproj", "{33B7EFD5-0050-416D-A2D1-8F18F26F106D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Log", "..\Tizen.Log\Tizen.Log.csproj", "{1C550C1F-9370-42FF-86FA-EDCD6262B258}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Applications.Common", "..\Tizen.Applications.Common\Tizen.Applications.Common.csproj", "{2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI", "..\Tizen.NUI\Tizen.NUI.csproj", "{B5CEBFFC-3355-408A-8F99-3DE922271F72}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {473C3BEC-2F67-4285-85FC-BF4E96BFFF1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {473C3BEC-2F67-4285-85FC-BF4E96BFFF1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {473C3BEC-2F67-4285-85FC-BF4E96BFFF1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {473C3BEC-2F67-4285-85FC-BF4E96BFFF1C}.Release|Any CPU.Build.0 = Release|Any CPU + {8D71B1B6-9901-436F-8914-9F812E1B10A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D71B1B6-9901-436F-8914-9F812E1B10A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D71B1B6-9901-436F-8914-9F812E1B10A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8D71B1B6-9901-436F-8914-9F812E1B10A7}.Release|Any CPU.Build.0 = Release|Any CPU + {33B7EFD5-0050-416D-A2D1-8F18F26F106D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33B7EFD5-0050-416D-A2D1-8F18F26F106D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33B7EFD5-0050-416D-A2D1-8F18F26F106D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33B7EFD5-0050-416D-A2D1-8F18F26F106D}.Release|Any CPU.Build.0 = Release|Any CPU + {1C550C1F-9370-42FF-86FA-EDCD6262B258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C550C1F-9370-42FF-86FA-EDCD6262B258}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C550C1F-9370-42FF-86FA-EDCD6262B258}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C550C1F-9370-42FF-86FA-EDCD6262B258}.Release|Any CPU.Build.0 = Release|Any CPU + {2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}.Release|Any CPU.Build.0 = Release|Any CPU + {B5CEBFFC-3355-408A-8F99-3DE922271F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5CEBFFC-3355-408A-8F99-3DE922271F72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5CEBFFC-3355-408A-8F99-3DE922271F72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5CEBFFC-3355-408A-8F99-3DE922271F72}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F532FBB4-80FB-46CE-A5EC-4E1333BF2622} + EndGlobalSection +EndGlobal diff --git a/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/ApplyPropertiesVisitor.cs similarity index 99% rename from src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/ApplyPropertiesVisitor.cs index 76451c7d9..bae2bde18 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/ApplyPropertiesVisitor.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Xml; -using Tizen.NUI.Binding.Internals; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding.Internals; +using Tizen.NUI.XamlBinding; using Tizen.NUI.StyleSheets; using static System.String; @@ -633,8 +633,8 @@ namespace Tizen.NUI.Xaml if (xKey != null) resourceDictionary.Add(xKey, value); - else if (value is Tizen.NUI.Binding.Style) - resourceDictionary.Add((Tizen.NUI.Binding.Style)value); + else if (value is Tizen.NUI.XamlBinding.Style) + resourceDictionary.Add((Tizen.NUI.XamlBinding.Style)value); else if (value is ResourceDictionary) resourceDictionary.Add((ResourceDictionary)value); else if (value is StyleSheets.StyleSheet) diff --git a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/CreateValuesVisitor.cs similarity index 91% rename from src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/CreateValuesVisitor.cs index c4e4c50eb..d5e493a26 100755 --- a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/CreateValuesVisitor.cs @@ -4,8 +4,8 @@ using System.Globalization; using System.Linq; using System.Reflection; using System.Xml; -using Tizen.NUI.Binding.Internals; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding.Internals; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Xaml @@ -89,18 +89,6 @@ namespace Tizen.NUI.Xaml if (value == null) { value = Activator.CreateInstance(type); - if (value is Element) - { - if (null != Application.Current) - { - Application.AddResourceChangedCallback(value, (value as Element).OnResourcesChanged); - } - - if (value is BindableObject) - { - ((BindableObject)value).IsCreateByXaml = true; - } - } } } catch (TargetInvocationException e) @@ -176,7 +164,7 @@ namespace Tizen.NUI.Xaml { // Modify the namespace var propname = - parameter.CustomAttributes.First(ca => ca.AttributeType.FullName == "Tizen.NUI.Binding.ParameterAttribute")? + parameter.CustomAttributes.First(ca => ca.AttributeType.FullName == "Tizen.NUI.XamlBinding.ParameterAttribute")? .ConstructorArguments.First() .Value as string; if (!node.Properties.ContainsKey(new XmlName("", propname))) @@ -216,20 +204,7 @@ namespace Tizen.NUI.Xaml if (!node.Properties.ContainsKey(XmlName.xFactoryMethod)) { //non-default ctor - object ret = Activator.CreateInstance(nodeType, arguments); - if (ret is Element) - { - if (null != Application.Current) - { - Application.AddResourceChangedCallback(ret, (ret as Element).OnResourcesChanged); - } - - if (ret is BindableObject) - { - ((BindableObject)ret).IsCreateByXaml = true; - } - } - return ret; + return Activator.CreateInstance(nodeType, arguments); } var factoryMethod = ((string)((ValueNode)node.Properties[XmlName.xFactoryMethod]).Value); @@ -340,18 +315,6 @@ namespace Tizen.NUI.Xaml else { value = Activator.CreateInstance(nodeType); - if (value is Element) - { - if (null != Application.Current) - { - Application.AddResourceChangedCallback(value, (value as Element).OnResourcesChanged); - } - - if (value is BindableObject) - { - ((BindableObject)value).IsCreateByXaml = true; - } - } } if (node.CollectionItems.Count == 1 && node.CollectionItems[0] is ValueNode && diff --git a/src/Tizen.NUI/src/internal/Xaml/DesignMode.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/DesignMode.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/DesignMode.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/DesignMode.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/ExpandMarkupsVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/ExpandMarkupsVisitor.cs similarity index 99% rename from src/Tizen.NUI/src/internal/Xaml/ExpandMarkupsVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/ExpandMarkupsVisitor.cs index 308e9e287..4473df894 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ExpandMarkupsVisitor.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/ExpandMarkupsVisitor.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Xml; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; namespace Tizen.NUI.Xaml { diff --git a/src/Tizen.NUI/src/internal/Xaml/FillResourceDictionariesVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/FillResourceDictionariesVisitor.cs similarity index 99% rename from src/Tizen.NUI/src/internal/Xaml/FillResourceDictionariesVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/FillResourceDictionariesVisitor.cs index 2be8e7bf8..eadbba59a 100755 --- a/src/Tizen.NUI/src/internal/Xaml/FillResourceDictionariesVisitor.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/FillResourceDictionariesVisitor.cs @@ -2,7 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Xaml { diff --git a/src/Tizen.NUI/src/internal/Xaml/HydrationContext.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/HydrationContext.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/HydrationContext.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/HydrationContext.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/IConverterOptions.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/IConverterOptions.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/IConverterOptions.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/IConverterOptions.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/IDictionaryExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/IDictionaryExtensions.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/IDictionaryExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/IDictionaryExtensions.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/IExpressionParser.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/IExpressionParser.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/IExpressionParser.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/IExpressionParser.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/INativeValueConverterService.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/INativeValueConverterService.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/INativeValueConverterService.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/INativeValueConverterService.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/IProvideParentValues.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/IProvideParentValues.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/IProvideParentValues.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/IProvideParentValues.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/IResourcesLoader.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/IResourcesLoader.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/IResourcesLoader.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/IResourcesLoader.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/IRootObjectProvider.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/IRootObjectProvider.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/IRootObjectProvider.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/IRootObjectProvider.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/IValueConverterProvider.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/IValueConverterProvider.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/IValueConverterProvider.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/IValueConverterProvider.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/MarkupExpressionParser.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/MarkupExpressionParser.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/MarkupExpressionParser.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/MarkupExpressionParser.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/MarkupExtensionParser.cs similarity index 99% rename from src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/MarkupExtensionParser.cs index e36449e66..f360bdd28 100755 --- a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/MarkupExtensionParser.cs @@ -1,6 +1,6 @@ using System; using System.Reflection; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Xaml { diff --git a/src/Tizen.NUI/src/internal/Xaml/NamescopingVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/NamescopingVisitor.cs similarity index 98% rename from src/Tizen.NUI/src/internal/Xaml/NamescopingVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/NamescopingVisitor.cs index 99e0f89c2..5deb83d14 100755 --- a/src/Tizen.NUI/src/internal/Xaml/NamescopingVisitor.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/NamescopingVisitor.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; namespace Tizen.NUI.Xaml { diff --git a/src/Tizen.NUI/src/public/Xaml/ProvideCompiledAttribute.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/ProvideCompiledAttribute.cs similarity index 100% rename from src/Tizen.NUI/src/public/Xaml/ProvideCompiledAttribute.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/ProvideCompiledAttribute.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/PruneIgnoredNodesVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/PruneIgnoredNodesVisitor.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/PruneIgnoredNodesVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/PruneIgnoredNodesVisitor.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/ReflectionExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/ReflectionExtensions.cs similarity index 97% rename from src/Tizen.NUI/src/internal/Xaml/ReflectionExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/ReflectionExtensions.cs index 98e036db1..142a81457 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ReflectionExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/ReflectionExtensions.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Reflection; -namespace Tizen.NUI.Binding.Internals +namespace Tizen.NUI.XamlBinding.Internals { internal static class ReflectionExtensions { diff --git a/src/Tizen.NUI/src/internal/Xaml/RegisterXNamesVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/RegisterXNamesVisitor.cs similarity index 98% rename from src/Tizen.NUI/src/internal/Xaml/RegisterXNamesVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/RegisterXNamesVisitor.cs index 8ca6ddeab..e6ad8fd86 100755 --- a/src/Tizen.NUI/src/internal/Xaml/RegisterXNamesVisitor.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/RegisterXNamesVisitor.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Xaml { diff --git a/src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/ResourcesLoader.cs similarity index 94% rename from src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/ResourcesLoader.cs index 6b2565265..dfcd4ddc2 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/ResourcesLoader.cs @@ -1,11 +1,9 @@ using System; using System.IO; using System.Reflection; -using Tizen.NUI; using System.Xml; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -// [assembly:Dependency(typeof(Tizen.NUI.Xaml.ResourcesLoader))] namespace Tizen.NUI.Xaml { internal class ResourcesLoader : IResourcesLoader diff --git a/src/Tizen.NUI/src/internal/Xaml/RuntimeNamePropertyAttribute.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/RuntimeNamePropertyAttribute.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/RuntimeNamePropertyAttribute.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/RuntimeNamePropertyAttribute.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/TypeArgumentsParser.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/TypeArgumentsParser.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/TypeArgumentsParser.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/TypeArgumentsParser.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/TypeConversionAttribute.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/TypeConversionAttribute.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/TypeConversionAttribute.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/TypeConversionAttribute.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/TypeConversionExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/TypeConversionExtensions.cs similarity index 89% rename from src/Tizen.NUI/src/internal/Xaml/TypeConversionExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/TypeConversionExtensions.cs index 8f465936f..3fca3e392 100755 --- a/src/Tizen.NUI/src/internal/Xaml/TypeConversionExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/TypeConversionExtensions.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Reflection; -// using Tizen.NUI.Binding.Internals; +// using Tizen.NUI.XamlBinding.Internals; using Tizen.NUI.Xaml.Internals; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Xaml { @@ -57,18 +57,43 @@ namespace Tizen.NUI.Xaml return ConvertTo(value, toType, getConverter, serviceProvider); } + static private Assembly assemblyOfConverter = null; + static private string nameSpaceOfConverter = null; + + static internal string GetConverterName(Type type) + { + if (null == TypeConversionExtensions.assemblyOfConverter) + { + Type position2DTypeConverterType = typeof(Position2DTypeConverter); + assemblyOfConverter = position2DTypeConverterType.Assembly; + + nameSpaceOfConverter = position2DTypeConverterType.FullName; + nameSpaceOfConverter = nameSpaceOfConverter.Substring(0, nameSpaceOfConverter.LastIndexOf('.') + 1); + } + + Type xamlToType = assemblyOfConverter.GetType(nameSpaceOfConverter + type.Name + "TypeConverter"); + + if (null == xamlToType) + { + return null; + } + else + { + return xamlToType.FullName; + } + } + internal static object ConvertTo(this object value, Type toType, Func minfoRetriever, IServiceProvider serviceProvider) { Func getConverter = () => { - MemberInfo memberInfo; + var converterTypeName = GetConverterName(toType); - var converterTypeName = toType.GetTypeInfo().CustomAttributes.GetTypeConverterTypeName(); - if (minfoRetriever != null && (memberInfo = minfoRetriever()) != null) - converterTypeName = memberInfo.CustomAttributes.GetTypeConverterTypeName() ?? converterTypeName; - if (converterTypeName == null) + if (null == converterTypeName) + { return null; + } var convertertype = Type.GetType(converterTypeName); return Activator.CreateInstance(convertertype); diff --git a/src/Tizen.NUI/src/internal/Xaml/ValueConverterProvider.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/ValueConverterProvider.cs similarity index 95% rename from src/Tizen.NUI/src/internal/Xaml/ValueConverterProvider.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/ValueConverterProvider.cs index 1b8a56c66..005678eaf 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ValueConverterProvider.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/ValueConverterProvider.cs @@ -1,7 +1,6 @@ using System; using System.Reflection; -using Tizen.NUI; using Tizen.NUI.Xaml; namespace Tizen.NUI.Xaml diff --git a/src/Tizen.NUI/src/internal/Xaml/VisualStateManager.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/VisualStateManager.cs similarity index 94% rename from src/Tizen.NUI/src/internal/Xaml/VisualStateManager.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/VisualStateManager.cs index c005729b0..c0fec0454 100755 --- a/src/Tizen.NUI/src/internal/Xaml/VisualStateManager.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/VisualStateManager.cs @@ -3,8 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using Tizen.NUI; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Xaml { @@ -18,26 +17,26 @@ namespace Tizen.NUI.Xaml } public static readonly BindableProperty VisualStateGroupsProperty = - BindableProperty.CreateAttached("VisualStateGroups", typeof(VisualStateGroupList), typeof(/*VisualElement*/BaseHandle), + BindableProperty.CreateAttached("VisualStateGroups", typeof(VisualStateGroupList), typeof(Element), defaultValue: null, propertyChanged: VisualStateGroupsPropertyChanged, defaultValueCreator: bindable => new VisualStateGroupList()); static void VisualStateGroupsPropertyChanged(BindableObject bindable, object oldValue, object newValue) { - GoToState((/*VisualElement*/BaseHandle)bindable, CommonStates.Normal); + GoToState((Element)bindable, CommonStates.Normal); } - public static IList GetVisualStateGroups(/*VisualElement*/BaseHandle visualElement) + public static IList GetVisualStateGroups(Element visualElement) { return (IList)visualElement.GetValue(VisualStateGroupsProperty); } - public static void SetVisualStateGroups(/*VisualElement*/BaseHandle visualElement, VisualStateGroupList value) + public static void SetVisualStateGroups(Element visualElement, VisualStateGroupList value) { visualElement.SetValue(VisualStateGroupsProperty, value); } - public static bool GoToState(/*VisualElement*/BaseHandle visualElement, string name) + public static bool GoToState(Element visualElement, string name) { if (!visualElement.IsSet(VisualStateGroupsProperty)) { @@ -85,7 +84,7 @@ namespace Tizen.NUI.Xaml return false; } - public static bool HasVisualStateGroups(this /*VisualElement*/BaseHandle element) + public static bool HasVisualStateGroups(this Element element) { return element.IsSet(VisualStateGroupsProperty); } diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlLoader.cs similarity index 93% rename from src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/XamlLoader.cs index e486e973f..ae3a60fe2 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlLoader.cs @@ -33,9 +33,10 @@ using System.IO; using System.Reflection; using System.Text.RegularExpressions; using System.Xml; -using Tizen.NUI.BaseComponents; -using Tizen.NUI.Binding; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.Xaml.Forms.BaseComponents; +using Tizen.NUI.XamlBinding; +using Tizen.NUI.XamlBinding.Internals; +using Tizen.NUI; namespace Tizen.NUI.Xaml.Internals { @@ -66,9 +67,34 @@ namespace Tizen.NUI.Xaml { try { - var xaml = GetXamlForType(callingType); + string xaml = ""; + + var assembly = callingType.GetTypeInfo().Assembly; + var resourceId = XamlResourceIdAttribute.GetResourceIdForType(callingType); + + if (resourceId == null) + { + xaml = LegacyGetXamlForType(callingType); + } + else + { + using (var stream = assembly.GetManifestResourceStream(resourceId)) + { + if (stream != null) + using (var reader = new StreamReader(stream)) + xaml = reader.ReadToEnd(); + else + xaml = null; + } + } + if (string.IsNullOrEmpty(xaml)) - throw new XamlParseException(string.Format("Can't get xaml from type {0}", callingType), new XmlLineInfo()); + { + xaml = GetXamlForType(callingType); + if (string.IsNullOrEmpty(xaml)) + throw new XamlParseException(string.Format("Can't get xaml from type {0}", callingType), new XmlLineInfo()); + } + Load(view, xaml); } catch (XamlParseException e) @@ -138,11 +164,6 @@ namespace Tizen.NUI.Xaml continue; } - if (view is Element) - { - (view as Element).IsCreateByXaml = true; - } - var rootnode = new RuntimeRootNode (new XmlType (reader.NamespaceURI, reader.Name, null), view, (IXmlNamespaceResolver)reader); XamlParser.ParseXaml (rootnode, reader); Visit (rootnode, new HydrationContext { diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlNode.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlNode.cs similarity index 99% rename from src/Tizen.NUI/src/internal/Xaml/XamlNode.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/XamlNode.cs index 44a7df8c9..5e7f339a6 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlNode.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlNode.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Xml; -using Tizen.NUI.Binding; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding; +using Tizen.NUI.XamlBinding.Internals; namespace Tizen.NUI.Xaml { diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlNodeVisitor.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlNodeVisitor.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/XamlNodeVisitor.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/XamlNodeVisitor.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlParseException.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlParseException.cs similarity index 96% rename from src/Tizen.NUI/src/internal/Xaml/XamlParseException.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/XamlParseException.cs index 27a5841ba..d96e83751 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlParseException.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlParseException.cs @@ -13,7 +13,7 @@ namespace Tizen.NUI.Xaml { StringBuilder ret = new StringBuilder("\nStack:\n"); - StackTrace st = new StackTrace(); + StackTrace st = new StackTrace(true); for (int i = 2; i < st.FrameCount; i++) { diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlParser.cs similarity index 99% rename from src/Tizen.NUI/src/internal/Xaml/XamlParser.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/XamlParser.cs index c2707dd3f..45d7a88a4 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs +++ b/src/Tizen.NUI.Xaml/src/internal/Xaml/XamlParser.cs @@ -31,10 +31,9 @@ using System.Diagnostics; using System.Linq; using System.Reflection; using System.Xml; -using Tizen.NUI.Binding; -using Tizen.NUI.BaseComponents; -using Tizen.NUI.UIComponents; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding; +using Tizen.NUI.Xaml.Forms.BaseComponents; +using Tizen.NUI.XamlBinding.Internals; namespace Tizen.NUI.Xaml { diff --git a/src/Tizen.NUI/src/internal/Xaml/XmlName.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/XmlName.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/XmlName.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/XmlName.cs diff --git a/src/Tizen.NUI/src/internal/Xaml/XmlnsHelper.cs b/src/Tizen.NUI.Xaml/src/internal/Xaml/XmlnsHelper.cs similarity index 100% rename from src/Tizen.NUI/src/internal/Xaml/XmlnsHelper.cs rename to src/Tizen.NUI.Xaml/src/internal/Xaml/XmlnsHelper.cs diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Accelerator.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Accelerator.cs similarity index 98% rename from src/Tizen.NUI/src/internal/XamlBinding/Accelerator.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Accelerator.cs index 30501fa4b..c5741859a 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Accelerator.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Accelerator.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [System.ComponentModel.TypeConverter(typeof(AcceleratorTypeConverter))] internal class Accelerator diff --git a/src/Tizen.NUI/src/internal/XamlBinding/AcceleratorTypeConverter.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/AcceleratorTypeConverter.cs similarity index 88% rename from src/Tizen.NUI/src/internal/XamlBinding/AcceleratorTypeConverter.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/AcceleratorTypeConverter.cs index 63601840b..b1560fdf6 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/AcceleratorTypeConverter.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/AcceleratorTypeConverter.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class AcceleratorTypeConverter : TypeConverter { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ActionSheetArguments.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ActionSheetArguments.cs similarity index 92% rename from src/Tizen.NUI/src/internal/XamlBinding/ActionSheetArguments.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ActionSheetArguments.cs index 6f4457191..1e9d7cd8c 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ActionSheetArguments.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ActionSheetArguments.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; -using System.ComponentModel; using System.Threading.Tasks; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal class ActionSheetArguments { public ActionSheetArguments(string title, string cancel, string destruction, IEnumerable buttons) diff --git a/src/Tizen.NUI/src/internal/XamlBinding/AlertArguments.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/AlertArguments.cs similarity index 91% rename from src/Tizen.NUI/src/internal/XamlBinding/AlertArguments.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/AlertArguments.cs index 18ae83978..77fab01fa 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/AlertArguments.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/AlertArguments.cs @@ -1,9 +1,7 @@ -using System.ComponentModel; using System.Threading.Tasks; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal class AlertArguments { public AlertArguments(string title, string message, string accept, string cancel) diff --git a/src/Tizen.NUI/src/internal/XamlBinding/BaseMenuItem.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BaseMenuItem.cs similarity index 52% rename from src/Tizen.NUI/src/internal/XamlBinding/BaseMenuItem.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/BaseMenuItem.cs index c0abdb0b7..d71ceec82 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/BaseMenuItem.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BaseMenuItem.cs @@ -1,6 +1,4 @@ -using Tizen.NUI.Binding; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal abstract class BaseMenuItem : Element { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/BindableObjectExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindableObjectExtensions.cs similarity index 97% rename from src/Tizen.NUI/src/internal/XamlBinding/BindableObjectExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindableObjectExtensions.cs index 8c096d061..29c2f5aa8 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/BindableObjectExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindableObjectExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal static class BindableObjectExtensions { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/BindingBaseExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingBaseExtensions.cs similarity index 89% rename from src/Tizen.NUI/src/internal/XamlBinding/BindingBaseExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingBaseExtensions.cs index 3a637fa3c..740807967 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/BindingBaseExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingBaseExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal static class BindingBaseExtensions { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingExpression.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingExpression.cs index ca83712b1..880014d8f 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingExpression.cs @@ -5,10 +5,10 @@ using System.Diagnostics; using System.Globalization; using System.Linq; using System.Reflection; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; using System.Runtime.CompilerServices; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class BindingExpression { @@ -170,7 +170,7 @@ namespace Tizen.NUI.Binding return; } - target.SetValueCore(property, value, SetValueFlags.ClearDynamicResource, BindableObject.SetValuePrivateFlags.Default | BindableObject.SetValuePrivateFlags.Converted, false); + target.SetValueCore(property, value, SetValueFlags.ClearDynamicResource, BindableObject.SetValuePrivateFlags.Default | BindableObject.SetValuePrivateFlags.Converted); } else if (needsSetter && part.LastSetter != null && current != null) { @@ -342,48 +342,40 @@ namespace Tizen.NUI.Binding if (property != null) { - if (property.CanRead && property.GetMethod != null) + if (property.CanRead && property.GetMethod.IsPublic && !property.GetMethod.IsStatic) + part.LastGetter = property.GetMethod; + if (property.CanWrite && property.SetMethod.IsPublic && !property.SetMethod.IsStatic) { - if (property.GetMethod.IsPublic && !property.GetMethod.IsStatic) - { - part.LastGetter = property.GetMethod; - } - } - if (property.CanWrite && property.SetMethod != null) - { - if(property.SetMethod.IsPublic && !property.SetMethod.IsStatic) - { - part.LastSetter = property.SetMethod; - part.SetterType = part.LastSetter.GetParameters().Last().ParameterType; + part.LastSetter = property.SetMethod; + part.SetterType = part.LastSetter.GetParameters().Last().ParameterType; - if (Binding.AllowChaining) + if (Binding.AllowChaining) + { + FieldInfo bindablePropertyField = sourceType.GetDeclaredField(part.Content + "Property"); + if (bindablePropertyField != null && bindablePropertyField.FieldType == typeof(BindableProperty) && sourceType.ImplementedInterfaces.Contains(typeof(IElementController))) { - FieldInfo bindablePropertyField = sourceType.GetDeclaredField(part.Content + "Property"); - if (bindablePropertyField != null && bindablePropertyField.FieldType == typeof(BindableProperty) && sourceType.ImplementedInterfaces.Contains(typeof(IElementController))) - { - MethodInfo setValueMethod = null; + MethodInfo setValueMethod = null; #if NETSTANDARD1_0 - foreach (MethodInfo m in sourceType.AsType().GetRuntimeMethods()) + foreach (MethodInfo m in sourceType.AsType().GetRuntimeMethods()) + { + if (m.Name.EndsWith("IElementController.SetValueFromRenderer")) { - if (m.Name.EndsWith("IElementController.SetValueFromRenderer")) + ParameterInfo[] parameters = m.GetParameters(); + if (parameters.Length == 2 && parameters[0].ParameterType == typeof(BindableProperty)) { - ParameterInfo[] parameters = m.GetParameters(); - if (parameters.Length == 2 && parameters[0].ParameterType == typeof(BindableProperty)) - { - setValueMethod = m; - break; - } + setValueMethod = m; + break; } } + } #else - setValueMethod = typeof(IElementController).GetMethod("SetValueFromRenderer", new[] { typeof(BindableProperty), typeof(object) }); + setValueMethod = typeof(IElementController).GetMethod("SetValueFromRenderer", new[] { typeof(BindableProperty), typeof(object) }); #endif - if (setValueMethod != null) - { - part.LastSetter = setValueMethod; - part.IsBindablePropertySetter = true; - part.BindablePropertyField = bindablePropertyField.GetValue(null); - } + if (setValueMethod != null) + { + part.LastSetter = setValueMethod; + part.IsBindablePropertySetter = true; + part.BindablePropertyField = bindablePropertyField.GetValue(null); } } } @@ -541,7 +533,7 @@ namespace Tizen.NUI.Binding public BindingExpressionPart(BindingExpression expression, string content, bool isIndexer = false) { _expression = expression; - IsSelf = content == Tizen.NUI.Binding.Binding.SelfPath; + IsSelf = content == Tizen.NUI.XamlBinding.Binding.SelfPath; Content = content; IsIndexer = isIndexer; diff --git a/src/Tizen.NUI/src/internal/XamlBinding/BindingTypeConverter.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingTypeConverter.cs similarity index 68% rename from src/Tizen.NUI/src/internal/XamlBinding/BindingTypeConverter.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingTypeConverter.cs index 62839e27e..c1e58cc64 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/BindingTypeConverter.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/BindingTypeConverter.cs @@ -1,6 +1,6 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [Xaml.ProvideCompiled("Tizen.NUI.Xaml.Core.XamlC.BindingTypeConverter")] + [Xaml.ProvideCompiled("Tizen.NUI.Xaml.Forms.XamlC.BindingTypeConverter")] [Xaml.TypeConversion(typeof(Binding))] internal sealed class BindingTypeConverter : TypeConverter { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/CollectionSynchronizationContext.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/CollectionSynchronizationContext.cs similarity index 94% rename from src/Tizen.NUI/src/internal/XamlBinding/CollectionSynchronizationContext.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/CollectionSynchronizationContext.cs index b2c36a7fa..f0b4bc4ed 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/CollectionSynchronizationContext.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/CollectionSynchronizationContext.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal sealed class CollectionSynchronizationContext { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Configuration.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Configuration.cs similarity index 94% rename from src/Tizen.NUI/src/internal/XamlBinding/Configuration.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Configuration.cs index a99a5c2c2..9e8898e31 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Configuration.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Configuration.cs @@ -1,5 +1,5 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class Configuration : IPlatformElementConfiguration where TPlatform : IConfigPlatform diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ContentPropertyAttribute.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ContentPropertyAttribute.cs similarity index 79% rename from src/Tizen.NUI/src/internal/XamlBinding/ContentPropertyAttribute.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ContentPropertyAttribute.cs index 77faaa8ec..53cfb1730 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ContentPropertyAttribute.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ContentPropertyAttribute.cs @@ -9,12 +9,12 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [AttributeUsage(AttributeTargets.Class)] internal sealed class ContentPropertyAttribute : Attribute { - internal static string[] ContentPropertyTypes = { "Tizen.NUI.Binding.ContentPropertyAttribute", "System.Windows.Markup.ContentPropertyAttribute" }; + internal static string[] ContentPropertyTypes = { "Tizen.NUI.XamlBinding.ContentPropertyAttribute", "System.Windows.Markup.ContentPropertyAttribute" }; public ContentPropertyAttribute(string name) { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ControlTemplate.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ControlTemplate.cs similarity index 85% rename from src/Tizen.NUI/src/internal/XamlBinding/ControlTemplate.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ControlTemplate.cs index ae9c3a15b..baec3ee42 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ControlTemplate.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ControlTemplate.cs @@ -1,12 +1,10 @@ using System; -using System.ComponentModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// Template that specifies a group of styles and effects for controls. /// - [EditorBrowsable(EditorBrowsableState.Never)] internal class ControlTemplate : ElementTemplate { /// diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DataTemplate.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplate.cs similarity index 98% rename from src/Tizen.NUI/src/internal/XamlBinding/DataTemplate.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplate.cs index feb86cc4a..1191b2fca 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DataTemplate.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplate.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class DataTemplate : ElementTemplate { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DataTemplateExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplateExtensions.cs similarity index 83% rename from src/Tizen.NUI/src/internal/XamlBinding/DataTemplateExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplateExtensions.cs index e966fdaa0..b6191db32 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DataTemplateExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplateExtensions.cs @@ -1,8 +1,5 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal static class DataTemplateExtensions { public static DataTemplate SelectDataTemplate(this DataTemplate self, object item, BindableObject container) diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DataTemplateSelector.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplateSelector.cs similarity index 81% rename from src/Tizen.NUI/src/internal/XamlBinding/DataTemplateSelector.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplateSelector.cs index c7afa2c75..5913df01b 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DataTemplateSelector.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DataTemplateSelector.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal abstract class DataTemplateSelector : DataTemplate { @@ -10,10 +10,6 @@ namespace Tizen.NUI.Binding public DataTemplate SelectTemplate(object item, BindableObject container) { DataTemplate dataTemplate = null; - if (_dataTemplates.TryGetValue(item.GetType(), out dataTemplate)) - { - return dataTemplate; - } dataTemplate = OnSelectTemplate(item, container); if (dataTemplate is DataTemplateSelector) diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DependencyAttribute.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyAttribute.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/DependencyAttribute.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyAttribute.cs index 086b06111..a29f70a5b 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DependencyAttribute.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)] internal class DependencyAttribute : Attribute diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DependencyFetchTarget.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyFetchTarget.cs similarity index 74% rename from src/Tizen.NUI/src/internal/XamlBinding/DependencyFetchTarget.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyFetchTarget.cs index 43a96ea7d..ee2202ed5 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DependencyFetchTarget.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyFetchTarget.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal enum DependencyFetchTarget { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DependencyResolver.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyResolver.cs similarity index 96% rename from src/Tizen.NUI/src/internal/XamlBinding/DependencyResolver.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyResolver.cs index 6bf047b9e..2f7637e85 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DependencyResolver.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyResolver.cs @@ -1,9 +1,9 @@ using System; using System.Linq; using System.Reflection; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal static class DependencyResolver { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DependencyService.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyService.cs similarity index 94% rename from src/Tizen.NUI/src/internal/XamlBinding/DependencyService.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyService.cs index 54e1424b4..a6221ab69 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DependencyService.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DependencyService.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; using Tizen.NUI.Xaml; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal static class DependencyService { @@ -78,9 +78,9 @@ namespace Tizen.NUI.Binding } Assembly[] assemblies = Device.GetAssemblies(); - if (Tizen.NUI.Binding.Internals.Registrar.ExtraAssemblies != null) + if (Tizen.NUI.XamlBinding.Internals.Registrar.ExtraAssemblies != null) { - assemblies = assemblies.Union(Tizen.NUI.Binding.Internals.Registrar.ExtraAssemblies).ToArray(); + assemblies = assemblies.Union(Tizen.NUI.XamlBinding.Internals.Registrar.ExtraAssemblies).ToArray(); } Initialize(assemblies); diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Device.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Device.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/Device.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Device.cs index 8987212e5..775f07628 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Device.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Device.cs @@ -5,9 +5,9 @@ using System.IO; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal static class Device { @@ -83,7 +83,9 @@ namespace Tizen.NUI.Binding get { if (s_platformServices == null) - throw new InvalidOperationException("You MUST call Tizen.NUI.Init(); prior to using it."); + { + s_platformServices = new TizenPlatformServices(); + } return s_platformServices; } set @@ -208,17 +210,17 @@ namespace Tizen.NUI.Binding public static readonly string CaptionStyleKey = "CaptionStyle"; - public static readonly Style TitleStyle = new Style(typeof(Tizen.NUI.BaseComponents.TextLabel)) { BaseResourceKey = TitleStyleKey }; + public static readonly Style TitleStyle = new Style(typeof(Tizen.NUI.Xaml.Forms.BaseComponents.TextLabel)) { BaseResourceKey = TitleStyleKey }; - public static readonly Style SubtitleStyle = new Style(typeof(Tizen.NUI.BaseComponents.TextLabel)) { BaseResourceKey = SubtitleStyleKey }; + public static readonly Style SubtitleStyle = new Style(typeof(Tizen.NUI.Xaml.Forms.BaseComponents.TextLabel)) { BaseResourceKey = SubtitleStyleKey }; - public static readonly Style BodyStyle = new Style(typeof(Tizen.NUI.BaseComponents.TextLabel)) { BaseResourceKey = BodyStyleKey }; + public static readonly Style BodyStyle = new Style(typeof(Tizen.NUI.Xaml.Forms.BaseComponents.TextLabel)) { BaseResourceKey = BodyStyleKey }; - public static readonly Style ListItemTextStyle = new Style(typeof(Tizen.NUI.BaseComponents.TextLabel)) { BaseResourceKey = ListItemTextStyleKey }; + public static readonly Style ListItemTextStyle = new Style(typeof(Tizen.NUI.Xaml.Forms.BaseComponents.TextLabel)) { BaseResourceKey = ListItemTextStyleKey }; - public static readonly Style ListItemDetailTextStyle = new Style(typeof(Tizen.NUI.BaseComponents.TextLabel)) { BaseResourceKey = ListItemDetailTextStyleKey }; + public static readonly Style ListItemDetailTextStyle = new Style(typeof(Tizen.NUI.Xaml.Forms.BaseComponents.TextLabel)) { BaseResourceKey = ListItemDetailTextStyleKey }; - public static readonly Style CaptionStyle = new Style(typeof(Tizen.NUI.BaseComponents.TextLabel)) { BaseResourceKey = CaptionStyleKey }; + public static readonly Style CaptionStyle = new Style(typeof(Tizen.NUI.Xaml.Forms.BaseComponents.TextLabel)) { BaseResourceKey = CaptionStyleKey }; } } } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DeviceInfo.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DeviceInfo.cs similarity index 82% rename from src/Tizen.NUI/src/internal/XamlBinding/DeviceInfo.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DeviceInfo.cs index 8fad818e6..b17cdacfe 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DeviceInfo.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DeviceInfo.cs @@ -2,9 +2,8 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal abstract class DeviceInfo : INotifyPropertyChanged, IDisposable { DeviceOrientation _currentOrientation; @@ -25,12 +24,6 @@ namespace Tizen.NUI.Binding public virtual double DisplayRound(double value) => Math.Round(value); - public abstract Size PixelScreenSize { get; } - - public abstract Size ScaledScreenSize { get; } - - public abstract double ScalingFactor { get; } - public void Dispose() { Dispose(true); diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DeviceOrientation.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DeviceOrientation.cs similarity index 64% rename from src/Tizen.NUI/src/internal/XamlBinding/DeviceOrientation.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/DeviceOrientation.cs index 8453e20c1..af374ba27 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DeviceOrientation.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/DeviceOrientation.cs @@ -1,8 +1,5 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal enum DeviceOrientation { Portrait, diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Effect.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Effect.cs similarity index 91% rename from src/Tizen.NUI/src/internal/XamlBinding/Effect.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Effect.cs index a70c710ad..a865b12bf 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Effect.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Effect.cs @@ -1,13 +1,11 @@ using System; using System.ComponentModel; -using Tizen.NUI.Binding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// A collection of styles and properties that can be added to an element at run time. /// - [EditorBrowsable(EditorBrowsableState.Never)] internal abstract class Effect { internal Effect() @@ -38,7 +36,7 @@ namespace Tizen.NUI.Binding public static Effect Resolve(string name) { Effect result = null; - if (Tizen.NUI.Binding.Internals.Registrar.Effects.TryGetValue(name, out Type effectType)) + if (Tizen.NUI.XamlBinding.Internals.Registrar.Effects.TryGetValue(name, out Type effectType)) { result = (Effect)DependencyResolver.ResolveOrCreate(effectType); } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/EffectiveFlowDirection.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EffectiveFlowDirection.cs similarity index 80% rename from src/Tizen.NUI/src/internal/XamlBinding/EffectiveFlowDirection.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/EffectiveFlowDirection.cs index 605588d07..8beb728ad 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/EffectiveFlowDirection.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EffectiveFlowDirection.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [Flags] internal enum EffectiveFlowDirection diff --git a/src/Tizen.NUI/src/internal/XamlBinding/EffectiveFlowDirectionExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EffectiveFlowDirectionExtensions.cs similarity index 94% rename from src/Tizen.NUI/src/internal/XamlBinding/EffectiveFlowDirectionExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/EffectiveFlowDirectionExtensions.cs index 513b27bb9..4e10ff313 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/EffectiveFlowDirectionExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EffectiveFlowDirectionExtensions.cs @@ -1,10 +1,7 @@ using System; -using System.ComponentModel; -using Tizen.NUI.Binding; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal static class EffectiveFlowDirectionExtensions { internal static EffectiveFlowDirection ToEffectiveFlowDirection(this FlowDirection self, bool isExplicit = false) diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ElementCollection.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementCollection.cs similarity index 88% rename from src/Tizen.NUI/src/internal/XamlBinding/ElementCollection.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementCollection.cs index 6427287c6..e2640c25e 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ElementCollection.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementCollection.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class ElementCollection : ObservableWrapper where T : Element { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ElementEventArgs.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementEventArgs.cs similarity index 91% rename from src/Tizen.NUI/src/internal/XamlBinding/ElementEventArgs.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementEventArgs.cs index fcdeacd90..c0e6513a2 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ElementEventArgs.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class ElementEventArgs : EventArgs { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ElementTemplate.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementTemplate.cs similarity index 95% rename from src/Tizen.NUI/src/internal/XamlBinding/ElementTemplate.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementTemplate.cs index 34a8aa890..9de7af2ed 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ElementTemplate.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ElementTemplate.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// Base class for DataTemplate and ControlTemplate classes. /// - [EditorBrowsable(EditorBrowsableState.Never)] internal class ElementTemplate : IElement, IDataTemplate { List> _changeHandlers; diff --git a/src/Tizen.NUI/src/internal/XamlBinding/EnumerableExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EnumerableExtensions.cs similarity index 95% rename from src/Tizen.NUI/src/internal/XamlBinding/EnumerableExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/EnumerableExtensions.cs index dd52ab06a..f4e0e7f3d 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/EnumerableExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EnumerableExtensions.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal static class EnumerableExtensions { public static IEnumerable GetGesturesFor(this IEnumerable gestures, Func predicate = null) where T : GestureRecognizer diff --git a/src/Tizen.NUI/src/internal/XamlBinding/EventArg.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EventArg.cs similarity index 71% rename from src/Tizen.NUI/src/internal/XamlBinding/EventArg.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/EventArg.cs index 16c5ff62b..c402cd460 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/EventArg.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/EventArg.cs @@ -1,9 +1,7 @@ using System; -using System.ComponentModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal class EventArg : EventArgs { // Property variable diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ExportEffectAttribute.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ExportEffectAttribute.cs similarity index 94% rename from src/Tizen.NUI/src/internal/XamlBinding/ExportEffectAttribute.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ExportEffectAttribute.cs index a5f5aa02c..b78c89e2a 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ExportEffectAttribute.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ExportEffectAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)] internal class ExportEffectAttribute : Attribute diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ExtentsTypeConverter.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ExtentsTypeConverter.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/ExtentsTypeConverter.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ExtentsTypeConverter.cs index cd9511385..5a4c1f652 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ExtentsTypeConverter.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ExtentsTypeConverter.cs @@ -1,11 +1,7 @@ using System; using System.Globalization; -using System.Linq; -using System.Reflection; -using Tizen.NUI; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class ExtentsTypeConverter : TypeConverter { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/FileImageSource.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/FileImageSource.cs similarity index 97% rename from src/Tizen.NUI/src/internal/XamlBinding/FileImageSource.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/FileImageSource.cs index f65a0e8ee..963eede28 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/FileImageSource.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/FileImageSource.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [TypeConverter(typeof(FileImageSourceConverter))] internal sealed class FileImageSource : ImageSource diff --git a/src/Tizen.NUI/src/internal/XamlBinding/FileImageSourceConverter.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/FileImageSourceConverter.cs similarity index 93% rename from src/Tizen.NUI/src/internal/XamlBinding/FileImageSourceConverter.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/FileImageSourceConverter.cs index cf5c00995..5db70b40b 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/FileImageSourceConverter.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/FileImageSourceConverter.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [Xaml.TypeConversion(typeof(FileImageSource))] internal sealed class FileImageSourceConverter : TypeConverter diff --git a/src/Tizen.NUI/src/internal/XamlBinding/FlowDirection.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/FlowDirection.cs similarity index 97% rename from src/Tizen.NUI/src/internal/XamlBinding/FlowDirection.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/FlowDirection.cs index f30a1cd28..d23bfafc3 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/FlowDirection.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/FlowDirection.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [TypeConverter(typeof(FlowDirectionConverter))] internal enum FlowDirection diff --git a/src/Tizen.NUI/src/internal/XamlBinding/GestureRecognizer.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/GestureRecognizer.cs similarity index 80% rename from src/Tizen.NUI/src/internal/XamlBinding/GestureRecognizer.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/GestureRecognizer.cs index b490a7134..eee08bf4a 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/GestureRecognizer.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/GestureRecognizer.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class GestureRecognizer : Element, IGestureRecognizer { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/HandlerAttribute.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/HandlerAttribute.cs similarity index 93% rename from src/Tizen.NUI/src/internal/XamlBinding/HandlerAttribute.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/HandlerAttribute.cs index f582f5a08..9de9507cb 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/HandlerAttribute.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/HandlerAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)] internal abstract class HandlerAttribute : Attribute diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IAppIndexingProvider.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppIndexingProvider.cs similarity index 72% rename from src/Tizen.NUI/src/internal/XamlBinding/IAppIndexingProvider.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppIndexingProvider.cs index 3af69c6d4..a1de516f3 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IAppIndexingProvider.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppIndexingProvider.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IAppIndexingProvider { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IAppLinkEntry.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppLinkEntry.cs similarity index 91% rename from src/Tizen.NUI/src/internal/XamlBinding/IAppLinkEntry.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppLinkEntry.cs index e08ea97df..75498ad49 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IAppLinkEntry.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppLinkEntry.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IAppLinkEntry { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IAppLinks.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppLinks.cs similarity index 86% rename from src/Tizen.NUI/src/internal/XamlBinding/IAppLinks.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppLinks.cs index 4cc17fbdd..bbfe9a907 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IAppLinks.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IAppLinks.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IAppLinks { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IConfigElement.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IConfigElement.cs similarity index 75% rename from src/Tizen.NUI/src/internal/XamlBinding/IConfigElement.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IConfigElement.cs index f9261d719..b30776ed2 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IConfigElement.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IConfigElement.cs @@ -1,12 +1,9 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// This interface is for internal use by platform renderers. /// /// - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IConfigElement where T : Element { /// diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IConfigPlatform.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IConfigPlatform.cs similarity index 63% rename from src/Tizen.NUI/src/internal/XamlBinding/IConfigPlatform.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IConfigPlatform.cs index a344ca9d9..c50a2d006 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IConfigPlatform.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IConfigPlatform.cs @@ -1,10 +1,7 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// Base interface for marker classes that identify target platforms for platform specific effects. /// - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IConfigPlatform { } } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IControlTemplated.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IControlTemplated.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/IControlTemplated.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IControlTemplated.cs index 403ccfc67..f7c90acfb 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IControlTemplated.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IControlTemplated.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IControlTemplated { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IEffectControlProvider.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IEffectControlProvider.cs similarity index 81% rename from src/Tizen.NUI/src/internal/XamlBinding/IEffectControlProvider.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IEffectControlProvider.cs index 8f61b223a..f6cbc24ff 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IEffectControlProvider.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IEffectControlProvider.cs @@ -1,11 +1,8 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// When implemented in a renderer, registers a platform-specific effect on an element. /// - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IEffectControlProvider { /// diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IElement.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElement.cs similarity index 84% rename from src/Tizen.NUI/src/internal/XamlBinding/IElement.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElement.cs index 331ec2774..6df3c941b 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IElement.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElement.cs @@ -1,7 +1,7 @@ using System; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IElement { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IElementConfiguration.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElementConfiguration.cs similarity index 85% rename from src/Tizen.NUI/src/internal/XamlBinding/IElementConfiguration.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElementConfiguration.cs index 0414a614a..16a1e0f3e 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IElementConfiguration.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElementConfiguration.cs @@ -1,5 +1,5 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IElementConfiguration where TElement : Element { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IElementController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElementController.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/IElementController.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElementController.cs index f6520690c..63ab9a8cd 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IElementController.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IElementController.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IElementController { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IGestureRecognizer.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IGestureRecognizer.cs similarity index 77% rename from src/Tizen.NUI/src/internal/XamlBinding/IGestureRecognizer.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IGestureRecognizer.cs index 9e2b6883b..83ba50a6e 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IGestureRecognizer.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IGestureRecognizer.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IGestureRecognizer : INotifyPropertyChanged { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IIsolatedStorageFile.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IIsolatedStorageFile.cs similarity index 82% rename from src/Tizen.NUI/src/internal/XamlBinding/IIsolatedStorageFile.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IIsolatedStorageFile.cs index 756e76231..e71542dd9 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IIsolatedStorageFile.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IIsolatedStorageFile.cs @@ -1,11 +1,9 @@ using System; -using System.ComponentModel; using System.IO; using System.Threading.Tasks; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IIsolatedStorageFile { Task CreateDirectoryAsync(string path); diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ILayout.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ILayout.cs similarity index 75% rename from src/Tizen.NUI/src/internal/XamlBinding/ILayout.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ILayout.cs index dee1f59c2..0a2fea1fc 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ILayout.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ILayout.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface ILayout { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ILayoutController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ILayoutController.cs similarity index 80% rename from src/Tizen.NUI/src/internal/XamlBinding/ILayoutController.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ILayoutController.cs index 7ac639dc8..e0f8d7974 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ILayoutController.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ILayoutController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface ILayoutController { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IMenuItemController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IMenuItemController.cs similarity index 84% rename from src/Tizen.NUI/src/internal/XamlBinding/IMenuItemController.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IMenuItemController.cs index 42627ddbb..d9e3a2c41 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IMenuItemController.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IMenuItemController.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IMenuItemController { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/INativeBindingService.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INativeBindingService.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/INativeBindingService.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/INativeBindingService.cs index 70845b6b4..34341fb21 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/INativeBindingService.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INativeBindingService.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface INativeBindingService diff --git a/src/Tizen.NUI/src/internal/XamlBinding/INavigation.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigation.cs similarity index 97% rename from src/Tizen.NUI/src/internal/XamlBinding/INavigation.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigation.cs index d3b98e37f..d63d99a45 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/INavigation.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigation.cs @@ -1,13 +1,12 @@ using System.Collections.Generic; using System.Threading.Tasks; -using System.ComponentModel; +using Tizen.NUI.Xaml; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// Interface abstracting platform-specific navigation. /// - [EditorBrowsable(EditorBrowsableState.Never)] internal interface INavigation { /// diff --git a/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigationMenuController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigationMenuController.cs new file mode 100755 index 000000000..87abb32d6 --- /dev/null +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigationMenuController.cs @@ -0,0 +1,7 @@ +namespace Tizen.NUI.XamlBinding +{ + internal interface INavigationMenuController : IViewController + { + void SendTargetSelected(Xaml.Page target); + } +} \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/XamlBinding/INavigationPageController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigationPageController.cs similarity index 89% rename from src/Tizen.NUI/src/internal/XamlBinding/INavigationPageController.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigationPageController.cs index 7b9bb3055..506480af2 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/INavigationPageController.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/INavigationPageController.cs @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; +using Tizen.NUI.Xaml; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface INavigationPageController { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IPaddingElement.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPaddingElement.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/IPaddingElement.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPaddingElement.cs index e0c395ee3..3f6b7b262 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IPaddingElement.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPaddingElement.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { interface IPaddingElement { diff --git a/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPageContainer.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPageContainer.cs new file mode 100755 index 000000000..09009515d --- /dev/null +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPageContainer.cs @@ -0,0 +1,7 @@ +namespace Tizen.NUI.XamlBinding +{ + internal interface IPageContainer where T : Xaml.Page + { + T CurrentPage { get; } + } +} \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IPageController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPageController.cs similarity index 86% rename from src/Tizen.NUI/src/internal/XamlBinding/IPageController.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPageController.cs index 46998f2f9..233ad6ac8 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IPageController.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPageController.cs @@ -1,6 +1,7 @@ using System.Collections.ObjectModel; +using Tizen.NUI; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IPageController { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IPlatform.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatform.cs similarity index 83% rename from src/Tizen.NUI/src/internal/XamlBinding/IPlatform.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatform.cs index ca89cee1e..51cb62ec0 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IPlatform.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatform.cs @@ -1,11 +1,8 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// For internal use. /// - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IPlatform { /// diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IPlatformElementConfiguration.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatformElementConfiguration.cs similarity index 80% rename from src/Tizen.NUI/src/internal/XamlBinding/IPlatformElementConfiguration.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatformElementConfiguration.cs index 85ad36f70..b35767c08 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IPlatformElementConfiguration.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatformElementConfiguration.cs @@ -1,13 +1,10 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { /// /// Marker interface for returning platform-specific configuration elements. /// /// The platform type. /// The element type. - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IPlatformElementConfiguration : IConfigElement where TPlatform : IConfigPlatform where TElement : Element diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IPlatformServices.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatformServices.cs similarity index 84% rename from src/Tizen.NUI/src/internal/XamlBinding/IPlatformServices.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatformServices.cs index 5e46ac08c..e4dc9933a 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IPlatformServices.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IPlatformServices.cs @@ -1,14 +1,12 @@ using System; -using System.ComponentModel; using System.IO; using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IPlatformServices { bool IsInvokeRequired { get; } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IRegisterable.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IRegisterable.cs similarity index 62% rename from src/Tizen.NUI/src/internal/XamlBinding/IRegisterable.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IRegisterable.cs index 6974fccf2..306fbdf6b 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IRegisterable.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IRegisterable.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IRegisterable { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IResourceDictionary.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IResourceDictionary.cs similarity index 71% rename from src/Tizen.NUI/src/internal/XamlBinding/IResourceDictionary.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IResourceDictionary.cs index e1132db52..88ff90d4b 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IResourceDictionary.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IResourceDictionary.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal interface IResourceDictionary : IEnumerable> { bool TryGetValue(string key, out object value); diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ISystemResourcesProvider.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ISystemResourcesProvider.cs similarity index 50% rename from src/Tizen.NUI/src/internal/XamlBinding/ISystemResourcesProvider.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ISystemResourcesProvider.cs index ad52cc162..98ffb60ab 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ISystemResourcesProvider.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ISystemResourcesProvider.cs @@ -1,8 +1,5 @@ -using System.ComponentModel; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [EditorBrowsable(EditorBrowsableState.Never)] internal interface ISystemResourcesProvider { IResourceDictionary GetSystemResources(); diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ITimer.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ITimer.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/ITimer.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ITimer.cs index 1a18f7a7e..0542ef363 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ITimer.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ITimer.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { //this will go once Timer is included in Pcl profiles internal interface ITimer diff --git a/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IViewContainer.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IViewContainer.cs new file mode 100755 index 000000000..e95f10402 --- /dev/null +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IViewContainer.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace Tizen.NUI.XamlBinding +{ + internal interface IViewContainer where T : Element + { + IList Children { get; } + } +} \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IViewController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IViewController.cs similarity index 70% rename from src/Tizen.NUI/src/internal/XamlBinding/IViewController.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IViewController.cs index 76e9152f4..f31b79be8 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IViewController.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IViewController.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IViewController : IVisualElementController { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/IVisualElementController.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IVisualElementController.cs similarity index 69% rename from src/Tizen.NUI/src/internal/XamlBinding/IVisualElementController.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/IVisualElementController.cs index 94eec775c..8266864f4 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/IVisualElementController.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/IVisualElementController.cs @@ -1,7 +1,7 @@ using System; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IVisualElementController : IElementController { @@ -14,7 +14,7 @@ namespace Tizen.NUI.Binding bool IsNativeStateConsistent { get; set; } bool IsPlatformEnabled { get; set; } NavigationProxy NavigationProxy { get; } - event EventHandler> BatchCommitted; - event EventHandler FocusChangeRequested; + event EventHandler> BatchCommitted; + event EventHandler FocusChangeRequested; } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ImageSource.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ImageSource.cs similarity index 99% rename from src/Tizen.NUI/src/internal/XamlBinding/ImageSource.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ImageSource.cs index fa59903e1..8df985811 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ImageSource.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ImageSource.cs @@ -4,7 +4,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [TypeConverter(typeof(ImageSourceConverter))] internal abstract class ImageSource : Element diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ImageSourceConverter.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ImageSourceConverter.cs similarity index 94% rename from src/Tizen.NUI/src/internal/XamlBinding/ImageSourceConverter.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ImageSourceConverter.cs index 1082dc2f5..f3319d834 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ImageSourceConverter.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ImageSourceConverter.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [Xaml.TypeConversion(typeof(ImageSource))] internal sealed class ImageSourceConverter : TypeConverter diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/AttachedCollection.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/AttachedCollection.cs similarity index 99% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/AttachedCollection.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/AttachedCollection.cs index b1c524716..14e3f1bd1 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/AttachedCollection.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/AttachedCollection.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class AttachedCollection : ObservableCollection, ICollection, IAttachedObject where T : BindableObject, IAttachedObject { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/BindingCondition.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/BindingCondition.cs similarity index 96% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/BindingCondition.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/BindingCondition.cs index 63f031924..bf1bb824c 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/BindingCondition.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/BindingCondition.cs @@ -1,9 +1,9 @@ using System; using Tizen.NUI.Xaml; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [ProvideCompiled("Tizen.NUI.Xaml.Core.XamlC.PassthroughValueProvider")] + [ProvideCompiled("Tizen.NUI.Xaml.Forms.XamlC.PassthroughValueProvider")] [AcceptEmptyServiceProvider] internal sealed class BindingCondition : Condition, IValueProvider { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/Condition.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/Condition.cs similarity index 97% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/Condition.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/Condition.cs index 74ee0a2eb..26cb65dbd 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/Condition.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/Condition.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal abstract class Condition { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/IAttachedObject.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/IAttachedObject.cs similarity index 82% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/IAttachedObject.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/IAttachedObject.cs index 2e7e2c885..72b98f59a 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/IAttachedObject.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/IAttachedObject.cs @@ -1,4 +1,4 @@ -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal interface IAttachedObject { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/MultiCondition.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/MultiCondition.cs similarity index 98% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/MultiCondition.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/MultiCondition.cs index e25abf615..249370d72 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/MultiCondition.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/MultiCondition.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal sealed class MultiCondition : Condition { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/MultiTrigger.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/MultiTrigger.cs similarity index 94% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/MultiTrigger.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/MultiTrigger.cs index 0311a3b87..ac6e74f3f 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/MultiTrigger.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/MultiTrigger.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [ContentProperty("Setters")] internal sealed class MultiTrigger : TriggerBase diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/PropertyCondition.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/PropertyCondition.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/PropertyCondition.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/PropertyCondition.cs index 54bc675fc..35d4727c8 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/PropertyCondition.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/PropertyCondition.cs @@ -1,22 +1,22 @@ using System; using System.ComponentModel; using System.Reflection; -using Tizen.NUI.Binding; +using Tizen.NUI.XamlBinding; namespace Tizen.NUI.Xaml { - [ProvideCompiled("Tizen.NUI.Xaml.Core.XamlC.PassthroughValueProvider")] + [ProvideCompiled("Tizen.NUI.Xaml.Forms.XamlC.PassthroughValueProvider")] [AcceptEmptyServiceProvider] internal sealed class PropertyCondition : Condition, IValueProvider { readonly BindableProperty _stateProperty; - BindableProperty _property; + BindableProperty _property; object _triggerValue; public PropertyCondition() { - _stateProperty = BindableProperty.CreateAttached("State", typeof(bool), typeof(PropertyCondition), false, propertyChanged: OnStatePropertyChanged); + _stateProperty = BindableProperty.CreateAttached("State", typeof(bool), typeof(PropertyCondition), false, propertyChanged: this.OnStatePropertyChanged); } public BindableProperty Property diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs similarity index 97% rename from src/Tizen.NUI/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs index b17ac58f4..5b40402ed 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs @@ -3,9 +3,9 @@ using System.ComponentModel; using System.Reflection; using Tizen.NUI.Xaml; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [ProvideCompiled("Tizen.NUI.Core.XamlC.PassthroughValueProvider")] + [ProvideCompiled("Tizen.NUI.XamlC.PassthroughValueProvider")] [AcceptEmptyServiceProvider] internal sealed class XamlPropertyCondition : Condition, IValueProvider { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/IDataTemplate.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/IDataTemplate.cs similarity index 62% rename from src/Tizen.NUI/src/internal/XamlBinding/Internals/IDataTemplate.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/IDataTemplate.cs index 676ec7aab..c20a4a2e7 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/IDataTemplate.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/IDataTemplate.cs @@ -1,7 +1,6 @@ using System; -using System.ComponentModel; -namespace Tizen.NUI.Binding.Internals +namespace Tizen.NUI.XamlBinding.Internals { internal interface IDataTemplate { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/IDeserializer.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/IDeserializer.cs similarity index 79% rename from src/Tizen.NUI/src/internal/XamlBinding/Internals/IDeserializer.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/IDeserializer.cs index 8c6c63d0b..f55e8dd99 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/IDeserializer.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/IDeserializer.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using System.ComponentModel; using System.Threading.Tasks; -namespace Tizen.NUI.Binding.Internals +namespace Tizen.NUI.XamlBinding.Internals { internal interface IDeserializer { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/INamescopeProvider.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/INamescopeProvider.cs similarity index 70% rename from src/Tizen.NUI/src/internal/XamlBinding/Internals/INamescopeProvider.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/INamescopeProvider.cs index ff4bbf1f2..6eacf9ee2 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/INamescopeProvider.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/INamescopeProvider.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding.Internals +namespace Tizen.NUI.XamlBinding.Internals { interface INameScopeProvider { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/InvalidationTrigger.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/InvalidationTrigger.cs similarity index 82% rename from src/Tizen.NUI/src/internal/XamlBinding/Internals/InvalidationTrigger.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/InvalidationTrigger.cs index 1e093210f..6ac149b7d 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/InvalidationTrigger.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/InvalidationTrigger.cs @@ -1,7 +1,6 @@ using System; -using System.ComponentModel; -namespace Tizen.NUI.Binding.Internals +namespace Tizen.NUI.XamlBinding.Internals { [Flags] internal enum InvalidationTrigger diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/NumericExtensions.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/NumericExtensions.cs similarity index 88% rename from src/Tizen.NUI/src/internal/XamlBinding/Internals/NumericExtensions.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/NumericExtensions.cs index 995554a51..0432b88bd 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/NumericExtensions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/NumericExtensions.cs @@ -1,7 +1,6 @@ using System; -using System.ComponentModel; -namespace Tizen.NUI.Binding.Internals +namespace Tizen.NUI.XamlBinding.Internals { internal static class NumericExtensions { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/Ticker.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/Ticker.cs similarity index 96% rename from src/Tizen.NUI/src/internal/XamlBinding/Internals/Ticker.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/Ticker.cs index 7b00bb973..1f20c9d7e 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/Ticker.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/Internals/Ticker.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Diagnostics; using System.Linq; -using Tizen.NUI.Binding; -namespace Tizen.NUI.Binding.Internals +namespace Tizen.NUI.XamlBinding.Internals { internal abstract class Ticker { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/InvalidNavigationException.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/InvalidNavigationException.cs similarity index 84% rename from src/Tizen.NUI/src/internal/XamlBinding/InvalidNavigationException.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/InvalidNavigationException.cs index 25bebfb69..4b08123f3 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/InvalidNavigationException.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/InvalidNavigationException.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class InvalidNavigationException : Exception { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/InvalidationEventArgs.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/InvalidationEventArgs.cs similarity index 78% rename from src/Tizen.NUI/src/internal/XamlBinding/InvalidationEventArgs.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/InvalidationEventArgs.cs index 04d7bc642..da26253f5 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/InvalidationEventArgs.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/InvalidationEventArgs.cs @@ -1,7 +1,7 @@ using System; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class InvalidationEventArgs : EventArgs { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/LayoutAlignment.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutAlignment.cs similarity index 81% rename from src/Tizen.NUI/src/internal/XamlBinding/LayoutAlignment.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutAlignment.cs index 66f478920..714e97321 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/LayoutAlignment.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutAlignment.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [Flags] internal enum LayoutAlignment diff --git a/src/Tizen.NUI/src/internal/XamlBinding/LayoutExpandFlag.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutExpandFlag.cs similarity index 74% rename from src/Tizen.NUI/src/internal/XamlBinding/LayoutExpandFlag.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutExpandFlag.cs index 4cc3c2b86..e2fd4045b 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/LayoutExpandFlag.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutExpandFlag.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [Flags] internal enum LayoutExpandFlag diff --git a/src/Tizen.NUI/src/internal/XamlBinding/LayoutOptions.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutOptions.cs similarity index 98% rename from src/Tizen.NUI/src/internal/XamlBinding/LayoutOptions.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutOptions.cs index 2c9bf7af2..68e265daa 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/LayoutOptions.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutOptions.cs @@ -1,6 +1,6 @@ using System; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { [TypeConverter(typeof(LayoutOptionsConverter))] internal struct LayoutOptions diff --git a/src/Tizen.NUI/src/internal/XamlBinding/LayoutOptionsConverter.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutOptionsConverter.cs similarity index 90% rename from src/Tizen.NUI/src/internal/XamlBinding/LayoutOptionsConverter.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutOptionsConverter.cs index 98cddaa36..793747491 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/LayoutOptionsConverter.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/LayoutOptionsConverter.cs @@ -1,13 +1,11 @@ using System; using System.Linq; using System.Reflection; -using Tizen.NUI.Binding.Internals; +using Tizen.NUI.XamlBinding.Internals; -using Tizen.NUI; - -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [Xaml.ProvideCompiled("Tizen.NUI.Xaml.Core.XamlC.LayoutOptionsConverter")] + [Xaml.ProvideCompiled("Tizen.NUI.Xaml.Forms.XamlC.LayoutOptionsConverter")] [Xaml.TypeConversion(typeof(LayoutOptions))] internal sealed class LayoutOptionsConverter : TypeConverter { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ListStringTypeConverter.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ListStringTypeConverter.cs similarity index 81% rename from src/Tizen.NUI/src/internal/XamlBinding/ListStringTypeConverter.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/ListStringTypeConverter.cs index e7327c3be..7a97fd884 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ListStringTypeConverter.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/ListStringTypeConverter.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { - [Xaml.ProvideCompiled("Tizen.NUI.Core.XamlC.ListStringTypeConverter")] + [Xaml.ProvideCompiled("Tizen.NUI.XamlC.ListStringTypeConverter")] [Xaml.TypeConversion(typeof(List))] internal class ListStringTypeConverter : TypeConverter { diff --git a/src/Tizen.NUI/src/internal/XamlBinding/MenuItem.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/MenuItem.cs similarity index 99% rename from src/Tizen.NUI/src/internal/XamlBinding/MenuItem.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/MenuItem.cs index fd3acd69c..9affa7e43 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/MenuItem.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/MenuItem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Windows.Input; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal class MenuItem : BaseMenuItem, IMenuItemController diff --git a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/MergedStyle.cs similarity index 95% rename from src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs rename to src/Tizen.NUI.Xaml/src/internal/XamlBinding/MergedStyle.cs index eb8710d0b..0519fb9cf 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs +++ b/src/Tizen.NUI.Xaml/src/internal/XamlBinding/MergedStyle.cs @@ -3,15 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Tizen.NUI.StyleSheets; -using Tizen.NUI.BaseComponents; +using Tizen.NUI.Xaml.Forms.BaseComponents; -namespace Tizen.NUI.Binding +namespace Tizen.NUI.XamlBinding { internal sealed class MergedStyle : IStyle { ////If the base type is one of these, stop registering dynamic resources further ////The last one (typeof(Element)) is a safety guard as we might be creating VisualElement directly in internal code - static readonly IList s_stopAtTypes = new List { typeof(View), typeof(Layout<>), typeof(Element) }; + static readonly IList s_stopAtTypes = new List { typeof(View), typeof(Element) }; IList _classStyleProperties; @@ -57,9 +57,9 @@ namespace Tizen.NUI.Binding _classStyleProperties = new List (); foreach (var styleClass in _styleClass) { var classStyleProperty = BindableProperty.Create ("ClassStyle", typeof(IList