From e136767b4977dd5f43976432a9d744a0fbcd6c46 Mon Sep 17 00:00:00 2001 From: Seechan Kim Date: Mon, 19 Jun 2017 10:41:27 +0000 Subject: [PATCH] [TCSACR-38] Rename gesture events and handlers Change-Id: I6534dbcd1cf3d722e9370622ae177053650658f9 --- packaging/csapi-maps.spec | 4 +- src/Tizen.Maps/Interop/Interop.View.Event.Data.cs | 8 +- src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs | 1 + src/Tizen.Maps/Tizen.Maps/GestureType.cs | 16 ++-- src/Tizen.Maps/Tizen.Maps/MapService.cs | 8 +- src/Tizen.Maps/Tizen.Maps/MapView.cs | 100 +++++++++++----------- src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs | 1 + src/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs | 1 + src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs | 1 + src/Tizen.Maps/Tizen.Maps/PlaceContact.cs | 1 + src/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs | 1 + src/Tizen.Maps/Tizen.Maps/PlaceRating.cs | 1 + src/Tizen.Maps/Tizen.Maps/Polyline.cs | 3 + 13 files changed, 78 insertions(+), 68 deletions(-) diff --git a/packaging/csapi-maps.spec b/packaging/csapi-maps.spec index 88fa034..772424c 100644 --- a/packaging/csapi-maps.spec +++ b/packaging/csapi-maps.spec @@ -1,7 +1,7 @@ Name: csapi-maps Summary: Tizen Map Service API for C# -Version: 1.0.11 -Release: 5 +Version: 1.0.12 +Release: 1 Group: Development/Libraries License: Apache-2.0 and SAMSUNG URL: https://www.tizen.org diff --git a/src/Tizen.Maps/Interop/Interop.View.Event.Data.cs b/src/Tizen.Maps/Interop/Interop.View.Event.Data.cs index c1cde38..dd5fd6a 100755 --- a/src/Tizen.Maps/Interop/Interop.View.Event.Data.cs +++ b/src/Tizen.Maps/Interop/Interop.View.Event.Data.cs @@ -36,10 +36,10 @@ internal static partial class Interop None, // MAPS_VIEW_GESTURE_NONE Scroll, // MAPS_VIEW_GESTURE_SCROLL Zoom, // MAPS_VIEW_GESTURE_ZOOM - Tap, // MAPS_VIEW_GESTURE_TAP - DoubleTap, // MAPS_VIEW_GESTURE_DOUBLE_TAP - TwoFingerTap, // MAPS_VIEW_GESTURE_2_FINGER_TAP - Rotate, // MAPS_VIEW_GESTURE_ROTATE + Click, // MAPS_VIEW_GESTURE_TAP + DoubleClick, // MAPS_VIEW_GESTURE_DOUBLE_TAP + TwoFingerClick, // MAPS_VIEW_GESTURE_2_FINGER_TAP + Rotation, // MAPS_VIEW_GESTURE_ROTATE LongPress, // MAPS_VIEW_GESTURE_LONG_PRESS } diff --git a/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs b/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs index e6ba385..7a26724 100755 --- a/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs +++ b/src/Tizen.Maps/Tizen.Maps/Geocoordinates.cs @@ -67,6 +67,7 @@ namespace Tizen.Maps /// /// Returns a string that represents this object. /// + /// Returns a string which presents this object. public override string ToString() { return $"[{Latitude}, {Longitude}]"; diff --git a/src/Tizen.Maps/Tizen.Maps/GestureType.cs b/src/Tizen.Maps/Tizen.Maps/GestureType.cs index 4607787..f4ccfae 100755 --- a/src/Tizen.Maps/Tizen.Maps/GestureType.cs +++ b/src/Tizen.Maps/Tizen.Maps/GestureType.cs @@ -34,24 +34,24 @@ namespace Tizen.Maps /// Zoom = Interop.ViewGesture.Zoom, /// - /// Indicates the tap user gesture. + /// Indicates the click user gesture /// - Tap = Interop.ViewGesture.Tap, + Click = Interop.ViewGesture.Click, /// - /// Indicates the double tap user gesture. + /// Indicates the double click user gesture /// - DoubleTap = Interop.ViewGesture.DoubleTap, + DoubleClick = Interop.ViewGesture.DoubleClick, /// - /// Indicates the two-finger tap user gesture. + /// Indicates the two-finger click user gesture /// - TwoFingerTap = Interop.ViewGesture.TwoFingerTap, + TwoFingerClick = Interop.ViewGesture.TwoFingerClick, /// /// Indicates the rotation user gesture. /// - Rotate = Interop.ViewGesture.Rotate, + Rotation = Interop.ViewGesture.Rotation, /// /// Indicates the long press user gesture. /// LongPress = Interop.ViewGesture.LongPress, } -} \ No newline at end of file +} diff --git a/src/Tizen.Maps/Tizen.Maps/MapService.cs b/src/Tizen.Maps/Tizen.Maps/MapService.cs index eba01fb..4c7648b 100755 --- a/src/Tizen.Maps/Tizen.Maps/MapService.cs +++ b/src/Tizen.Maps/Tizen.Maps/MapService.cs @@ -81,7 +81,7 @@ namespace Tizen.Maps /// /// Gets and sets a string representing keys for map service provider /// - /// Regaularly, the provider key is issued by each maps provider, after signing up for a plan in the web site. + /// Typically, the provider key is issued by each maps provider, after signing up for a plan in the web site. /// Depending on the plan and its provider which you have signed, you might pay for the network traffic. public string ProviderKey { @@ -261,11 +261,11 @@ namespace Tizen.Maps /// Creates a reverse geocode search request for given latitude and longitude. /// /// Latitude of interested place - /// Longitude of interested place + /// Longitude of interested place /// Returns ReverseGeocodeRequest object created with location coordinates - public ReverseGeocodeRequest CreateReverseGeocodeRequest(double latitude, double longitute) + public ReverseGeocodeRequest CreateReverseGeocodeRequest(double latitude, double longitude) { - return new ReverseGeocodeRequest(this, latitude, longitute); + return new ReverseGeocodeRequest(this, latitude, longitude); } /// diff --git a/src/Tizen.Maps/Tizen.Maps/MapView.cs b/src/Tizen.Maps/Tizen.Maps/MapView.cs index 8814536..12c1631 100755 --- a/src/Tizen.Maps/Tizen.Maps/MapView.cs +++ b/src/Tizen.Maps/Tizen.Maps/MapView.cs @@ -37,11 +37,11 @@ namespace Tizen.Maps private Interop.ViewOnEventCallback _viewReadyEventCallback; private event EventHandler _scrolledEventHandler; - private event EventHandler _zoomedEventHandler; - private event EventHandler _tappedEventHandler; - private event EventHandler _doubleTappedEventHandler; - private event EventHandler _twoFingerTappedEventHandler; - private event EventHandler _rotatedEventHandler; + private event EventHandler _twoFingerZoomedEventHandler; + private event EventHandler _clickedEventHandler; + private event EventHandler _doubleClickedEventHandler; + private event EventHandler _twoFingerClickedEventHandler; + private event EventHandler _twoFingerRotatedEventHandler; private event EventHandler _longPressedEventHandler; private event EventHandler _viewReadyEventHandler; @@ -64,7 +64,7 @@ namespace Tizen.Maps this.Resize(1, 1); // We need to keep Gesture Tap event enabled for object event to work - handle.SetGestureEnabled(Interop.ViewGesture.Tap, true); + handle.SetGestureEnabled(Interop.ViewGesture.Click, true); SetObjectEventCallback(); } @@ -99,20 +99,20 @@ namespace Tizen.Maps /// /// Event handlers to get zoomed gesture event /// Thrown when the required feature is not supported. - public event EventHandler ZoomChanged + public event EventHandler TwoFingerZoomed { add { SetGestureEventCallback(); handle.SetGestureEnabled(Interop.ViewGesture.Zoom, true); - _zoomedEventHandler += value; - Log.Info(string.Format("ZoomChanged event handler is added")); + _twoFingerZoomedEventHandler += value; + Log.Info(string.Format("TwoFingerZoomed event handler is added")); } remove { - _zoomedEventHandler -= value; - Log.Info(string.Format("ZoomChanged event handler is removed")); - if (_zoomedEventHandler == null) + _twoFingerZoomedEventHandler -= value; + Log.Info(string.Format("TwoFingerZoomed event handler is removed")); + if (_twoFingerZoomedEventHandler == null) { handle.SetGestureEnabled(Interop.ViewGesture.Zoom, false); UnsetGestureEventCallback(); @@ -130,17 +130,17 @@ namespace Tizen.Maps add { SetGestureEventCallback(); - //handle.SetGestureEnabled(Interop.ViewGesture.Tap, true); - _tappedEventHandler += value; + //handle.SetGestureEnabled(Interop.ViewGesture.Click, true); + _clickedEventHandler += value; Log.Info(string.Format("Clicked event handler is added")); } remove { - _tappedEventHandler -= value; + _clickedEventHandler -= value; Log.Info(string.Format("Clicked event handler is removed")); - if (_tappedEventHandler == null) + if (_clickedEventHandler == null) { - //handle.SetGestureEnabled(Interop.ViewGesture.Tap, false); + //handle.SetGestureEnabled(Interop.ViewGesture.Click, false); UnsetGestureEventCallback(); } } @@ -156,17 +156,17 @@ namespace Tizen.Maps add { SetGestureEventCallback(); - handle.SetGestureEnabled(Interop.ViewGesture.DoubleTap, true); - _doubleTappedEventHandler += value; + handle.SetGestureEnabled(Interop.ViewGesture.DoubleClick, true); + _doubleClickedEventHandler += value; Log.Info(string.Format("DoubleClicked event handler is removed")); } remove { - _doubleTappedEventHandler -= value; + _doubleClickedEventHandler -= value; Log.Info(string.Format("DoubleClicked event handler is removed")); - if (_doubleTappedEventHandler == null) + if (_doubleClickedEventHandler == null) { - handle.SetGestureEnabled(Interop.ViewGesture.DoubleTap, false); + handle.SetGestureEnabled(Interop.ViewGesture.DoubleClick, false); UnsetGestureEventCallback(); } } @@ -177,22 +177,22 @@ namespace Tizen.Maps /// /// Event handlers to get clicked gesture event /// Thrown when the required feature is not supported. - public event EventHandler TwoFingerPressed + public event EventHandler TwoFingerClicked { add { SetGestureEventCallback(); - handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerTap, true); - _twoFingerTappedEventHandler += value; - Log.Info(string.Format("TwoFingerPressed event handler is added")); + handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerClick, true); + _twoFingerClickedEventHandler += value; + Log.Info(string.Format("TwoFingerClicked event handler is added")); } remove { - _twoFingerTappedEventHandler -= value; - Log.Info(string.Format("TwoFingerPressed event handler is removed")); - if (_twoFingerTappedEventHandler == null) + _twoFingerClickedEventHandler -= value; + Log.Info(string.Format("TwoFingerClicked event handler is removed")); + if (_twoFingerClickedEventHandler == null) { - handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerTap, false); + handle.SetGestureEnabled(Interop.ViewGesture.TwoFingerClick, false); UnsetGestureEventCallback(); } } @@ -203,22 +203,22 @@ namespace Tizen.Maps /// /// Event handlers to get rotated gesture event /// Thrown when the required feature is not supported. - public event EventHandler Rotated + public event EventHandler TwoFingerRotated { add { SetGestureEventCallback(); - handle.SetGestureEnabled(Interop.ViewGesture.Rotate, true); - _rotatedEventHandler += value; + handle.SetGestureEnabled(Interop.ViewGesture.Rotation, true); + _twoFingerRotatedEventHandler += value; Log.Info(string.Format("Rotated event handler is added")); } remove { - _rotatedEventHandler -= value; + _twoFingerRotatedEventHandler -= value; Log.Info(string.Format("Rotated event handler is removed")); - if (_rotatedEventHandler == null) + if (_twoFingerRotatedEventHandler == null) { - handle.SetGestureEnabled(Interop.ViewGesture.Rotate, false); + handle.SetGestureEnabled(Interop.ViewGesture.Rotation, false); UnsetGestureEventCallback(); } } @@ -648,11 +648,11 @@ namespace Tizen.Maps switch (eventArg.GestureType) { case GestureType.Scroll: _scrolledEventHandler?.Invoke(this, eventArg); break; - case GestureType.Zoom: _zoomedEventHandler?.Invoke(this, eventArg); break; - case GestureType.Tap: _tappedEventHandler?.Invoke(this, eventArg); break; - case GestureType.DoubleTap: _doubleTappedEventHandler?.Invoke(this, eventArg); break; - case GestureType.TwoFingerTap: _twoFingerTappedEventHandler?.Invoke(this, eventArg); break; - case GestureType.Rotate: _rotatedEventHandler?.Invoke(this, eventArg); break; + case GestureType.Zoom: _twoFingerZoomedEventHandler?.Invoke(this, eventArg); break; + case GestureType.Click: _clickedEventHandler?.Invoke(this, eventArg); break; + case GestureType.DoubleClick: _doubleClickedEventHandler?.Invoke(this, eventArg); break; + case GestureType.TwoFingerClick: _twoFingerClickedEventHandler?.Invoke(this, eventArg); break; + case GestureType.Rotation: _twoFingerRotatedEventHandler?.Invoke(this, eventArg); break; case GestureType.LongPress: _longPressedEventHandler?.Invoke(this, eventArg); break; } }; @@ -663,9 +663,9 @@ namespace Tizen.Maps private void UnsetGestureEventCallback() { - if (_scrolledEventHandler != null || _zoomedEventHandler != null - || _tappedEventHandler != null || _doubleTappedEventHandler != null - || _twoFingerTappedEventHandler != null || _rotatedEventHandler != null + if (_scrolledEventHandler != null || _twoFingerZoomedEventHandler != null + || _clickedEventHandler != null || _doubleClickedEventHandler != null + || _twoFingerClickedEventHandler != null || _twoFingerRotatedEventHandler != null || _longPressedEventHandler != null) { return; @@ -686,12 +686,12 @@ namespace Tizen.Maps var eventArg = new Interop.ObjectEventDataHandle(eventData); switch (eventArg.GestureType) { - case Interop.ViewGesture.Tap: - { - var mapObject = _handleToObjectTable[eventArg.ViewObject]; - mapObject?.HandleClickedEvent(); - break; - } + case Interop.ViewGesture.Click: + { + var mapObject = _handleToObjectTable[eventArg.ViewObject]; + mapObject?.HandleClickedEvent(); + break; + } } }; handle.SetEventCb(Interop.ViewEventType.Object, _objectEventCallback, IntPtr.Zero); diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs b/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs index e9c9fb9..6c90609 100755 --- a/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs +++ b/src/Tizen.Maps/Tizen.Maps/PlaceAddress.cs @@ -192,6 +192,7 @@ namespace Tizen.Maps /// /// Returns a string that represents this object. /// + /// Returns a string which presents this object. public override string ToString() { return $"{Freetext}"; diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs b/src/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs index 0e5d65f..89230cf 100755 --- a/src/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs +++ b/src/Tizen.Maps/Tizen.Maps/PlaceAttribute.cs @@ -57,6 +57,7 @@ namespace Tizen.Maps /// /// Returns a string that represents this object. /// + /// Returns a string which presents this object. public override string ToString() { return $"{Label}: {Text}"; diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs b/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs index acbb1f0..dae19e5 100755 --- a/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs +++ b/src/Tizen.Maps/Tizen.Maps/PlaceCategory.cs @@ -70,6 +70,7 @@ namespace Tizen.Maps /// /// Returns a string that represents this object. /// + /// Returns a string which presents this object. public override string ToString() { return $"{Name}"; diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceContact.cs b/src/Tizen.Maps/Tizen.Maps/PlaceContact.cs index e06ed72..b542ca6 100755 --- a/src/Tizen.Maps/Tizen.Maps/PlaceContact.cs +++ b/src/Tizen.Maps/Tizen.Maps/PlaceContact.cs @@ -57,6 +57,7 @@ namespace Tizen.Maps /// /// Returns a string that represents this object. /// + /// Returns a string which presents this object. public override string ToString() { return $"{Label}: {Value}"; diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs b/src/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs index 4a702a3..9e11380 100755 --- a/src/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs +++ b/src/Tizen.Maps/Tizen.Maps/PlaceEditorial.cs @@ -56,6 +56,7 @@ namespace Tizen.Maps /// /// Returns a string that represents this object. /// + /// Returns a string which presents this object. public override string ToString() { return $"{Description}"; diff --git a/src/Tizen.Maps/Tizen.Maps/PlaceRating.cs b/src/Tizen.Maps/Tizen.Maps/PlaceRating.cs index 617fcb5..99a8789 100755 --- a/src/Tizen.Maps/Tizen.Maps/PlaceRating.cs +++ b/src/Tizen.Maps/Tizen.Maps/PlaceRating.cs @@ -45,6 +45,7 @@ namespace Tizen.Maps /// /// Returns a string that represents this object. /// + /// Returns a string which presents this object. public override string ToString() { return $"{Average}({UserCount} reviews)"; diff --git a/src/Tizen.Maps/Tizen.Maps/Polyline.cs b/src/Tizen.Maps/Tizen.Maps/Polyline.cs index b1522b0..58f053d 100755 --- a/src/Tizen.Maps/Tizen.Maps/Polyline.cs +++ b/src/Tizen.Maps/Tizen.Maps/Polyline.cs @@ -54,6 +54,9 @@ namespace Tizen.Maps /// public event EventHandler Clicked; + /// + /// Gets or sets visibility for the polyline. + /// public override bool IsVisible { get { return handle.IsVisible; } -- 2.7.4