Use "Clicked" event

Remove deprecated API usage.

Change-Id: If3043e217f6843776cd0d1fab7e9a6b6aa71c8a6

diff --git a/Oobe/Oobe.Language/LanguageStep.cs b/Oobe/Oobe.Language/LanguageStep.cs
index b008b64..bbeccb9 100644 (file)
--- a/Oobe/Oobe.Language/LanguageStep.cs
+++ b/Oobe/Oobe.Language/LanguageStep.cs
@@ -62,7 +62,7 @@ namespace Oobe.Language
             int currentIndex = manager.Languages.FindIndex(x => x == manager.CurrentLanguage);
             carousel.SelectedItemIndex = currentIndex;
 
-            container.NextButton.ClickEvent += (obj, args) =>
+            container.NextButton.Clicked += (obj, args) =>
             {
                 if (carousel.SelectedItemIndex >= 0 && carousel.SelectedItemIndex < manager.Languages.Count)
                 {

diff --git a/Oobe/Oobe.Region/RegionStep.cs b/Oobe/Oobe.Region/RegionStep.cs
index 6cb11a7..31c1b63 100644 (file)
--- a/Oobe/Oobe.Region/RegionStep.cs
+++ b/Oobe/Oobe.Region/RegionStep.cs
@@ -54,7 +54,7 @@ namespace Oobe.Region
                 carousel.AddItem(item);
             }
 
-            container.NextButton.ClickEvent += (obj, args) => {
+            container.NextButton.Clicked += (obj, args) => {
                 if (carousel.SelectedItemIndex >= 0 && carousel.SelectedItemIndex < manager.Regions.Count)
                 {
                     var region = manager.Regions[carousel.SelectedItemIndex];
@@ -63,7 +63,7 @@ namespace Oobe.Region
                 nav.Next();
             };
 
-            container.PreviousButton.ClickEvent += (obj, args) => {
+            container.PreviousButton.Clicked += (obj, args) => {
                 nav.Previous();
             };
 

diff --git a/Oobe/Oobe.Terms/Views/TermsView.cs b/Oobe/Oobe.Terms/Views/TermsView.cs
index 4a692f0..c4727eb 100644 (file)
--- a/Oobe/Oobe.Terms/Views/TermsView.cs
+++ b/Oobe/Oobe.Terms/Views/TermsView.cs
@@ -106,13 +106,13 @@ namespace Oobe.Terms.Views
 
             NextButton.State = States.Disabled;
             NextButton.IsEnabled = false;
-            NextButton.ClickEvent += (obj, args) =>
+            NextButton.Clicked += (obj, args) =>
             {
                 terms.AcceptTerms();
                 nav.Next();
             };
 
-            PreviousButton.ClickEvent += (obj, args) =>
+            PreviousButton.Clicked += (obj, args) =>
             {
                 nav.Previous();
             };
@@ -125,7 +125,7 @@ namespace Oobe.Terms.Views
             agreeSwitch.Margin = new Extents(0, 0, 0, 2);
             agreeSwitch.IsSelected = false;
             agreeSwitch.IsEnabled = false;
-            agreeSwitch.ClickEvent += (obj, args) =>
+            agreeSwitch.Clicked += (obj, args) =>
             {
                 TermsToggle();
             };

diff --git a/Oobe/Oobe.Welcome/WelcomeStep.cs b/Oobe/Oobe.Welcome/WelcomeStep.cs
index 3028e97..528d772 100644 (file)
--- a/Oobe/Oobe.Welcome/WelcomeStep.cs
+++ b/Oobe/Oobe.Welcome/WelcomeStep.cs
@@ -41,7 +41,7 @@ namespace Oobe.Welcome
             content.Text = "There should be some description or information about Tizen IoT. There should be some description or information about Tizen IoT. There should be some description or information about Tizen IoT. There should be some description or information about Tizen IoT. There should be some description or information about Tizen IoT. There should be some description or information about Tizen IoT. There should be some description or information about Tizen IoT. There should be some description or information about Tizen IoT.";\r
 \r
             container.NextButton.TranslatableText = "GET_STARTED";\r
-            container.NextButton.ClickEvent += (obj, args) => {\r
+            container.NextButton.Clicked += (obj, args) => {\r
                 nav.Finish();\r
             };\r
 \r

diff --git a/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs b/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs
index 981b596..b4146fb 100644 (file)
--- a/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs
+++ b/Oobe/Oobe.Wifi/Controls/Wifi/AddNewNetworkPupup.cs
@@ -148,7 +148,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Size = new Size(32, 32),
                 Position = position,
             };
-            button.ClickEvent += (s, e) =>
+            button.Clicked += (s, e) =>
             {
                 this.passwordEntry.Revealed = !this.passwordEntry.Revealed;
                 button.IsSelected = !button.IsSelected;
@@ -185,7 +185,7 @@ namespace Oobe.Wifi.Controls.Wifi
             {
                 Size = new Size(240, 72)
             };
-            cancelButton.ClickEvent += (s, e) => OnDismiss?.Invoke();
+            cancelButton.Clicked += (s, e) => OnDismiss?.Invoke();
             this.Add(cancelButton);
 
             addButton = new Button(ButtonStyles.OK)
@@ -193,7 +193,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Size = new Size(240, 72),
                 TranslatableText = "WIFI_ADD"
             };
-            addButton.ClickEvent += async (s, e) =>
+            addButton.Clicked += async (s, e) =>
             {
                 Tizen.Log.Debug("oobe", $"Scanning for SSID = {ssidTextField.Text}");
                 IEnumerable<WiFiAP> aps = null;

diff --git a/Oobe/Oobe.Wifi/Controls/Wifi/ChangeSecurityTypePopup.cs b/Oobe/Oobe.Wifi/Controls/Wifi/ChangeSecurityTypePopup.cs
index 288abee..c9955d3 100644 (file)
--- a/Oobe/Oobe.Wifi/Controls/Wifi/ChangeSecurityTypePopup.cs
+++ b/Oobe/Oobe.Wifi/Controls/Wifi/ChangeSecurityTypePopup.cs
@@ -71,7 +71,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Position = new Position(80, 344),
                 Size = new Size(240, 72),
             };
-            cancelButton.ClickEvent += (s, e) =>
+            cancelButton.Clicked += (s, e) =>
             {
                 WifiUISecurityType = originalWifUISecurityType;
                 OnDismiss?.Invoke();
@@ -85,7 +85,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 TranslatableText = "WIFI_OK"
             };
 
-            addButton.ClickEvent += (s, e) =>
+            addButton.Clicked += (s, e) =>
             {
                 OnDismiss?.Invoke();
             };
@@ -115,7 +115,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 view.Button.IsSelected = true;
             }
             radioButtonGroup.Add(view.Button);
-            view.Button.ClickEvent += (s, e) => this.WifiUISecurityType = view.WifiUISecurityType;
+            view.Button.Clicked += (s, e) => this.WifiUISecurityType = view.WifiUISecurityType;
             return view;
         }
     }

diff --git a/Oobe/Oobe.Wifi/Controls/Wifi/WifiPasswordPopup.cs b/Oobe/Oobe.Wifi/Controls/Wifi/WifiPasswordPopup.cs
index 3d749ca..1724e08 100644 (file)
--- a/Oobe/Oobe.Wifi/Controls/Wifi/WifiPasswordPopup.cs
+++ b/Oobe/Oobe.Wifi/Controls/Wifi/WifiPasswordPopup.cs
@@ -106,7 +106,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Size = new Size(48, 48),
                 Position = new Position(720, 79),
             };
