diff --git a/WearableUIGallery/WearableUIGallery.sln b/WearableUIGallery/WearableUIGallery.sln
index 22ec2f82..94c4f369 100644
--- a/WearableUIGallery/WearableUIGallery.sln
+++ b/WearableUIGallery/WearableUIGallery.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WearableUIGallery.Tizen.Wea
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.CircularUI", "..\Xamarin.Forms.CircularUI\Xamarin.Forms.CircularUI.csproj", "{571EFE9E-B539-4FF7-8E28-A6F451C64652}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.CircularUI.Renderer", "..\Xamarin.Forms.CircularUI.Renderer\Xamarin.Forms.CircularUI.Renderer.csproj", "{0A00329D-37E9-4B18-BF30-5E5597826B29}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.CircularUI.Tizen", "..\Xamarin.Forms.CircularUI.Tizen\Xamarin.Forms.CircularUI.Tizen.csproj", "{8B32EE6A-0ADD-4E64-80E9-B2375690CC70}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,10 +29,10 @@ Global
{571EFE9E-B539-4FF7-8E28-A6F451C64652}.Debug|Any CPU.Build.0 = Debug|Any CPU
{571EFE9E-B539-4FF7-8E28-A6F451C64652}.Release|Any CPU.ActiveCfg = Release|Any CPU
{571EFE9E-B539-4FF7-8E28-A6F451C64652}.Release|Any CPU.Build.0 = Release|Any CPU
- {0A00329D-37E9-4B18-BF30-5E5597826B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0A00329D-37E9-4B18-BF30-5E5597826B29}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0A00329D-37E9-4B18-BF30-5E5597826B29}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0A00329D-37E9-4B18-BF30-5E5597826B29}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8B32EE6A-0ADD-4E64-80E9-B2375690CC70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8B32EE6A-0ADD-4E64-80E9-B2375690CC70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8B32EE6A-0ADD-4E64-80E9-B2375690CC70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8B32EE6A-0ADD-4E64-80E9-B2375690CC70}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.cs b/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.cs
index a6104774..399c6e20 100644
--- a/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.cs
+++ b/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.cs
@@ -14,7 +14,7 @@ static void Main(string[] args)
{
var app = new Program();
global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
- Xamarin.Forms.CircularUI.Renderer.CircularUI.Init();
+ Xamarin.Forms.CircularUI.Tizen.CircularUI.Init();
app.Run(args);
}
}
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.csproj b/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.csproj
index 67fd123f..e5c05aab 100644
--- a/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.csproj
+++ b/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.csproj
@@ -21,7 +21,7 @@
-
+
@@ -32,7 +32,11 @@
Runtime
-
+
+
+
+ ..\..\..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\bin\Debug\tizen40\Xamarin.Forms.Platform.Tizen.dll
+
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/res/image/cat360.png b/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/res/image/cat360.png
new file mode 100644
index 00000000..450e8633
Binary files /dev/null and b/WearableUIGallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/res/image/cat360.png differ
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery/AppViewModel.cs b/WearableUIGallery/WearableUIGallery/WearableUIGallery/AppViewModel.cs
index 71a61015..c21a6424 100755
--- a/WearableUIGallery/WearableUIGallery/WearableUIGallery/AppViewModel.cs
+++ b/WearableUIGallery/WearableUIGallery/WearableUIGallery/AppViewModel.cs
@@ -11,7 +11,6 @@ public class AppViewModel
public AppViewModel()
{
TCs = new ObservableCollection();
-
TCs.Add(new TCDescribe { Title = "CirclePage", Class = typeof(TCCirclePage) });
TCs.Add(new TCDescribe { Title = "CircleListView", Class = typeof(TCCircleListView) });
TCs.Add(new TCDescribe { Title = "CircleScroller", Class = typeof(TCCircleScroller) });
@@ -21,6 +20,7 @@ public AppViewModel()
TCs.Add(new TCDescribe { Title = "ContextPopup", Class = typeof(TCContextPopup) });
TCs.Add(new TCDescribe { Title = "TwoButtonPage", Class = typeof(TCTwoButtonPage) });
TCs.Add(new TCDescribe { Title = "TwoButtonPopup", Class = typeof(TCTwoButtonPopup) });
+ TCs.Add(new TCDescribe { Title = "RotationReceiver", Class = typeof(TCIRotaryEventReceiver) });
}
public IList TCs { get; private set; }
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCCircleListView.xaml b/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCCircleListView.xaml
index 513d7ccc..beabae92 100644
--- a/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCCircleListView.xaml
+++ b/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCCircleListView.xaml
@@ -4,9 +4,10 @@
xmlns:local="clr-namespace:WearableUIGallery"
xmlns:w="clr-namespace:Xamarin.Forms.CircularUI;assembly=Xamarin.Forms.CircularUI"
xmlns:sys="clr-namespace:System;assembly=netstandard"
- x:Class="WearableUIGallery.TC.TCCircleListView">
+ x:Class="WearableUIGallery.TC.TCCircleListView"
+ RotaryFocusTargetName="mylist">
-
+
Item 1
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml b/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml
new file mode 100644
index 00000000..2d181484
--- /dev/null
+++ b/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml.cs b/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml.cs
new file mode 100644
index 00000000..9c9ad0f0
--- /dev/null
+++ b/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.CircularUI;
+using Xamarin.Forms.Xaml;
+
+namespace WearableUIGallery.TC
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class TCIRotaryEventReceiver : CirclePage, IRotaryEventReceiver
+ {
+ bool _rotating;
+ double _angle;
+ public TCIRotaryEventReceiver ()
+ {
+ InitializeComponent ();
+ _angle = 0;
+ }
+
+ public void Rotate(RotaryEventArgs args)
+ {
+ if (_rotating) return;
+
+ _rotating = true;
+ _angle += args.IsClockwise ? 30 : -30;
+ Cat.RotateTo(_angle).ContinueWith(
+ (b) =>
+ {
+ _rotating = false;
+ if (_angle == 360)
+ {
+ Cat.Rotation = 0;
+ _angle = 0;
+ }
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.CircularUI.Tizen/CheckRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/CheckRenderer.cs
index c2c89e91..d7800008 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CheckRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CheckRenderer.cs
@@ -1,14 +1,14 @@
using System;
using System.ComponentModel;
using Xamarin.Forms.CircularUI;
-using Xamarin.Forms.CircularUI.Renderer;
+using Xamarin.Forms.CircularUI.Tizen;
using Xamarin.Forms.Platform.Tizen;
using ECheck = ElmSharp.Check;
using TForms = Xamarin.Forms.Platform.Tizen.Forms;
[assembly: ExportRenderer(typeof(Check), typeof(CheckRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
internal static class CheckStyle
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleDateTimeSelectorRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/CircleDateTimeSelectorRenderer.cs
index 97be8e77..b8d871ff 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleDateTimeSelectorRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleDateTimeSelectorRenderer.cs
@@ -7,10 +7,10 @@
using Xamarin.Forms.Platform.Tizen;
using ElmSharp;
-[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleDateTimeSelector), typeof(Xamarin.Forms.CircularUI.Renderer.CircleDateTimeSelectorRenderer))]
+[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleDateTimeSelector), typeof(Xamarin.Forms.CircularUI.Tizen.CircleDateTimeSelectorRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public class CircleDateTimeSelectorRenderer : ViewRenderer
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleListView.cs b/Xamarin.Forms.CircularUI.Tizen/CircleListView.cs
index a196b691..de94df54 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleListView.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleListView.cs
@@ -9,7 +9,7 @@
using Xamarin.Forms.Internals;
using System.ComponentModel;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
using GroupList = TemplatedItemsList, Cell>;
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleListViewRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/CircleListViewRenderer.cs
index 789e36c3..12d719d4 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleListViewRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleListViewRenderer.cs
@@ -8,9 +8,9 @@
using Xamarin.Forms.Internals;
using Xamarin.Forms.Platform.Tizen;
-[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleListView), typeof(Xamarin.Forms.CircularUI.Renderer.CircleListViewRenderer))]
+[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleListView), typeof(Xamarin.Forms.CircularUI.Tizen.CircleListViewRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
using GroupList = TemplatedItemsList, Cell>;
diff --git a/Xamarin.Forms.CircularUI.Tizen/CirclePageRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/CirclePageRenderer.cs
index 531ab3ed..ee6c6eb6 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CirclePageRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CirclePageRenderer.cs
@@ -8,9 +8,9 @@
using Xamarin.Forms.Platform.Tizen;
using System.ComponentModel;
-[assembly: ExportRenderer(typeof(CirclePage), typeof(Xamarin.Forms.CircularUI.Renderer.CirclePageRenderer))]
+[assembly: ExportRenderer(typeof(CirclePage), typeof(Xamarin.Forms.CircularUI.Tizen.CirclePageRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public class CirclePageRenderer : VisualElementRenderer
{
@@ -51,12 +51,12 @@ protected override void OnElementChanged(ElementChangedEventArgs arg
protected void OnCirclePageAppearing(object sender, EventArgs e)
{
- GetRotaryWidget(Element?.RotaryFocusObject)?.Activate();
+ ActivateRotaryWidget();
}
protected void OnCirclePageDisappearing(object sender, EventArgs e)
{
- GetRotaryWidget(Element?.RotaryFocusObject)?.Deactivate();
+ DeactivateRotaryWidget();
}
protected override void UpdateBackgroundColor(bool initialize)
@@ -72,50 +72,80 @@ protected override void UpdateBackgroundColor(bool initialize)
_widget.BackgroundColor = Element.BackgroundColor.ToNative();
}
}
-
- void OnToolbarClosed(object sender, EventArgs e)
- {
- GetRotaryWidget(_currentRotaryFocusObject)?.Activate();
- }
-
- void OnToolbarOpened(object sender, EventArgs e)
- {
- GetRotaryWidget(_currentRotaryFocusObject)?.Deactivate();
- }
-
IRotaryActionWidget GetRotaryWidget(IRotaryFocusable focusable)
{
var consumer = focusable as BindableObject;
+ IRotaryActionWidget rotaryWidget = null;
if (consumer != null)
{
- var consumerRenderer = Xamarin.Forms.Platform.Tizen.Platform.GetRenderer(consumer);
- IRotaryActionWidget rotaryWidget = null;
- if (consumerRenderer != null)
- {
- var nativeView = consumerRenderer.NativeView;
- rotaryWidget = nativeView as ElmSharp.Wearable.IRotaryActionWidget;
- }
- else if (consumer is Xamarin.Forms.CircularUI.CircleSliderSurfaceItem)
+ if (consumer is CircleSliderSurfaceItem)
{
ICircleSurfaceItem item = consumer as ICircleSurfaceItem;
rotaryWidget = _widget.GetCircleWidget(item) as IRotaryActionWidget;
}
-
- if (rotaryWidget != null)
+ else
{
- return rotaryWidget;
+ var consumerRenderer = Platform.Tizen.Platform.GetRenderer(consumer);
+ rotaryWidget = consumerRenderer?.NativeView as IRotaryActionWidget;
}
}
- return null;
+ return rotaryWidget;
+ }
+
+ void ActivateRotaryWidget()
+ {
+ if (_currentRotaryFocusObject is IRotaryEventReceiver)
+ {
+ RotaryEventManager.Rotated += OnRotaryEventChanged;
+ }
+ else if (_currentRotaryFocusObject is IRotaryFocusable)
+ {
+ GetRotaryWidget(_currentRotaryFocusObject)?.Activate();
+ }
+ }
+
+ void DeactivateRotaryWidget()
+ {
+ if (_currentRotaryFocusObject is IRotaryEventReceiver)
+ {
+ RotaryEventManager.Rotated -= OnRotaryEventChanged;
+ }
+ else if (_currentRotaryFocusObject is IRotaryFocusable)
+ {
+ GetRotaryWidget(_currentRotaryFocusObject)?.Deactivate();
+ }
+ }
+
+ void OnRotaryEventChanged(ElmSharp.Wearable.RotaryEventArgs args)
+ {
+ if (_currentRotaryFocusObject is IRotaryEventReceiver)
+ {
+ var receiver = _currentRotaryFocusObject as IRotaryEventReceiver;
+ receiver.Rotate(new RotaryEventArgs { IsClockwise = args.IsClockwise });
+ }
+ }
+
+ void OnToolbarClosed(object sender, EventArgs e)
+ {
+ ActivateRotaryWidget();
+ }
+
+ void OnToolbarOpened(object sender, EventArgs e)
+ {
+ DeactivateRotaryWidget();
}
void UpdateRotaryFocusObject(bool initialize)
{
if (!initialize)
- GetRotaryWidget(_currentRotaryFocusObject)?.Deactivate();
+ {
+ DeactivateRotaryWidget();
+ }
_currentRotaryFocusObject = Element.RotaryFocusObject;
if (!initialize)
- GetRotaryWidget(_currentRotaryFocusObject)?.Activate();
+ {
+ ActivateRotaryWidget();
+ }
}
void OnLayoutUpdated(object sender, Platform.Tizen.Native.LayoutEventArgs args)
diff --git a/Xamarin.Forms.CircularUI.Tizen/CirclePageWidget.cs b/Xamarin.Forms.CircularUI.Tizen/CirclePageWidget.cs
index 44703327..4886a6de 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CirclePageWidget.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CirclePageWidget.cs
@@ -12,7 +12,7 @@
using Xamarin.Forms.Platform.Tizen;
using Xamarin.Forms.Platform.Tizen.Native;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
class CirclePageWidget : ElmSharp.Layout, IContainable
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleProgressBarSurfaceItemImplements.cs b/Xamarin.Forms.CircularUI.Tizen/CircleProgressBarSurfaceItemImplements.cs
index 2bc40a27..d731596d 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleProgressBarSurfaceItemImplements.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleProgressBarSurfaceItemImplements.cs
@@ -8,7 +8,7 @@
using Xamarin.Forms.Platform.Tizen;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
class CircleProgressBarSurfaceItemImplements : ElmSharp.Wearable.CircleProgressBar
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleScrollViewRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/CircleScrollViewRenderer.cs
index 4cc98cbf..f9875fdb 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleScrollViewRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleScrollViewRenderer.cs
@@ -4,9 +4,9 @@
using System.Text;
using Xamarin.Forms.Platform.Tizen;
-[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleScrollView), typeof(Xamarin.Forms.CircularUI.Renderer.CircleScrollViewRenderer))]
+[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleScrollView), typeof(Xamarin.Forms.CircularUI.Tizen.CircleScrollViewRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
class CircleScrollViewRenderer : ScrollViewRenderer
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleSliderSurfaceItemImplements.cs b/Xamarin.Forms.CircularUI.Tizen/CircleSliderSurfaceItemImplements.cs
index 6eefe7a3..80eb4ea4 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleSliderSurfaceItemImplements.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleSliderSurfaceItemImplements.cs
@@ -8,7 +8,7 @@
using Xamarin.Forms.CircularUI;
using Xamarin.Forms.Platform.Tizen;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public class CircleSliderSurfaceItemImplements : ElmSharp.Wearable.CircleSlider
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleStepperRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/CircleStepperRenderer.cs
index 612cc66a..f3fab7ab 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleStepperRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleStepperRenderer.cs
@@ -3,10 +3,10 @@
using ESize = ElmSharp.Size;
using Xamarin.Forms.Platform.Tizen;
-[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleStepper), typeof(Xamarin.Forms.CircularUI.Renderer.CircleStepperRenderer))]
+[assembly: ExportRenderer(typeof(Xamarin.Forms.CircularUI.CircleStepper), typeof(Xamarin.Forms.CircularUI.Tizen.CircleStepperRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public class CircleStepperRenderer : ViewRenderer
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircleWidgetRendererExtension.cs b/Xamarin.Forms.CircularUI.Tizen/CircleWidgetRendererExtension.cs
index 93aaaf57..2340b197 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircleWidgetRendererExtension.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircleWidgetRendererExtension.cs
@@ -4,7 +4,7 @@
using System.Text;
using Xamarin.Forms.Platform.Tizen;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
static class CircleWidgetRendererExtension
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/CircularUI.cs b/Xamarin.Forms.CircularUI.Tizen/CircularUI.cs
index 066453fe..af038adc 100644
--- a/Xamarin.Forms.CircularUI.Tizen/CircularUI.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/CircularUI.cs
@@ -1,5 +1,5 @@
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public static class CircularUI
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/ContextPopupImplementation.cs b/Xamarin.Forms.CircularUI.Tizen/ContextPopupImplementation.cs
index bee8608d..8fde3a3b 100644
--- a/Xamarin.Forms.CircularUI.Tizen/ContextPopupImplementation.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/ContextPopupImplementation.cs
@@ -11,8 +11,8 @@
using XFPlatformTizen = Xamarin.Forms.Platform.Tizen;
-[assembly: XForms.Dependency(typeof(Xamarin.Forms.CircularUI.Renderer.ContextPopupImplementation))]
-namespace Xamarin.Forms.CircularUI.Renderer
+[assembly: XForms.Dependency(typeof(Xamarin.Forms.CircularUI.Tizen.ContextPopupImplementation))]
+namespace Xamarin.Forms.CircularUI.Tizen
{
internal class ContextPopupImplementation : IContextPopup, INotifyPropertyChanged, IDisposable
diff --git a/Xamarin.Forms.CircularUI.Tizen/GroupTextCellRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/GroupTextCellRenderer.cs
index 26628077..433f03c2 100644
--- a/Xamarin.Forms.CircularUI.Tizen/GroupTextCellRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/GroupTextCellRenderer.cs
@@ -1,6 +1,6 @@
using Xamarin.Forms.Platform.Tizen;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
class GroupTextCellRenderer : TextCellRenderer
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/IndexPageRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/IndexPageRenderer.cs
index 717cd8d3..007b44b8 100644
--- a/Xamarin.Forms.CircularUI.Tizen/IndexPageRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/IndexPageRenderer.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using Xamarin.Forms.CircularUI;
-using Xamarin.Forms.CircularUI.Renderer;
+using Xamarin.Forms.CircularUI.Tizen;
using Xamarin.Forms.Platform.Tizen;
using ElmSharp;
using TForms = Xamarin.Forms.Platform.Tizen.Forms;
@@ -10,7 +10,7 @@
[assembly: ExportRenderer(typeof(IndexPage), typeof(IndexPageRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
internal static class IndexStyle
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/ListViewCache.cs b/Xamarin.Forms.CircularUI.Tizen/ListViewCache.cs
index 3430b7b7..e71001a2 100644
--- a/Xamarin.Forms.CircularUI.Tizen/ListViewCache.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/ListViewCache.cs
@@ -4,7 +4,7 @@
using Xamarin.Forms.Platform.Tizen;
using Xamarin.Forms.Internals;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public static class ListViewCache
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageRenderer.cs b/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageRenderer.cs
index 24f6fa7c..225b9099 100644
--- a/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageRenderer.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageRenderer.cs
@@ -1,4 +1,5 @@
-using System;
+using ElmSharp;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
@@ -6,10 +7,10 @@
using Xamarin.Forms.CircularUI;
using Xamarin.Forms.Platform.Tizen;
-[assembly: ExportRenderer(typeof(TwoButtonPage), typeof(Xamarin.Forms.CircularUI.Renderer.TwoButtonPageRenderer))]
+[assembly: ExportRenderer(typeof(TwoButtonPage), typeof(Xamarin.Forms.CircularUI.Tizen.TwoButtonPageRenderer))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public class TwoButtonPageRenderer : VisualElementRenderer
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageWidget.cs b/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageWidget.cs
index c56a16e5..36c8e489 100644
--- a/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageWidget.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/TwoButtonPageWidget.cs
@@ -6,7 +6,7 @@
using Xamarin.Forms.Platform.Tizen;
using Xamarin.Forms.Platform.Tizen.Native;
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public class TwoButtonPageWidget : Background, IContainable
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/TwoButtonPopupImplementation.cs b/Xamarin.Forms.CircularUI.Tizen/TwoButtonPopupImplementation.cs
index dcfa968d..c7c9561e 100644
--- a/Xamarin.Forms.CircularUI.Tizen/TwoButtonPopupImplementation.cs
+++ b/Xamarin.Forms.CircularUI.Tizen/TwoButtonPopupImplementation.cs
@@ -3,9 +3,9 @@
using XForms = Xamarin.Forms;
using Xamarin.Forms.Platform.Tizen;
-[assembly: XForms.Dependency(typeof(Xamarin.Forms.CircularUI.Renderer.TwoButtonPopupImplementation))]
+[assembly: XForms.Dependency(typeof(Xamarin.Forms.CircularUI.Tizen.TwoButtonPopupImplementation))]
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
{
public class TwoButtonPopupImplementation : IPopup, IDisposable
{
diff --git a/Xamarin.Forms.CircularUI.Tizen/Xamarin.Forms.CircularUI.Tizen.csproj b/Xamarin.Forms.CircularUI.Tizen/Xamarin.Forms.CircularUI.Tizen.csproj
index 06f61722..222ee611 100644
--- a/Xamarin.Forms.CircularUI.Tizen/Xamarin.Forms.CircularUI.Tizen.csproj
+++ b/Xamarin.Forms.CircularUI.Tizen/Xamarin.Forms.CircularUI.Tizen.csproj
@@ -10,7 +10,9 @@
-
+
+ ..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\bin\Debug\tizen40\Xamarin.Forms.Platform.Tizen.dll
+
diff --git a/Xamarin.Forms.CircularUI/CircleStepper.cs b/Xamarin.Forms.CircularUI/CircleStepper.cs
index 45f16f1a..a733574f 100644
--- a/Xamarin.Forms.CircularUI/CircleStepper.cs
+++ b/Xamarin.Forms.CircularUI/CircleStepper.cs
@@ -5,7 +5,5 @@ public class CircleStepper : Xamarin.Forms.Stepper, IRotaryFocusable
public static readonly BindableProperty MarkerColorProperty = BindableProperty.Create(nameof(MarkerColor), typeof(Color), typeof(CircleStepper), Color.Default);
public Color MarkerColor { get => (Color)GetValue(MarkerColorProperty); set => SetValue(MarkerColorProperty, value); }
-
- public event RotaryEventHandler Rotated;
}
}
diff --git a/Xamarin.Forms.CircularUI/IRotaryFocusable.cs b/Xamarin.Forms.CircularUI/IRotaryFocusable.cs
index f0924b79..95462a8a 100644
--- a/Xamarin.Forms.CircularUI/IRotaryFocusable.cs
+++ b/Xamarin.Forms.CircularUI/IRotaryFocusable.cs
@@ -6,7 +6,6 @@ public interface IRotaryFocusable
public interface IRotaryEventReceiver : IRotaryFocusable
{
- event RotaryEventHandler Rotated;
void Rotate(RotaryEventArgs args);
}
}
\ No newline at end of file