From f59e679a311ecaa3a0ac799d21dc42831dbaed03 Mon Sep 17 00:00:00 2001
From: "minho.sun" <minho.sun@samsung.com>
Date: Mon, 14 Aug 2017 20:09:48 +0900
Subject: [PATCH] [Tizen] Add OnPreCreate and change OnPause OnResume to
 virtual function

This reverts commit bae0ecab629951c0ff9a0e07c560db837385cf74.

Change-Id: I242985855a7351b5f9821ffd6c7240242aeafa50
---
 packaging/csapi-nui.spec                     |  1 -
 src/Tizen.NUI/Tizen.NUI.csproj               |  2 +-
 src/Tizen.NUI/src/internal/NUICoreBackend.cs | 10 +++++++---
 src/Tizen.NUI/src/public/NUIApplication.cs   | 17 ++++++++++++-----
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec
index 87a3cf6..72cb148 100755
--- a/packaging/csapi-nui.spec
+++ b/packaging/csapi-nui.spec
@@ -2,7 +2,6 @@ Name:       csapi-nui
 Summary:    dali-NUI
 Version:    0.2.51
 Release:    1
-Group:      Development/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
 URL:        https://www.tizen.org
 Source0:    %{name}-%{version}.tar.gz
diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 7eb6a00..eb039ad 100755
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" PrivateAssets="All" />
-    <PackageReference Include="Tizen.Applications.Common" Version="1.5.8" />
+    <PackageReference Include="Tizen.Applications.Common" Version="1.5.9" />
     <PackageReference Include="Tizen.System.SystemSettings" Version="1.0.4" PrivateAssets="All"/>
   </ItemGroup>
   <Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
diff --git a/src/Tizen.NUI/src/internal/NUICoreBackend.cs b/src/Tizen.NUI/src/internal/NUICoreBackend.cs
index 20dff95..efa71e0 100755
--- a/src/Tizen.NUI/src/internal/NUICoreBackend.cs
+++ b/src/Tizen.NUI/src/internal/NUICoreBackend.cs
@@ -179,9 +179,13 @@ namespace Tizen.NUI
         /// <param name="e">Event argument for Initialized</param>
         private void OnInitialized(object source, NUIApplicationInitEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnInitialized Called");
-            var handler = Handlers[EventType.Created] as Action;
-            handler?.Invoke();
+            Log.Debug("NUI", "NUICorebackend OnPreCreated Called");
+            var preCreateHandler = Handlers[EventType.PreCreated] as Action;
+            preCreateHandler?.Invoke();
+
+            Log.Debug("NUI", "NUICorebackend OnCreate Called");
+            var createHandler = Handlers[EventType.Created] as Action;
+            createHandler?.Invoke();
         }
 
         /// <summary>
diff --git a/src/Tizen.NUI/src/public/NUIApplication.cs b/src/Tizen.NUI/src/public/NUIApplication.cs
index 2221036..3f7823d 100755
--- a/src/Tizen.NUI/src/public/NUIApplication.cs
+++ b/src/Tizen.NUI/src/public/NUIApplication.cs
@@ -95,16 +95,22 @@ namespace Tizen.NUI
         /// <summary>
         /// Overrides this method if want to handle behavior.
         /// </summary>
-        protected void OnPause()
+        protected virtual void OnPause()
         {
         }
 
         /// <summary>
         /// Overrides this method if want to handle behavior.
         /// </summary>
-        protected void OnResume()
+        protected virtual void OnResume()
+        {
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected virtual void OnPreCreate()
         {
-            Log.Debug("NUI", "OnResume() is called!");
         }
 
         /// <summary>
@@ -150,15 +156,16 @@ namespace Tizen.NUI
             }
             argsClone[0] = string.Empty;
 
-            Backend.AddEventHandler(EventType.Resumed, OnResume);
+            Backend.AddEventHandler(EventType.PreCreated, OnPreCreate);
+            Backend.AddEventHandler(EventType.Created, OnCreate);
             Backend.AddEventHandler<AppControlReceivedEventArgs>(EventType.AppControlReceived, OnAppControlReceived);
+            Backend.AddEventHandler(EventType.Resumed, OnResume);
             Backend.AddEventHandler(EventType.Paused, OnPause);
             Backend.AddEventHandler(EventType.Terminated, OnTerminate);
             Backend.AddEventHandler<RegionFormatChangedEventArgs>(EventType.RegionFormatChanged, OnRegionFormatChanged);
             Backend.AddEventHandler<LowMemoryEventArgs>(EventType.LowMemory, OnLowMemory);
             Backend.AddEventHandler<LowBatteryEventArgs>(EventType.LowBattery, OnLowBattery);
             Backend.AddEventHandler<LocaleChangedEventArgs>(EventType.LocaleChanged, OnLocaleChanged);
-            Backend.AddEventHandler(EventType.Created, OnCreate);
 
             Backend.Run(argsClone);
         }
-- 
2.7.4