[NUI] Add public types to replace nested types of Components.Slider (#1808)

To replace nested types (CA1034 of StyleCop), the followings are added.
- class SliderValueChangedEventArgs
- class SliderSlidingFinishedEventArgs
- event EventHandler<SliderValueChangedEventArgs> in Slider class
- event EventHandler<SliderSlidingFinishedEventArgs> in Slider class

The followings are deprecated.
- class ValueChangedArgs in Slider class
- class SlidingFinishedArgs in Slider class
- event EventHandler<ValueChangedArgs> in Slider class
- event EventHandler<SlidingFinishedArgs> in Slider class

Co-authored-by: Jaehyun Cho <jae_hyun.cho@samsung.com>

diff --git a/src/Tizen.NUI.Components/Controls/Slider.Internal.cs b/src/Tizen.NUI.Components/Controls/Slider.Internal.cs
index d5c1883..ae6859b 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Slider.Internal.cs
+++ b/src/Tizen.NUI.Components/Controls/Slider.Internal.cs
@@ -44,6 +44,8 @@ namespace Tizen.NUI.Components
         private float currentSlidedOffset;
         private EventHandler<ValueChangedArgs> valueChangedHandler;
         private EventHandler<SlidingFinishedArgs> slidingFinishedHandler;
+        private EventHandler<SliderValueChangedEventArgs> sliderValueChangedHandler;
+        private EventHandler<SliderSlidingFinishedEventArgs> sliderSlidingFinishedHandler;
         private EventHandler<StateChangedArgs> stateChangedHandler;
 
         bool isFocused = false;
@@ -204,6 +206,13 @@ namespace Tizen.NUI.Components
                     slidingFinishedHandler(this, args);
                 }
 
+                if (null != sliderSlidingFinishedHandler)
+                {
+                    SliderSlidingFinishedEventArgs args = new SliderSlidingFinishedEventArgs();
+                    args.CurrentValue = curValue;
+                    sliderSlidingFinishedHandler(this, args);
+                }
+
                 UpdateState(isFocused, false);
             }
         }

diff --git a/src/Tizen.NUI.Components/Controls/Slider.cs b/src/Tizen.NUI.Components/Controls/Slider.cs
index 9bf9703..592d52a 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Slider.cs
+++ b/src/Tizen.NUI.Components/Controls/Slider.cs
@@ -22,6 +22,32 @@ using Tizen.NUI.Binding;
 namespace Tizen.NUI.Components
 {
     /// <summary>
+    /// Slider value changed event data.
+    /// </summary>
+    /// <since_tizen> 8 </since_tizen>
+    public class SliderValueChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Current Slider value
+        /// </summary>
+        /// <since_tizen> 8 </since_tizen>
+        public float CurrentValue { get; set; }
+    }
+
+    /// <summary>
+    /// Slider sliding finished event data.
+    /// </summary>
+    /// <since_tizen> 8 </since_tizen>
+    public class SliderSlidingFinishedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Current Slider value
+        /// </summary>
+        /// <since_tizen> 8 </since_tizen>
+        public float CurrentValue { get; set; }
+    }
+
+    /// <summary>
     /// A slider lets users select a value from a continuous or discrete range of values by moving the slider thumb.
     /// </summary>
     /// <since_tizen> 6 </since_tizen>
@@ -108,6 +134,7 @@ namespace Tizen.NUI.Components
         /// The value changed event handler.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
+        [Obsolete("Deprecated in API8; Will be removed in API10. Please use ValueChanged event instead.")]
         public event EventHandler<ValueChangedArgs> ValueChangedEvent
         {
             add
@@ -124,6 +151,7 @@ namespace Tizen.NUI.Components
         /// The sliding finished event handler.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
+        [Obsolete("Deprecated in API8; Will be removed in API10. Please use SlidingFinished event instead.")]
         public event EventHandler<SlidingFinishedArgs> SlidingFinishedEvent
         {
             add
@@ -137,6 +165,38 @@ namespace Tizen.NUI.Components
         }
 
         /// <summary>
+        /// The value changed event handler.
+        /// </summary>
+        /// <since_tizen> 8 </since_tizen>
+        public event EventHandler<SliderValueChangedEventArgs> ValueChanged
+        {
+            add
+            {
+                sliderValueChangedHandler += value;
+            }
+            remove
+            {
+                sliderValueChangedHandler -= value;
+            }
+        }
+
+        /// <summary>
+        /// The sliding finished event handler.
+        /// </summary>
+        /// <since_tizen> 8 </since_tizen>
+        public event EventHandler<SliderSlidingFinishedEventArgs> SlidingFinished
+        {
+            add
+            {
+                sliderSlidingFinishedHandler += value;
+            }
+            remove
+            {
+                sliderSlidingFinishedHandler -= value;
+            }
+        }
+
+        /// <summary>
         /// The state changed event handler.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
@@ -830,6 +890,13 @@ namespace Tizen.NUI.Components
                 args.CurrentValue = curValue;
                 valueChangedHandler(this, args);
             }
