From: Eunyoung Lee <ey928.lee@samsung.com>
Date: Sat, 1 Oct 2022 06:39:07 +0000 (+0900)
Subject: Modifying back button to simplify the structure
X-Git-Tag: accepted/tizen/unified/20221005.023211~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=642b9bb2801abe25e200e040236b45d6775a3eba;p=profile%2Fiot%2Fapps%2Fdotnet%2Ftray.git

Modifying back button to simplify the structure

Change-Id: I6a0118776ac867c489c13325dbcb5899e19ea31d
---

diff --git a/TrayApplication/Common/InputGeneratorBase.cs b/TrayApplication/Common/InputGeneratorBase.cs
index 3c644da..77e9e87 100644
--- a/TrayApplication/Common/InputGeneratorBase.cs
+++ b/TrayApplication/Common/InputGeneratorBase.cs
@@ -18,6 +18,7 @@ namespace TrayApplication.Common
 
         public static void OnKeyEvent()
         {
+            Tizen.Log.Debug(Resources.LogTag, "KeyEvent Called : " + KeyName);
             inputGenerator.GenerateKeyEvent(KeyName, 1);
             inputGenerator.GenerateKeyEvent(KeyName, 0);
         }
diff --git a/TrayApplication/Models/AppInfoModel.cs b/TrayApplication/Models/AppInfoModel.cs
index 6a80c9e..b16a870 100644
--- a/TrayApplication/Models/AppInfoModel.cs
+++ b/TrayApplication/Models/AppInfoModel.cs
@@ -15,7 +15,12 @@ namespace TrayApplication.Models
             Name = name;
             ApplicationId = applicationId;
             IconUrl = url;
-            AppSelectCommand = new Command(OnAppSelect);
+            AppSelectCommand = new Command(OnAppSelect);
+
+            if (Name == "back")
+            {
+                InputGeneratorBase.InitInputGenerator();
+            }
         }
 
         public AppInfoModel(string name, string url)
@@ -50,8 +55,15 @@ namespace TrayApplication.Models
         }
 
         private void OnAppSelect(object selectedItem)
-        {
-            AppLauncher.LaunchApplication(ApplicationId);
+        {
+            if (Name == "back")
+            {
+                InputGeneratorBase.OnKeyEvent();
+            }
+            else
+            {
+                AppLauncher.LaunchApplication(ApplicationId);
+            }
         }
 
         private void SetDefaultBackground()
diff --git a/TrayApplication/ViewModels/QuickAccessViewModel.cs b/TrayApplication/ViewModels/QuickAccessViewModel.cs
index 140252b..100ac0b 100644
--- a/TrayApplication/ViewModels/QuickAccessViewModel.cs
+++ b/TrayApplication/ViewModels/QuickAccessViewModel.cs
@@ -35,7 +35,7 @@ namespace TrayApplication.ViewModels
                 new AppInfoModel(AppNames[0], "org.tizen.homescreen-efl", imagePath + AppNames[0] + ".png"),
                 new AppInfoModel(AppNames[1], "org.tizen.setting", imagePath + AppNames[1] + ".png"),
                 new AppInfoModel(AppNames[2], "org.tizen.volume", imagePath + AppNames[2] + ".png"),
-                new AppInfoModel(AppNames[3], imagePath + AppNames[3] + ".png"),
+                new AppInfoModel(AppNames[3], string.Empty, imagePath + AppNames[3] + ".png"),
                 //new AppInfoModel(AppNames[3], "org.tizen.quickpanel", imagePath + AppNames[3] + ".png"), //Will be added Later
                 //new AppInfoModel(AppNames[5], "org.tizen.powerkey-syspopup", imagePath + AppNames[5] + ".png") //Will be added Later
             };
diff --git a/TrayApplication/Views/QuickAccessView.cs b/TrayApplication/Views/QuickAccessView.cs
index 3b53756..8065101 100644
--- a/TrayApplication/Views/QuickAccessView.cs
+++ b/TrayApplication/Views/QuickAccessView.cs
@@ -10,8 +10,6 @@ namespace TrayApplication.Views
 {
     public class QuickAccessView : View
     {
-        private readonly List<string> AppNames = new List<string>() { "home", "settings", "volume", "back", "notifications", "gallery", "power" };
-
         private const int QuickAccessViewHeight = 124;
         private const int IconSize = 76;
         private List<Button> defaultButtons;
@@ -96,16 +94,6 @@ namespace TrayApplication.Views
                 button.Icon.SetBinding(ImageView.ResourceUrlProperty, "IconUrl");
                 button.SetBinding(Control.CommandProperty, "AppSelectCommand");
 
-                button.Name = AppNames[i++];
-                if (button.Name == "back")
-                {
-                    InputGeneratorBase.InitInputGenerator();
-                    button.Clicked += (object sender, ClickedEventArgs e) =>
-                    {
-                        Tizen.Log.Debug(Resources.LogTag, "Back button clicked");
-                        InputGeneratorBase.OnKeyEvent();
-                    };
-                }
                 Tizen.Log.Info(Resources.LogTag, "Buttons Added");
             }
         }
diff --git a/packaging/org.tizen.TrayApplication-1.0.0.tpk b/packaging/org.tizen.TrayApplication-1.0.0.tpk
old mode 100755
new mode 100644
index 9effc77..05716b6
Binary files a/packaging/org.tizen.TrayApplication-1.0.0.tpk and b/packaging/org.tizen.TrayApplication-1.0.0.tpk differ