Adding OrientationChanged event in Tray/Apps

Change-Id: I2698b0df8ce12b7a6abc49b29b1962791fa518fa
Signed-off-by: Shivam Varshney/Core S/W Group /SRI-Delhi/Engineer/Samsung Electronics <shivam.v2@samsung.com>

diff --git a/Apps/Apps.cs b/Apps/Apps.cs
index 6cf1da3583d41b3ac1bf2d28b4bac4cbf1253e37..508452e518013b7cc28509661edd7840c0b93c7e 100755 (executable)
--- a/Apps/Apps.cs
+++ b/Apps/Apps.cs
@@ -27,7 +27,6 @@ namespace Apps
         private const int TrayApplicationHeight = 361;
         private ViewManager viewManager;
         private Window window;
-        private Window.WindowOrientation orientation;
 
         public Program() : base(new Size2D(960, 540), new Position2D(480, 170), ThemeOptions.PlatformThemeEnabled, new CustomBorder())
         {
@@ -49,16 +48,25 @@ namespace Apps
             };
 
             window.SetAvailableOrientations(list);
-            orientation = window.GetCurrentOrientation();
             UpdateWindowSize();
             UpdateWindowPosition();
             window.BackgroundColor = Color.Transparent;
             window.KeyEvent += OnKeyEvent;
             window.Resized += OnWindowResized;
+            window.OrientationChanged += OnWindowOrientationChanged;
             viewManager = new ViewManager(window);
             Tizen.Log.Info(Resources.LogTag, "Show Window");
         }
 
+        private void OnWindowOrientationChanged(object sender, WindowOrientationChangedEventArgs e)
+        {
+            Tizen.Log.Debug(Resources.LogTag, "orientation changed" + e.WindowOrientation);
+            DeviceInfo.UpdateDeviceInfo();
+            UpdateWindowSize();
+            UpdateWindowPosition();
+            viewManager.UpdateAppView();
+        }
+
         protected override void OnTerminate()
         {
             Tizen.Log.Info(Resources.LogTag, "On App Terminate");
@@ -116,16 +124,7 @@ namespace Apps
 
         private void OnWindowResized(object sender, Window.ResizedEventArgs e)
         {
-            Window.WindowOrientation newOrientation = window.GetCurrentOrientation();
             Tizen.Log.Debug(Resources.LogTag, "Resized Event");
-            if (orientation != newOrientation)
-            {
-                Tizen.Log.Debug(Resources.LogTag, "orientation changed");
-                DeviceInfo.UpdateDeviceInfo();
-                orientation = newOrientation;
-                UpdateWindowSize();
-                UpdateWindowPosition();
-            }
             viewManager.UpdateAppView();
         }
 

diff --git a/Apps/Apps.csproj b/Apps/Apps.csproj
index 2f87b5244f8a8667162dcaaa7582f0b863115da9..12c2d0d3d47c724ea03ddfbe02d5e3a191ba2f0c 100755 (executable)
--- a/Apps/Apps.csproj
+++ b/Apps/Apps.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen10.0</TargetFramework>
+    <TargetFramework>tizen11.0</TargetFramework>
       <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
     <AssemblyName>Apps</AssemblyName>
   </PropertyGroup>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="10.0.0.17504" />
+    <PackageReference Include="Tizen.NET" Version="11.0.0.17643" />
     <PackageReference Include="Tizen.NET.Sdk" Version="1.1.9" />
   </ItemGroup>
 

diff --git a/TrayApplication/TrayApplication.cs b/TrayApplication/TrayApplication.cs
index bfbdfa16ff331ce84703f6bf7665accf21162bd3..cb5adc8f9e5333b81d0e789611427137c16a24e3 100755 (executable)
--- a/TrayApplication/TrayApplication.cs
+++ b/TrayApplication/TrayApplication.cs
@@ -42,7 +42,6 @@ namespace TrayApplication
         private MainView mainView;
         private TizenShell tizenShell;
         private SoftkeyService softkeyService;
-        private Window.WindowOrientation windowOrientation;
 
         private float touchStartPosition;
         private bool touchStarted = false;
@@ -62,8 +61,6 @@ namespace TrayApplication
                 Window.WindowOrientation.PortraitInverse
             };
             window.SetAvailableOrientations(list);