+
+            if (sliderValueChangedHandler != null)
+            {
+                SliderValueChangedEventArgs args = new SliderValueChangedEventArgs();
+                args.CurrentValue = curValue;
+                sliderValueChangedHandler(this, args);
+            }
         }
 
         private bool OnTouchEventForBgTrack(object source, TouchEventArgs e)
@@ -846,6 +913,13 @@ namespace Tizen.NUI.Components
                     args.CurrentValue = curValue;
                     slidingFinishedHandler(this, args);
                 }
+
+                if (null !=sliderSlidingFinishedHandler)
+                {
+                    SliderSlidingFinishedEventArgs args = new SliderSlidingFinishedEventArgs();
+                    args.CurrentValue = curValue;
+                    sliderSlidingFinishedHandler(this, args);
+                }
             }
             return false;
         }
@@ -884,6 +958,13 @@ namespace Tizen.NUI.Components
                     args.CurrentValue = curValue;
                     valueChangedHandler(this, args);
                 }
+
+                if (null != sliderValueChangedHandler)
+                {
+                    SliderValueChangedEventArgs args = new SliderValueChangedEventArgs();
+                    args.CurrentValue = curValue;
+                    sliderValueChangedHandler(this, args);
+                }
             }
         }
 
@@ -1000,12 +1081,14 @@ namespace Tizen.NUI.Components
         /// Value Changed event data.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
+        [Obsolete("Deprecated in API8; Will be removed in API10. Please use SliderValueChangedEventArgs instead.")]
         public class ValueChangedArgs : EventArgs
         {
             /// <summary>
             /// Curren value
             /// </summary>
             /// <since_tizen> 6 </since_tizen>
+            [Obsolete("Deprecated in API8; Will be removed in API10. Please use SliderValueChangedEventArgs.CurrentValue instead.")]
             public float CurrentValue;
         }
 
@@ -1013,12 +1096,14 @@ namespace Tizen.NUI.Components
         /// Value Changed event data.
         /// </summary>
         /// <since_tizen> 6 </since_tizen>
+        [Obsolete("Deprecated in API8; Will be removed in API10. Please use SliderSlidingFinishedEventArgs instead.")]
         public class SlidingFinishedArgs : EventArgs
         {
             /// <summary>
             /// Curren value
             /// </summary>
             /// <since_tizen> 6 </since_tizen>
+            [Obsolete("Deprecated in API8; Will be removed in API10. Please use SliderSlidingFinishedEventArgs.CurrentValue instead.")]
             public float CurrentValue;
         }
 

diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs
index 1001a5d..3a4221a 100755 (executable)
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/SliderSample.cs
@@ -249,8 +249,8 @@ namespace Tizen.NUI.Samples
             source.MinValue = MIN_VALUE;
             source.MaxValue = MAX_VALUE;
             source.StateChangedEvent += OnStateChanged;
-            source.ValueChangedEvent += OnValueChanged;
-            source.SlidingFinishedEvent += OnSlidingFinished;
+            source.ValueChanged += OnValueChanged;
+            source.SlidingFinished += OnSlidingFinished;
             source.Size = new Size(w, h);
             source.CurrentValue = curValue;
             return source;
@@ -266,14 +266,14 @@ namespace Tizen.NUI.Samples
             source.MinValue = MIN_VALUE;
             source.MaxValue = MAX_VALUE;
             source.StateChangedEvent += OnStateChanged;
-            source.ValueChangedEvent += OnValueChanged;
-            source.SlidingFinishedEvent += OnSlidingFinished;
+            source.ValueChanged += OnValueChanged;
+            source.SlidingFinished += OnSlidingFinished;
             source.Size = new Size(w, h);
             source.CurrentValue = curValue;
             return source;
         }
 
-        private void OnValueChanged(object sender, Slider.ValueChangedArgs args)
+        private void OnValueChanged(object sender, SliderValueChangedEventArgs args)
         {
             Slider source = sender as Slider;
             if (source != null)
@@ -289,7 +289,7 @@ namespace Tizen.NUI.Samples
             }
         }
 
-        private void OnSlidingFinished(object sender, Slider.SlidingFinishedArgs args)
+        private void OnSlidingFinished(object sender, SliderSlidingFinishedEventArgs args)
         {
             Slider source = sender as Slider;
             if (source != null)