refactor: change page naming convention

Currently all pages had "Layout" suffix in their names. To avoid
confusion with NUI layout concept change suffix to "Page"

Change-Id: I4abdcd88c1dbcc0477a0ac6bc2ab817a3a2d5562

diff --git a/Oobe/Oobe.Common/Layouts/BasePageLayout.cs b/Oobe/Oobe.Common/Pages/BasePage.cs
similarity index 96%
rename from Oobe/Oobe.Common/Layouts/BasePageLayout.cs
rename to Oobe/Oobe.Common/Pages/BasePage.cs
index a93d8f5..332339e 100644 (file)
--- a/Oobe/Oobe.Common/Layouts/BasePageLayout.cs
+++ b/Oobe/Oobe.Common/Pages/BasePage.cs
@@ -19,12 +19,12 @@ using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Components;
 
-namespace Oobe.Common.Layouts
+namespace Oobe.Common.Pages
 {
     /// <summary>
     /// Basic OOBE Layout
     /// </summary>
-    public class BasePageLayout : View
+    public class BasePage : View
     {
         private View content;
         private View dimView;
@@ -32,7 +32,7 @@ namespace Oobe.Common.Layouts
         /// <summary>
         /// Constructs new BasePageLayout object
         /// </summary>
-        public BasePageLayout()
+        public BasePage()
             : base()
         {
             dimView = new View()

diff --git a/Oobe/Oobe.Common/Layouts/OneButtonLayout.cs b/Oobe/Oobe.Common/Pages/OneButtonPage.cs
similarity index 92%
rename from Oobe/Oobe.Common/Layouts/OneButtonLayout.cs
rename to Oobe/Oobe.Common/Pages/OneButtonPage.cs
index ad866be..822f788 100644 (file)
--- a/Oobe/Oobe.Common/Layouts/OneButtonLayout.cs
+++ b/Oobe/Oobe.Common/Pages/OneButtonPage.cs
@@ -19,17 +19,17 @@ using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Components;
 
-namespace Oobe.Common.Layouts
+namespace Oobe.Common.Pages
 {
     /// <summary>
     /// OOBE Layout with single center-positioned Button
     /// </summary>
-    public class OneButtonLayout : BasePageLayout
+    public class OneButtonPage : BasePage
     {
         /// <summary>
         /// Constructs new OneButtonLayout object
         /// </summary>
-        public OneButtonLayout()
+        public OneButtonPage()
             : base()
         {
             NextButton = new Button(ButtonStyles.Next);

diff --git a/Oobe/Oobe.Common/Layouts/TwoButtonLayout.cs b/Oobe/Oobe.Common/Pages/TwoButtonsPage.cs
similarity index 94%
rename from Oobe/Oobe.Common/Layouts/TwoButtonLayout.cs
rename to Oobe/Oobe.Common/Pages/TwoButtonsPage.cs
index fa9b4c6..a24cdbc 100644 (file)
--- a/Oobe/Oobe.Common/Layouts/TwoButtonLayout.cs
+++ b/Oobe/Oobe.Common/Pages/TwoButtonsPage.cs
@@ -19,18 +19,18 @@ using Tizen.NUI;
 using Tizen.NUI.BaseComponents;
 using Tizen.NUI.Components;
 
-namespace Oobe.Common.Layouts
+namespace Oobe.Common.Pages
 {
     /// <summary>
     /// OOBE Layout with two Buttons, positioned at left and right bottom.
     /// </summary>
-    public class TwoButtonLayout
-        : BasePageLayout
+    public class TwoButtonsPage
+        : BasePage
     {
         /// <summary>
         /// Constructs new TwoButtonLayout object
         /// </summary>
-        public TwoButtonLayout()
+        public TwoButtonsPage()
             : base()
         {
             NextButton = new Button(ButtonStyles.Next);

diff --git a/Oobe/Oobe.Language/LanguageStep.cs b/Oobe/Oobe.Language/LanguageStep.cs
index 818bd84..f2c9795 100644 (file)
--- a/Oobe/Oobe.Language/LanguageStep.cs
+++ b/Oobe/Oobe.Language/LanguageStep.cs
@@ -19,7 +19,7 @@ using System.Globalization;
 using System.Linq;
 using Oobe.Common.Controls;
 using Oobe.Common.Interfaces;
-using Oobe.Common.Layouts;
+using Oobe.Common.Pages;
 using Oobe.Common.Resources;
 using Oobe.Common.Styles;
 using Oobe.Common.Utils;
@@ -46,7 +46,7 @@ namespace Oobe.Language
 
         public override View CreateView(IProcessNavigation nav)
         {
-            var container = new TwoButtonLayout();
+            var container = new TwoButtonsPage();
 
             container.Title.TranslatableText = "CHOOSE_LANGUAGE";
 

diff --git a/Oobe/Oobe.Region/RegionStep.cs b/Oobe/Oobe.Region/RegionStep.cs
index da47a0d..3bb1b19 100644 (file)
--- a/Oobe/Oobe.Region/RegionStep.cs
+++ b/Oobe/Oobe.Region/RegionStep.cs
@@ -16,7 +16,7 @@
 
 using Oobe.Common.Controls;
 using Oobe.Common.Interfaces;
-using Oobe.Common.Layouts;
+using Oobe.Common.Pages;
 using Oobe.Common.Styles;
 using Oobe.Region.Model;
 using Tizen.NUI;
@@ -41,7 +41,7 @@ namespace Oobe.Region
 
         public override View CreateView(IProcessNavigation nav)
         {
-            var container = new TwoButtonLayout();
+            var container = new TwoButtonsPage();
 
             container.Title.TranslatableText = "CHOOSE_REGION";
 

diff --git a/Oobe/Oobe.Terms/Views/TermsView.cs b/Oobe/Oobe.Terms/Views/TermsView.cs
index b7d5290..82def94 100644 (file)
--- a/Oobe/Oobe.Terms/Views/TermsView.cs
+++ b/Oobe/Oobe.Terms/Views/TermsView.cs
@@ -15,7 +15,7 @@
  */
 
 using Oobe.Common.Interfaces;
-using Oobe.Common.Layouts;
+using Oobe.Common.Pages;
 using Oobe.Common.Styles;
 using Oobe.Common.Utils;
 using Oobe.Terms.Model;
@@ -26,7 +26,7 @@ using Tizen.NUI.Components;
 
 namespace Oobe.Terms.Views
 {
-    public class TermsView : TwoButtonLayout
+    public class TermsView : TwoButtonsPage
     {
         private TermsProvider termsProvider;
 

diff --git a/Oobe/Oobe.Welcome/WelcomeStep.cs b/Oobe/Oobe.Welcome/WelcomeStep.cs
index df5fded..d86c9db 100644 (file)
--- a/Oobe/Oobe.Welcome/WelcomeStep.cs
+++ b/Oobe/Oobe.Welcome/WelcomeStep.cs
@@ -15,7 +15,7 @@
  */
 
 using Oobe.Common.Interfaces;\r
-using Oobe.Common.Layouts;
+using Oobe.Common.Pages;
 using Oobe.Common.Styles;\r
 using Tizen.NUI;\r
 using Tizen.NUI.BaseComponents;\r
@@ -27,7 +27,7 @@ namespace Oobe.Welcome
     {\r
         public override View CreateView(IProcessNavigation nav)\r
         {\r
-            var container = new OneButtonLayout();\r
+            var container = new OneButtonPage();\r
 \r
             container.Title.TranslatableText = "WELCOME_TITLE";\r
 \r

diff --git a/Oobe/Oobe.Wifi/WifiStep.cs b/Oobe/Oobe.Wifi/WifiStep.cs
index cf160df..22ceee0 100644 (file)
--- a/Oobe/Oobe.Wifi/WifiStep.cs
+++ b/Oobe/Oobe.Wifi/WifiStep.cs
@@ -17,7 +17,7 @@
 using System;
 using System.Collections.Generic;
 using Oobe.Common.Interfaces;
-using Oobe.Common.Layouts;
+using Oobe.Common.Pages;
 using Oobe.Common.Styles;
 using Oobe.Wifi.Controls.Wifi;
 using Tizen.Network.WiFi;
@@ -36,7 +36,7 @@ namespace Oobe.Wifi
         {
             DisposeView();
 
-            var view = new TwoButtonLayout();
+            var view = new TwoButtonsPage();
 
             view.Title.ParentOrigin = new Position(0.5f, 0.064f);
             view.Title.TranslatableText = "CHOOSE_WIFI_NETWORK";