From b30933e40f773aa4e8a8967587c93c36f46b726a Mon Sep 17 00:00:00 2001
From: dongsug-song <35130733+dongsug-song@users.noreply.github.com>
Date: Mon, 30 Sep 2019 17:20:15 +0900
Subject: [PATCH] [NUI] TCSACR-226 code change (#1032)
---
.../src/internal/KeyboardTypeSignalType.cs | 32 +++++++++++++++++++++-
src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs | 8 +++++-
src/Tizen.NUI/src/internal/WidgetViewSignal.cs | 30 ++++++++++++++++++++
src/Tizen.NUI/src/public/Animation.cs | 2 ++
.../src/public/BaseComponents/FlexContainer.cs | 5 +++-
src/Tizen.NUI/src/public/BaseComponents/View.cs | 3 +-
src/Tizen.NUI/src/public/PropertyBuffer.cs | 10 +++++--
src/Tizen.NUI/src/public/PropertyNotification.cs | 12 +++++++-
src/Tizen.NUI/src/public/PropertyNotifySignal.cs | 28 +++++++++++++++++--
.../src/public/UIComponents/ScrollView.cs | 4 +++
10 files changed, 125 insertions(+), 9 deletions(-)
diff --git a/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs b/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs
index e73d757..c66ebd1 100755
--- a/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs
+++ b/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs
@@ -1,5 +1,5 @@
/*
- * Copyright(c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2019 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
* limitations under the License.
*
*/
+
+using System;
using System.ComponentModel;
namespace Tizen.NUI
@@ -22,13 +24,20 @@ namespace Tizen.NUI
/// KeyboardTypeSignalType
///
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public class KeyboardTypeSignalType : Disposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
///
/// swigCMemOwn
///
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected bool swigCMemOwn;
internal KeyboardTypeSignalType(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -46,6 +55,9 @@ namespace Tizen.NUI
/// Dispose
///
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected override void Dispose(DisposeTypes type)
{
if (disposed)
@@ -75,6 +87,9 @@ namespace Tizen.NUI
///
/// True if there are any slots connected to the signal
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public bool Empty()
{
bool ret = Interop.KeyboardTypeSignalType.KeyboardTypeSignalType_Empty(swigCPtr);
@@ -87,6 +102,9 @@ namespace Tizen.NUI
///
/// The number of slots connected to this signal
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public uint GetConnectionCount()
{
uint ret = Interop.KeyboardTypeSignalType.KeyboardTypeSignalType_GetConnectionCount(swigCPtr);
@@ -99,6 +117,9 @@ namespace Tizen.NUI
///
/// The function to connect
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Connect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -113,6 +134,9 @@ namespace Tizen.NUI
///
/// The function to disconnect
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Disconnect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -127,6 +151,9 @@ namespace Tizen.NUI
///
/// The member function to connect
/// 5
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Emit(InputMethodContext.KeyboardType arg)
{
Interop.KeyboardTypeSignalType.KeyboardTypeSignalType_Emit(swigCPtr, (int)arg);
@@ -137,6 +164,9 @@ namespace Tizen.NUI
/// The contructor.
///
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use InputMethodContext.KeyboardTypeChanged event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public KeyboardTypeSignalType() : this(Interop.KeyboardTypeSignalType.new_KeyboardTypeSignalType(), true)
{
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs
index 3ddbb24..49d8fb6 100755
--- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs
+++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs
@@ -1,5 +1,5 @@
/*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2019 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
* limitations under the License.
*
*/
+
+using System;
using System.ComponentModel;
namespace Tizen.NUI
@@ -22,6 +24,10 @@ namespace Tizen.NUI
/// This should be internal, please do not use.
///
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please do not use!" +
+ "IntPtr(native integer pointer) is supposed to be not used in Application!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public class SWIGTYPE_p_bundle
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
diff --git a/src/Tizen.NUI/src/internal/WidgetViewSignal.cs b/src/Tizen.NUI/src/internal/WidgetViewSignal.cs
index d016f2b..a114dc9 100755
--- a/src/Tizen.NUI/src/internal/WidgetViewSignal.cs
+++ b/src/Tizen.NUI/src/internal/WidgetViewSignal.cs
@@ -7,6 +7,8 @@
// Do not make changes to this file unless you know what you are doing--modify
// the SWIG interface file instead.
//------------------------------------------------------------------------------
+
+using System;
using System.ComponentModel;
namespace Tizen.NUI
@@ -15,13 +17,20 @@ namespace Tizen.NUI
/// WidgetViewSignal
///
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public class WidgetViewSignal : Disposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
///
/// swigCMemOwn
///
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected bool swigCMemOwn;
internal WidgetViewSignal(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -39,6 +48,9 @@ namespace Tizen.NUI
/// Dispose
///
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected override void Dispose(DisposeTypes type)
{
if (disposed)
@@ -64,6 +76,9 @@ namespace Tizen.NUI
///
/// True if there are any slots connected to the signal
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public bool Empty()
{
bool ret = Interop.WidgetView.WidgetViewSignal_Empty(swigCPtr);
@@ -76,6 +91,9 @@ namespace Tizen.NUI
///
/// The number of slots connected to this signal
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public uint GetConnectionCount()
{
uint ret = Interop.WidgetView.WidgetViewSignal_GetConnectionCount(swigCPtr);
@@ -88,6 +106,9 @@ namespace Tizen.NUI
///
/// The function to connect
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Connect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -102,6 +123,9 @@ namespace Tizen.NUI
///
/// The function to disconnect
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Disconnect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -116,6 +140,9 @@ namespace Tizen.NUI
///
/// The member function to connect
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Emit(WidgetView arg)
{
Interop.WidgetView.WidgetViewSignal_Emit(swigCPtr, WidgetView.getCPtr(arg));
@@ -126,6 +153,9 @@ namespace Tizen.NUI
/// The contructor.
///
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public WidgetViewSignal() : this(Interop.WidgetView.new_WidgetViewSignal(), true)
{
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs
index 6fcec31..d1e6992 100755
--- a/src/Tizen.NUI/src/public/Animation.cs
+++ b/src/Tizen.NUI/src/public/Animation.cs
@@ -509,6 +509,8 @@ namespace Tizen.NUI
/// Handle to an object.
/// Handle to an animation object or an uninitialized handle.
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, Please use as keyword instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public static Animation DownCast(BaseHandle handle)
{
Animation ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as Animation;
diff --git a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs b/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs
index 101dc79..0522d85 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs
@@ -428,6 +428,9 @@ namespace Tizen.NUI.BaseComponents
/// Enumeration for the instance of child properties belonging to the FlexContainer class.
///
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use View.Flex, View.AlignSelf, View.FlexMargin instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public class ChildProperty
{
internal static readonly int FLEX = Interop.FlexContainer.FlexContainer_ChildProperty_FLEX_get();
@@ -445,4 +448,4 @@ namespace Tizen.NUI.BaseComponents
internal static readonly int ALIGN_CONTENT = Interop.FlexContainer.FlexContainer_Property_ALIGN_CONTENT_get();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index c8b64dc..9c68405 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -240,7 +240,8 @@ namespace Tizen.NUI.BaseComponents
return temp;
});
- /// Only for XAML property binding. This will be changed as Inhouse API by ACR later.
+ /// Only for XAML property binding. No need to open as public. (keep as Hidden/InhouseAPI)
+ [EditorBrowsable(EditorBrowsableState.Never)]
public static readonly BindableProperty FlexProperty = BindableProperty.Create("Flex", typeof(float), typeof(View), default(float), propertyChanged: (bindable, oldValue, newValue) =>
{
var view = (View)bindable;
diff --git a/src/Tizen.NUI/src/public/PropertyBuffer.cs b/src/Tizen.NUI/src/public/PropertyBuffer.cs
index 2ceb1c3..09a161c 100755
--- a/src/Tizen.NUI/src/public/PropertyBuffer.cs
+++ b/src/Tizen.NUI/src/public/PropertyBuffer.cs
@@ -1,5 +1,5 @@
/*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2019 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
* limitations under the License.
*
*/
+
+using System;
using System.ComponentModel;
namespace Tizen.NUI
@@ -52,6 +54,10 @@ namespace Tizen.NUI
/// A pointer to the data that will be copied to the buffer.
/// Number of elements to expand or contract the buffer.
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyBuffer(PropertyMap bufferFormat) constructor instead!" +
+ "IntPtr(native integer pointer) is supposed to be not used in Application!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void SetData(System.IntPtr data, uint size)
{
Interop.PropertyBuffer.PropertyBuffer_SetData(swigCPtr, data, size);
@@ -103,4 +109,4 @@ namespace Tizen.NUI
base.Dispose(type);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Tizen.NUI/src/public/PropertyNotification.cs b/src/Tizen.NUI/src/public/PropertyNotification.cs
index 1f8113c..0a24b2b 100755
--- a/src/Tizen.NUI/src/public/PropertyNotification.cs
+++ b/src/Tizen.NUI/src/public/PropertyNotification.cs
@@ -132,6 +132,10 @@ namespace Tizen.NUI
/// An object of IntPtr type.
/// An object of the PropertyNotification type.
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use Notified event instead!" +
+ "IntPtr(native integer pointer) is supposed to be not used in Application!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public static PropertyNotification GetPropertyNotificationFromPtr(global::System.IntPtr cPtr)
{
PropertyNotification ret = new PropertyNotification(cPtr, false);
@@ -158,6 +162,9 @@ namespace Tizen.NUI
/// A reference to the copied handle.
/// A reference to this.
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification() constructor instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public PropertyNotification Assign(PropertyNotification rhs)
{
PropertyNotification ret = new PropertyNotification(Interop.PropertyNotification.PropertyNotification_Assign(swigCPtr, PropertyNotification.getCPtr(rhs)), false);
@@ -240,6 +247,9 @@ namespace Tizen.NUI
///
/// A signal object to Connect() with
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public PropertyNotifySignal NotifySignal()
{
PropertyNotifySignal ret = new PropertyNotifySignal(Interop.PropertyNotification.PropertyNotification_NotifySignal(swigCPtr), false);
@@ -318,4 +328,4 @@ namespace Tizen.NUI
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Tizen.NUI/src/public/PropertyNotifySignal.cs b/src/Tizen.NUI/src/public/PropertyNotifySignal.cs
index 65f9306..195e3c3 100755
--- a/src/Tizen.NUI/src/public/PropertyNotifySignal.cs
+++ b/src/Tizen.NUI/src/public/PropertyNotifySignal.cs
@@ -1,5 +1,5 @@
/*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2019 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
* limitations under the License.
*
*/
+
+using System;
using System.ComponentModel;
namespace Tizen.NUI
@@ -22,6 +24,9 @@ namespace Tizen.NUI
/// Signal connection class for PropertyNotification
///
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification.Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public class PropertyNotifySignal : Disposable
{
///
@@ -36,6 +41,9 @@ namespace Tizen.NUI
/// The constructor.
///
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification.Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public PropertyNotifySignal() : this(Interop.PropertyNotifySignal.new_PropertyNotifySignal(), true)
{
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -52,6 +60,9 @@ namespace Tizen.NUI
///
/// True if there are any slots connected to the signal.
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification.Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public bool Empty()
{
bool ret = Interop.PropertyNotifySignal.PropertyNotifySignal_Empty(swigCPtr);
@@ -64,6 +75,9 @@ namespace Tizen.NUI
///
/// The number of slots connected to this signal
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification.Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public uint GetConnectionCount()
{
uint ret = Interop.PropertyNotifySignal.PropertyNotifySignal_GetConnectionCount(swigCPtr);
@@ -76,6 +90,9 @@ namespace Tizen.NUI
///
/// The function to connect
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification.Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Connect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -90,6 +107,9 @@ namespace Tizen.NUI
///
/// The function to disconnect.
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification.Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Disconnect(System.Delegate func)
{
System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
@@ -104,6 +124,9 @@ namespace Tizen.NUI
///
/// The first value to pass to callbacks.
/// 4
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use PropertyNotification.Notified event instead!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public void Emit(PropertyNotification arg)
{
Interop.PropertyNotifySignal.PropertyNotifySignal_Emit(swigCPtr, PropertyNotification.getCPtr(arg));
@@ -120,6 +143,7 @@ namespace Tizen.NUI
///
/// The dispose type.
/// 4
+ [EditorBrowsable(EditorBrowsableState.Never)]
protected override void Dispose(DisposeTypes type)
{
if (disposed)
@@ -144,4 +168,4 @@ namespace Tizen.NUI
base.Dispose(type);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs
index c5e9f82..4a72dc5 100755
--- a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs
@@ -1707,6 +1707,10 @@ namespace Tizen.NUI
/// Get SnapEvent From Ptr
///
/// 3
+ [Obsolete("Deprecated in API6, Will be removed in API9, " +
+ "Please use SnapStarted event instead!" +
+ "IntPtr(native integer pointer) is supposed to be not used in Application!")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
public static SnapEvent GetSnapEventFromPtr(global::System.IntPtr cPtr)
{
SnapEvent ret = new SnapEvent(cPtr, false);
--
2.7.4