refactor: require ProcessStep to return BasePage

Change-Id: I7ccee0441c2a5bee1b203ce82a9d8f2e4138a194

diff --git a/Oobe/Oobe.Common/Interfaces/ProcessStep.cs b/Oobe/Oobe.Common/Interfaces/ProcessStep.cs
index e961bdd..606d4f1 100644 (file)
--- a/Oobe/Oobe.Common/Interfaces/ProcessStep.cs
+++ b/Oobe/Oobe.Common/Interfaces/ProcessStep.cs
@@ -16,6 +16,7 @@
 
 using System;
 using Oobe.Common.Interfaces;
+using Oobe.Common.Pages;
 using Tizen.NUI.BaseComponents;
 
 namespace Oobe.Common.Interfaces
@@ -65,7 +66,7 @@ namespace Oobe.Common.Interfaces
         {
         }
 
-        public virtual View CreateView(IProcessNavigation nav)
+        public virtual BasePage CreateView(IProcessNavigation nav)
         {
             return null;
         }

diff --git a/Oobe/Oobe.Language/LanguageStep.cs b/Oobe/Oobe.Language/LanguageStep.cs
index f2c9795..cd00a9c 100644 (file)
--- a/Oobe/Oobe.Language/LanguageStep.cs
+++ b/Oobe/Oobe.Language/LanguageStep.cs
@@ -44,7 +44,7 @@ namespace Oobe.Language
             manager = new LanguageManger();
         }
 
-        public override View CreateView(IProcessNavigation nav)
+        public override BasePage CreateView(IProcessNavigation nav)
         {
             var container = new TwoButtonsPage();
 
@@ -56,6 +56,7 @@ namespace Oobe.Language
             foreach (LanguageInfo info in manager.Languages)
             {
                 CarouselPickerItemData item = new CarouselPickerItemData();
+
                 item.Text = info.LocalName;
                 carousel.AddItem(item);
             }

diff --git a/Oobe/Oobe.Region/RegionStep.cs b/Oobe/Oobe.Region/RegionStep.cs
index 3bb1b19..f619532 100644 (file)
--- a/Oobe/Oobe.Region/RegionStep.cs
+++ b/Oobe/Oobe.Region/RegionStep.cs
@@ -39,7 +39,7 @@ namespace Oobe.Region
             manager = new RegionManager();
         }
 
-        public override View CreateView(IProcessNavigation nav)
+        public override BasePage CreateView(IProcessNavigation nav)
         {
             var container = new TwoButtonsPage();
 

diff --git a/Oobe/Oobe.Terms/TermsStep.cs b/Oobe/Oobe.Terms/TermsStep.cs
index 13d108e..061453e 100644 (file)
--- a/Oobe/Oobe.Terms/TermsStep.cs
+++ b/Oobe/Oobe.Terms/TermsStep.cs
@@ -15,6 +15,7 @@
  */
 
 using Oobe.Common.Interfaces;\r
+using Oobe.Common.Pages;\r
 using Oobe.Terms.Model;\r
 using Oobe.Terms.Views;\r
 using Tizen.NUI.BaseComponents;\r
@@ -30,7 +31,7 @@ namespace Oobe.Terms
             provider = new TermsProvider();\r
         }\r
 \r
-        public override View CreateView(IProcessNavigation nav)\r
+        public override BasePage CreateView(IProcessNavigation nav)\r
         {\r
             return new TermsView(nav, provider);
         }\r

diff --git a/Oobe/Oobe.Welcome/WelcomeStep.cs b/Oobe/Oobe.Welcome/WelcomeStep.cs
index d86c9db..9a71602 100644 (file)
--- a/Oobe/Oobe.Welcome/WelcomeStep.cs
+++ b/Oobe/Oobe.Welcome/WelcomeStep.cs
@@ -25,7 +25,7 @@ namespace Oobe.Welcome
 {\r
     public class WelcomeStep : ProcessStep\r
     {\r
-        public override View CreateView(IProcessNavigation nav)\r
+        public override BasePage CreateView(IProcessNavigation nav)\r
         {\r
             var container = new OneButtonPage();\r
 \r

diff --git a/Oobe/Oobe.Wifi/WifiStep.cs b/Oobe/Oobe.Wifi/WifiStep.cs
index 22ceee0..9a187ff 100644 (file)
--- a/Oobe/Oobe.Wifi/WifiStep.cs
+++ b/Oobe/Oobe.Wifi/WifiStep.cs
@@ -32,7 +32,7 @@ namespace Oobe.Wifi
         private WifiView wifiView = null;
         private EventHandler<ConnectionStateChangedEventArgs> connectionChanged;
 
-        public override View CreateView(IProcessNavigation nav)
+        public override BasePage CreateView(IProcessNavigation nav)
         {
             DisposeView();