Merge pull request Samsung#21 from pius-lee/master

Change Namespace and implement IRotaryEventReceiver
jkpu · Nov 30, 2017 · 0fa221f · 0fa221f
2 parents e6b1eb4 + a985f41
commit 0fa221f
Show file tree

Hide file tree

Showing 30 changed files with 161 additions and 72 deletions.
diff --git 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/...ry/WearableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.cs b/...ry/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/...earableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.csproj b/...earableUIGallery/WearableUIGallery.Tizen.Wearable/WearableUIGallery.Tizen.Wearable.csproj
@@ -21,7 +21,7 @@
 
   <!-- If solution already has PCL project, will reference -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Xamarin.Forms.CircularUI.Renderer\Xamarin.Forms.CircularUI.Renderer.csproj" />
+    <ProjectReference Include="..\..\..\Xamarin.Forms.CircularUI.Tizen\Xamarin.Forms.CircularUI.Tizen.csproj" />
     <ProjectReference Include="..\WearableUIGallery\WearableUIGallery.csproj" />
   </ItemGroup>
 
@@ -32,7 +32,11 @@
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="Tizen.NET.Sdk" Version="1.0.0" />
-    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.5.0.77107" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Xamarin.Forms.Platform.Tizen">
+      <HintPath>..\..\..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\bin\Debug\tizen40\Xamarin.Forms.Platform.Tizen.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
 </Project>
diff --git a/...Gallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/res/image/cat360.png b/...Gallery/WearableUIGallery/WearableUIGallery.Tizen.Wearable/res/image/cat360.png
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery/AppViewModel.cs b/WearableUIGallery/WearableUIGallery/WearableUIGallery/AppViewModel.cs
@@ -11,7 +11,6 @@ public class AppViewModel
         public AppViewModel()
         {
             TCs = new ObservableCollection<TCDescribe>();
-
             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<TCDescribe> TCs { get; private set; }

diff --git 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">
     <w:CirclePage.Content>
-        <w:CircleListView>
+        <w:CircleListView x:Name="mylist">
             <w:CircleListView.ItemsSource>
                 <x:Array Type="{x:Type sys:String}" x:Key="array">
                     <x:String>Item 1</x:String>

diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml b/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<w:CirclePage xmlns="http://xamarin.com/schemas/2014/forms"
+              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+              xmlns:local="clr-namespace:WearableUIGallery.TC"
+              xmlns:w="clr-namespace:Xamarin.Forms.CircularUI;assembly=Xamarin.Forms.CircularUI"
+              x:Name="MyCirclePage"
+              x:Class="WearableUIGallery.TC.TCIRotaryEventReceiver"
+              RotaryFocusTargetName="MyCirclePage">
+    <w:CirclePage.Content>
+        <Image x:Name="Cat" Source="image/cat360.png"/>
+    </w:CirclePage.Content>
+</w:CirclePage>
diff --git a/WearableUIGallery/WearableUIGallery/WearableUIGallery/TC/TCIRotaryEventReceiver.xaml.cs 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;
+                    }
+                });
+        }
+    }
+}
diff --git 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
@@ -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<CircleDateTimeSelector, ElmSharp.Wearable.CircleDateTimeSelector>
     {

diff --git 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<ItemsView<Cell>, Cell>;
 

diff --git 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<ItemsView<Cell>, Cell>;
 

diff --git 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<CirclePage>
     {
@@ -51,12 +51,12 @@ protected override void OnElementChanged(ElementChangedEventArgs<CirclePage> 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
@@ -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<EvasObject>
     {

diff --git 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
@@ -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
@@ -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
@@ -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<CircleStepper, ESpinner>
     {

diff --git 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
@@ -1,5 +1,5 @@
 
-namespace Xamarin.Forms.CircularUI.Renderer
+namespace Xamarin.Forms.CircularUI.Tizen
 {
     public static class CircularUI
     {