-            windowOrientation = window.GetCurrentOrientation();
-            Tizen.Log.Info(Resources.LogTag, "Orientation: " + windowOrientation);
 
             UpdateWindowDimensions();
             window.BackgroundColor = Color.Transparent;
@@ -75,7 +72,7 @@ namespace TrayApplication
 
             window.KeyEvent += OnKeyEvent;
             window.TouchEvent += OnTouch;
-            window.Resized += OnWindowResized;
+            window.OrientationChanged += OnWindowOrientationChanged;
             AppScoreDataBase.InitializeDataBase();
 
             mainView = new MainView();
@@ -87,6 +84,13 @@ namespace TrayApplication
             Tizen.Log.Info(Resources.LogTag, "Tray Application Created");
         }
 
+        private void OnWindowOrientationChanged(object sender, WindowOrientationChangedEventArgs e)
+        {
+            DeviceInfo.UpdateDeviceInfo();
+            UpdateWindowDimensions();
+            mainView.UpdateView();
+        }
+
         protected override void OnTerminate()
         {
             Tizen.Log.Info(Resources.LogTag, "Program OnTerminate");
@@ -110,19 +114,6 @@ namespace TrayApplication
             mainView?.HideView();
         }
 
-        private void OnWindowResized(object sender, Window.ResizedEventArgs e)
-        {
-            Tizen.Log.Info(Resources.LogTag, "Tray Resized");
-            Window.WindowOrientation currentWindowOrientation = window.GetCurrentOrientation();
-            if (windowOrientation != currentWindowOrientation)
-            {
-                DeviceInfo.UpdateDeviceInfo();
-                windowOrientation = currentWindowOrientation;
-                UpdateWindowDimensions();
-                mainView.UpdateView();
-            }
-        }
-
         private void MainViewRemovedFromWindow(object sender, EventArgs e)
         {
             Tizen.Log.Info(Resources.LogTag, "Main View Removed");

diff --git a/TrayApplication/TrayApplication.csproj b/TrayApplication/TrayApplication.csproj
index 009d32afb466ff03cc3fdf14a4a5f1b6659120c6..2bca34b443e522dc35fd8d95472103707146500c 100755 (executable)
--- a/TrayApplication/TrayApplication.csproj
+++ b/TrayApplication/TrayApplication.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Tizen.NET.Sdk/1.1.8">
+<Project Sdk="Tizen.NET.Sdk/1.1.9">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen10.0</TargetFramework>
+    <TargetFramework>tizen11.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
   </PropertyGroup>
@@ -19,12 +19,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.9">\r
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.2">\r
       <TreatAsUsed>true</TreatAsUsed>\r
     </PackageReference>
-    <PackageReference Include="SQLitePCLRaw.bundle_sqlite3" Version="2.1.2">\r
+    <PackageReference Include="SQLitePCLRaw.bundle_sqlite3" Version="2.1.4">\r
       <TreatAsUsed>true</TreatAsUsed>\r
     </PackageReference>
+    <PackageReference Include="Tizen.NET" Version="11.0.0.17643">
+      <TreatAsUsed>true</TreatAsUsed>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/packaging/org.tizen.Apps-1.0.0.tpk b/packaging/org.tizen.Apps-1.0.0.tpk
index 11f9a1a4a1119ee7e43ae31dd350c56c9c3e4ed3..d3480a56321f7e488b7ff1cbf0a6a6c9a48f6c89 100755 (executable)
Binary files a/packaging/org.tizen.Apps-1.0.0.tpk and b/packaging/org.tizen.Apps-1.0.0.tpk differ

diff --git a/packaging/org.tizen.TrayApplication-1.0.0.tpk b/packaging/org.tizen.TrayApplication-1.0.0.tpk
index b3b68c97d9b40155335b8c4535f6f909d1fff8b4..02152a7fc6e0eb80905b808f2fa030a42a6887b3 100755 (executable)
Binary files a/packaging/org.tizen.TrayApplication-1.0.0.tpk and b/packaging/org.tizen.TrayApplication-1.0.0.tpk differ