-            revealButton.ClickEvent += (s, e) => TogglePasswordVisibility();
+            revealButton.Clicked += (s, e) => TogglePasswordVisibility();
             this.Add(revealButton);
 
             cancelButton = new Button(ButtonStyles.Cancel)
@@ -114,7 +114,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Size = new Size(240, 72),
                 Position = new Position(80, 175)
             };
-            cancelButton.ClickEvent += (s, e) =>
+            cancelButton.Clicked += (s, e) =>
             {
                 OnDismiss.Invoke();
             };
@@ -126,7 +126,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Position = new Position(488, 175),
                 IsEnabled = false
             };
-            okButton.ClickEvent += async (s, e) =>
+            okButton.Clicked += async (s, e) =>
             {
                 isConnecting = true;
                 UpdateOKButton();

diff --git a/Oobe/Oobe.Wifi/Controls/Wifi/WifiView.cs b/Oobe/Oobe.Wifi/Controls/Wifi/WifiView.cs
index 3f497f1..a5974a6 100644 (file)
--- a/Oobe/Oobe.Wifi/Controls/Wifi/WifiView.cs
+++ b/Oobe/Oobe.Wifi/Controls/Wifi/WifiView.cs
@@ -82,7 +82,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Size = new Size(42, 42),
             };
 
-            addNewButton.ClickEvent += (s, e) => ShowAddNetworkPopup(); 
+            addNewButton.Clicked += (s, e) => ShowAddNetworkPopup(); 
             manualWifi.Add(addNewButton);
 
             manualWifi.Add(new TextLabel()
@@ -138,7 +138,7 @@ namespace Oobe.Wifi.Controls.Wifi
                 Size = new Size(72, 32),
                 Position = new Position(276, 39),
             };
-            scan.ClickEvent += async (s, e) =>
+            scan.Clicked += async (s, e) =>
             {
                 scan.IsEnabled = false;
                 ApManager.Views.Clear();
@@ -166,7 +166,7 @@ namespace Oobe.Wifi.Controls.Wifi
             State.OnTurnedOff += () => button.IsSelected = State.IsTurnedOn;
             State.OnTurnedOn += () => button.IsSelected = State.IsTurnedOn;
 
-            button.ClickEvent += async (s, e) =>
+            button.Clicked += async (s, e) =>
             {
                 button.IsEnabled = false;
                 await State.TurnWifi();

diff --git a/Oobe/Oobe.Wifi/WifiStep.cs b/Oobe/Oobe.Wifi/WifiStep.cs
index f7c477e..c5d1b89 100644 (file)
--- a/Oobe/Oobe.Wifi/WifiStep.cs
+++ b/Oobe/Oobe.Wifi/WifiStep.cs
@@ -46,8 +46,8 @@ namespace Oobe.Wifi
 
             view.Content = wifiView.View;
 
-            view.PreviousButton.ClickEvent += (s, e) => nav.Previous();
-            view.NextButton.ClickEvent += (s, e) => nav.Next();
+            view.PreviousButton.Clicked += (s, e) => nav.Previous();
+            view.NextButton.Clicked += (s, e) => nav.Next();
 
             void applyStyle(bool isConnected) => view.NextButton.ApplyStyle(isConnected
                 ? Common.Styles.ButtonStyles.Next