Changing SoftkeyService to TaskbarService

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

diff --git a/TaskBar/TaskBar.cs b/TaskBar/TaskBar.cs
index 0806472..b8f3083 100644 (file)
--- a/TaskBar/TaskBar.cs
+++ b/TaskBar/TaskBar.cs
@@ -15,19 +15,13 @@ namespace TaskBar
 
         private const int WindowHeight = 64;
         private bool isTaskBarVisible = true;
-        private enum TaskBarPosition
-        {
-            Bottom = 0,
-            Left = 1,
-            Top = 2,
-            Right = 3,
-        };
-        private TaskBarPosition taskBarPosition;
+
+        private TaskbarService.PlaceType taskBarPosition;
 
         private static Window window;
         private MainView mainView;
         private TizenShell tizenShell;
-        private SoftkeyService softkeyService;
+        private TaskbarService taskbarService;
 
         protected override void OnCreate()
         {
@@ -44,11 +38,13 @@ namespace TaskBar
             window.SetAvailableOrientations(list);
 
             UpdateWindowDimensions();
-            window.BackgroundColor = Color.Transparent;
             window.SetTransparency(true);
+            window.BackgroundColor = Color.Transparent;
+
             tizenShell = new TizenShell();
-            softkeyService = new SoftkeyService(tizenShell, window);
-            softkeyService.Show();
+            taskBarPosition = TaskbarService.PlaceType.Bottom;
+            taskbarService = new TaskbarService(tizenShell, window, taskBarPosition);
+            taskbarService.SetSize((uint)window.Size.Width, (uint)window.Size.Height);
 
             PinnedAppsDataBase.Instance.InitializeDataBase();
 
@@ -82,7 +78,7 @@ namespace TaskBar
             mainView = null;
             Resources.DisposeMoreMenuWindow();
 
-            softkeyService?.Dispose();
+            taskbarService?.Dispose();
             tizenShell?.Dispose();
             if (window != null)
             {

diff --git a/TaskBar/TaskBar.csproj b/TaskBar/TaskBar.csproj
index 671604d..e527f09 100644 (file)
--- a/TaskBar/TaskBar.csproj
+++ b/TaskBar/TaskBar.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Tizen.NET.Sdk/1.1.9">
+<Project Sdk="Tizen.NET.Sdk/1.2.0">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -19,13 +19,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.2">
+    <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.9">
       <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>
-    <PackageReference Include="SQLitePCLRaw.bundle_sqlite3" Version="2.1.4">
+    <PackageReference Include="SQLitePCLRaw.bundle_sqlite3" Version="2.1.5">
       <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>
-    <PackageReference Include="Tizen.NET" Version="11.0.0.17895">
+    <PackageReference Include="Tizen.NET" Version="11.0.0.17918">
       <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>
   </ItemGroup>

diff --git a/TaskBar/TaskBar.sln b/TaskBar/TaskBar.sln
index a8ec294..8f7ac73 100644 (file)
--- a/TaskBar/TaskBar.sln
+++ b/TaskBar/TaskBar.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32228.343
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskBar", "TaskBar.csproj", "{38F7CA9C-59BD-4632-ADA5-026D17E7BAEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskBar", "TaskBar.csproj", "{38F7CA9C-59BD-4632-ADA5-026D17E7BAEE}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/packaging/org.tizen.taskbar-1.0.0.tpk b/packaging/org.tizen.taskbar-1.0.0.tpk
index 4bb23dc..87315bf 100644 (file)
Binary files a/packaging/org.tizen.taskbar-1.0.0.tpk and b/packaging/org.tizen.taskbar-1.0.0.tpk differ