From 2cdeda17ee28318b3f9ae78d9ef39c083ed01853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 11 Jan 2018 16:30:53 +0100
Subject: [PATCH] MOBILE-2308 core: Add segment name to avoid collisions

---
 src/addon/calendar/pages/event/event.ts                         | 2 +-
 src/addon/calendar/pages/list/list.ts                           | 2 +-
 src/addon/calendar/pages/settings/settings.ts                   | 2 +-
 src/components/split-view/placeholder/placeholder.ts            | 2 +-
 src/core/courses/pages/available-courses/available-courses.ts   | 2 +-
 src/core/courses/pages/categories/categories.ts                 | 2 +-
 src/core/courses/pages/course-preview/course-preview.ts         | 2 +-
 src/core/courses/pages/my-courses/my-courses.ts                 | 2 +-
 src/core/courses/pages/my-overview/my-overview.ts               | 2 +-
 src/core/courses/pages/search/search.ts                         | 2 +-
 .../courses/pages/self-enrol-password/self-enrol-password.ts    | 2 +-
 src/core/emulator/pages/capture-media/capture-media.ts          | 2 +-
 src/core/login/pages/credentials/credentials.ts                 | 2 +-
 src/core/login/pages/email-signup/email-signup.ts               | 2 +-
 src/core/login/pages/forgotten-password/forgotten-password.ts   | 2 +-
 src/core/login/pages/init/init.ts                               | 2 +-
 src/core/login/pages/reconnect/reconnect.ts                     | 2 +-
 src/core/login/pages/site-error/site-error.ts                   | 2 +-
 src/core/login/pages/site-help/site-help.ts                     | 2 +-
 src/core/login/pages/site-policy/site-policy.ts                 | 2 +-
 src/core/login/pages/site/site.ts                               | 2 +-
 src/core/login/pages/sites/sites.ts                             | 2 +-
 src/core/mainmenu/pages/menu/menu.ts                            | 2 +-
 src/core/mainmenu/pages/more/more.ts                            | 2 +-
 src/core/sharedfiles/pages/choose-site/choose-site.ts           | 2 +-
 src/core/sharedfiles/pages/list/list.ts                         | 2 +-
 src/core/viewer/pages/iframe/iframe.ts                          | 2 +-
 src/core/viewer/pages/text/text.ts                              | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/addon/calendar/pages/event/event.ts b/src/addon/calendar/pages/event/event.ts
index 590e3806a..47059f76f 100644
--- a/src/addon/calendar/pages/event/event.ts
+++ b/src/addon/calendar/pages/event/event.ts
@@ -27,7 +27,7 @@ import * as moment from 'moment';
 /**
  * Page that displays a single calendar event.
  */
-@IonicPage()
+@IonicPage({segment: "addon-calendar-event"})
 @Component({
     selector: 'page-addon-calendar-event',
     templateUrl: 'event.html',
diff --git a/src/addon/calendar/pages/list/list.ts b/src/addon/calendar/pages/list/list.ts
index 82c8b748f..1cbaf686a 100644
--- a/src/addon/calendar/pages/list/list.ts
+++ b/src/addon/calendar/pages/list/list.ts
@@ -30,7 +30,7 @@ import { CoreSplitViewComponent } from '../../../../components/split-view/split-
 /**
  * Page that displays the list of calendar events.
  */
-@IonicPage()
+@IonicPage({segment: "addon-calendar-list"})
 @Component({
     selector: 'page-addon-calendar-list',
     templateUrl: 'list.html',
diff --git a/src/addon/calendar/pages/settings/settings.ts b/src/addon/calendar/pages/settings/settings.ts
index 10d0deccc..a677ea8dd 100644
--- a/src/addon/calendar/pages/settings/settings.ts
+++ b/src/addon/calendar/pages/settings/settings.ts
@@ -21,7 +21,7 @@ import { CoreSitesProvider } from '../../../../providers/sites';
 /**
  * Page that displays the calendar settings.
  */
-@IonicPage()
+@IonicPage({segment: "addon-calendar-settings"})
 @Component({
     selector: 'page-addon-calendar-settings',
     templateUrl: 'settings.html',
diff --git a/src/components/split-view/placeholder/placeholder.ts b/src/components/split-view/placeholder/placeholder.ts
index da0c7cf36..0f624fc72 100644
--- a/src/components/split-view/placeholder/placeholder.ts
+++ b/src/components/split-view/placeholder/placeholder.ts
@@ -4,7 +4,7 @@ import {
     NavController,
     NavParams } from 'ionic-angular';
 
-@IonicPage()
+@IonicPage({segment: "core-placeholder"})
 @Component({
     selector: 'core-placeholder',
     templateUrl: 'placeholder.html',
diff --git a/src/core/courses/pages/available-courses/available-courses.ts b/src/core/courses/pages/available-courses/available-courses.ts
index 47d71babf..084e2782f 100644
--- a/src/core/courses/pages/available-courses/available-courses.ts
+++ b/src/core/courses/pages/available-courses/available-courses.ts
@@ -21,7 +21,7 @@ import { CoreCoursesProvider } from '../../providers/courses';
 /**
  * Page that displays available courses in current site.
  */
-@IonicPage()
+@IonicPage({segment: "core-courses-available-courses"})
 @Component({
     selector: 'page-core-courses-available-courses',
     templateUrl: 'available-courses.html',
diff --git a/src/core/courses/pages/categories/categories.ts b/src/core/courses/pages/categories/categories.ts
index 2253fc17a..3c78fa63a 100644
--- a/src/core/courses/pages/categories/categories.ts
+++ b/src/core/courses/pages/categories/categories.ts
@@ -23,7 +23,7 @@ import { CoreCoursesProvider } from '../../providers/courses';
 /**
  * Page that displays a list of categories and the courses in the current category if any.
  */
-@IonicPage()
+@IonicPage({segment: "core-courses-categories"})
 @Component({
     selector: 'page-core-courses-categories',
     templateUrl: 'categories.html',
diff --git a/src/core/courses/pages/course-preview/course-preview.ts b/src/core/courses/pages/course-preview/course-preview.ts
index 0789790c9..a1b10ed7c 100644
--- a/src/core/courses/pages/course-preview/course-preview.ts
+++ b/src/core/courses/pages/course-preview/course-preview.ts
@@ -26,7 +26,7 @@ import { CoreCoursesDelegate } from '../../providers/delegate';
 /**
  * Page that allows "previewing" a course and enrolling in it if enabled and not enrolled.
  */
-@IonicPage()
+@IonicPage({segment: "core-courses-course-preview"})
 @Component({
     selector: 'page-core-courses-course-preview',
     templateUrl: 'course-preview.html',
diff --git a/src/core/courses/pages/my-courses/my-courses.ts b/src/core/courses/pages/my-courses/my-courses.ts
index 3259c9d47..639302b69 100644
--- a/src/core/courses/pages/my-courses/my-courses.ts
+++ b/src/core/courses/pages/my-courses/my-courses.ts
@@ -22,7 +22,7 @@ import { CoreCoursesProvider } from '../../providers/courses';
 /**
  * Page that displays the list of courses the user is enrolled in.
  */
-@IonicPage()
+@IonicPage({segment: "core-courses-my-courses"})
 @Component({
     selector: 'page-core-courses-my-courses',
     templateUrl: 'my-courses.html',
diff --git a/src/core/courses/pages/my-overview/my-overview.ts b/src/core/courses/pages/my-overview/my-overview.ts
index 963afe4c5..21a7c423d 100644
--- a/src/core/courses/pages/my-overview/my-overview.ts
+++ b/src/core/courses/pages/my-overview/my-overview.ts
@@ -22,7 +22,7 @@ import * as moment from 'moment';
 /**
  * Page that displays My Overview.
  */
-@IonicPage()
+@IonicPage({segment: "core-courses-my-overview"})
 @Component({
     selector: 'page-core-courses-my-overview',
     templateUrl: 'my-overview.html',
diff --git a/src/core/courses/pages/search/search.ts b/src/core/courses/pages/search/search.ts
index 654b36cb5..0e7de9151 100644
--- a/src/core/courses/pages/search/search.ts
+++ b/src/core/courses/pages/search/search.ts
@@ -20,7 +20,7 @@ import { CoreCoursesProvider } from '../../providers/courses';
 /**
  * Page that allows searching for courses.
  */
-@IonicPage()
+@IonicPage({segment: "core-courses-search"})
 @Component({
     selector: 'page-core-courses-search',
     templateUrl: 'search.html',
diff --git a/src/core/courses/pages/self-enrol-password/self-enrol-password.ts b/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
index dcdc404fe..7e9716a43 100644
--- a/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
+++ b/src/core/courses/pages/self-enrol-password/self-enrol-password.ts
@@ -18,7 +18,7 @@ import { IonicPage, ViewController } from 'ionic-angular';
 /**
  * Page that displays a form to enter a password to self enrol in a course.
  */
-@IonicPage()
+@IonicPage({segment: "core-courses-self-enrol-password"})
 @Component({
     selector: 'page-core-courses-self-enrol-password',
     templateUrl: 'self-enrol-password.html',
diff --git a/src/core/emulator/pages/capture-media/capture-media.ts b/src/core/emulator/pages/capture-media/capture-media.ts
index ba257c29f..e94d15be5 100644
--- a/src/core/emulator/pages/capture-media/capture-media.ts
+++ b/src/core/emulator/pages/capture-media/capture-media.ts
@@ -22,7 +22,7 @@ import { CoreTimeUtilsProvider } from '../../../../providers/utils/time';
 /**
  * Page to capture media in browser or desktop.
  */
-@IonicPage()
+@IonicPage({segment: "core-emulator-capture-media"})
 @Component({
     selector: 'page-core-emulator-capture-media',
     templateUrl: 'capture-media.html',
diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts
index ceb996031..32c939a05 100644
--- a/src/core/login/pages/credentials/credentials.ts
+++ b/src/core/login/pages/credentials/credentials.ts
@@ -26,7 +26,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 /**
  * Page to enter the user credentials.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-credentials"})
 @Component({
     selector: 'page-core-login-credentials',
     templateUrl: 'credentials.html',
diff --git a/src/core/login/pages/email-signup/email-signup.ts b/src/core/login/pages/email-signup/email-signup.ts
index 95504c0fe..5311a4a47 100644
--- a/src/core/login/pages/email-signup/email-signup.ts
+++ b/src/core/login/pages/email-signup/email-signup.ts
@@ -26,7 +26,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 /**
  * Page to signup using email.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-email-signup"})
 @Component({
     selector: 'page-core-login-email-signup',
     templateUrl: 'email-signup.html',
diff --git a/src/core/login/pages/forgotten-password/forgotten-password.ts b/src/core/login/pages/forgotten-password/forgotten-password.ts
index 1b812040e..5dc6f1daa 100644
--- a/src/core/login/pages/forgotten-password/forgotten-password.ts
+++ b/src/core/login/pages/forgotten-password/forgotten-password.ts
@@ -22,7 +22,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 /**
  * Page to recover a forgotten password.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-forgotten-password"})
 @Component({
     selector: 'page-core-login-forgotten-password',
     templateUrl: 'forgotten-password.html',
diff --git a/src/core/login/pages/init/init.ts b/src/core/login/pages/init/init.ts
index b122908f9..7be53c668 100644
--- a/src/core/login/pages/init/init.ts
+++ b/src/core/login/pages/init/init.ts
@@ -23,7 +23,7 @@ import { CoreLoginHelperProvider } from '../../providers/helper';
 /**
  * Page that displays a "splash screen" while the app is being initialized.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-init"})
 @Component({
     selector: 'page-core-login-init',
     templateUrl: 'init.html',
diff --git a/src/core/login/pages/reconnect/reconnect.ts b/src/core/login/pages/reconnect/reconnect.ts
index aaa744056..4873c923c 100644
--- a/src/core/login/pages/reconnect/reconnect.ts
+++ b/src/core/login/pages/reconnect/reconnect.ts
@@ -23,7 +23,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 /**
  * Page to enter the user password to reconnect to a site.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-reconnect"})
 @Component({
     selector: 'page-core-login-reconnect',
     templateUrl: 'reconnect.html',
diff --git a/src/core/login/pages/site-error/site-error.ts b/src/core/login/pages/site-error/site-error.ts
index 6f248056e..f68e085ea 100644
--- a/src/core/login/pages/site-error/site-error.ts
+++ b/src/core/login/pages/site-error/site-error.ts
@@ -18,7 +18,7 @@ import { IonicPage, ViewController, NavParams } from 'ionic-angular';
 /**
  * Component that displays an error when trying to connect to a site.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-site-error"})
 @Component({
     selector: 'page-core-login-site-error',
     templateUrl: 'site-error.html',
diff --git a/src/core/login/pages/site-help/site-help.ts b/src/core/login/pages/site-help/site-help.ts
index a003b28e7..a7d8132d2 100644
--- a/src/core/login/pages/site-help/site-help.ts
+++ b/src/core/login/pages/site-help/site-help.ts
@@ -18,7 +18,7 @@ import { IonicPage, ViewController } from 'ionic-angular';
 /**
  * Component that displays some help regarding the CoreLoginSitePage.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-site-help"})
 @Component({
     selector: 'page-core-login-site-help',
     templateUrl: 'site-help.html',
diff --git a/src/core/login/pages/site-policy/site-policy.ts b/src/core/login/pages/site-policy/site-policy.ts
index dac709cde..c3c582358 100644
--- a/src/core/login/pages/site-policy/site-policy.ts
+++ b/src/core/login/pages/site-policy/site-policy.ts
@@ -23,7 +23,7 @@ import { CoreSite } from '../../../../classes/site';
 /**
  * Page to accept a site policy.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-site-policy"})
 @Component({
     selector: 'page-core-login-site-policy',
     templateUrl: 'site-policy.html',
diff --git a/src/core/login/pages/site/site.ts b/src/core/login/pages/site/site.ts
index bd4af2e9b..6615edace 100644
--- a/src/core/login/pages/site/site.ts
+++ b/src/core/login/pages/site/site.ts
@@ -24,7 +24,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 /**
  * Page to enter or select the site URL to connect to.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-site"})
 @Component({
     selector: 'page-core-login-site',
     templateUrl: 'site.html',
diff --git a/src/core/login/pages/sites/sites.ts b/src/core/login/pages/sites/sites.ts
index 3e6fa76c7..3ae4d56cd 100644
--- a/src/core/login/pages/sites/sites.ts
+++ b/src/core/login/pages/sites/sites.ts
@@ -24,7 +24,7 @@ import { CoreLoginHelperProvider } from '../../providers/helper';
 /**
  * Page that displays the list of stored sites.
  */
-@IonicPage()
+@IonicPage({segment: "core-login-sites"})
 @Component({
     selector: 'page-core-login-sites',
     templateUrl: 'sites.html',
diff --git a/src/core/mainmenu/pages/menu/menu.ts b/src/core/mainmenu/pages/menu/menu.ts
index fad067dc5..d319918f1 100644
--- a/src/core/mainmenu/pages/menu/menu.ts
+++ b/src/core/mainmenu/pages/menu/menu.ts
@@ -22,7 +22,7 @@ import { CoreMainMenuDelegate, CoreMainMenuHandlerData } from '../../providers/d
 /**
  * Page that displays the main menu of the app.
  */
-@IonicPage()
+@IonicPage({segment: "core-mainmenu"})
 @Component({
     selector: 'page-core-mainmenu',
     templateUrl: 'menu.html',
diff --git a/src/core/mainmenu/pages/more/more.ts b/src/core/mainmenu/pages/more/more.ts
index 1f2fa4f28..6ae8863e3 100644
--- a/src/core/mainmenu/pages/more/more.ts
+++ b/src/core/mainmenu/pages/more/more.ts
@@ -22,7 +22,7 @@ import { CoreMainMenuProvider, CoreMainMenuCustomItem } from '../../providers/ma
 /**
  * Page that displays the list of main menu options that aren't in the tabs.
  */
-@IonicPage()
+@IonicPage({segment: "core-mainmenu-more"})
 @Component({
     selector: 'page-core-mainmenu-more',
     templateUrl: 'more.html',
diff --git a/src/core/sharedfiles/pages/choose-site/choose-site.ts b/src/core/sharedfiles/pages/choose-site/choose-site.ts
index 68896cc94..20702dc4c 100644
--- a/src/core/sharedfiles/pages/choose-site/choose-site.ts
+++ b/src/core/sharedfiles/pages/choose-site/choose-site.ts
@@ -22,7 +22,7 @@ import { CoreSharedFilesHelperProvider } from '../../providers/helper';
 /**
  * Modal to display the list of sites to choose one to store a shared file.
  */
-@IonicPage()
+@IonicPage({segment: "core-shared-files-choose-site"})
 @Component({
     selector: 'page-core-shared-files-choose-site',
     templateUrl: 'choose-site.html',
diff --git a/src/core/sharedfiles/pages/list/list.ts b/src/core/sharedfiles/pages/list/list.ts
index dc285979e..92a1d7f34 100644
--- a/src/core/sharedfiles/pages/list/list.ts
+++ b/src/core/sharedfiles/pages/list/list.ts
@@ -24,7 +24,7 @@ import { CoreSharedFilesProvider } from '../../providers/sharedfiles';
 /**
  * Modal to display the list of shared files.
  */
-@IonicPage()
+@IonicPage({segment: "core-shared-files-list"})
 @Component({
     selector: 'page-core-shared-files-list',
     templateUrl: 'list.html',
diff --git a/src/core/viewer/pages/iframe/iframe.ts b/src/core/viewer/pages/iframe/iframe.ts
index ba67d8d7e..ee598859a 100644
--- a/src/core/viewer/pages/iframe/iframe.ts
+++ b/src/core/viewer/pages/iframe/iframe.ts
@@ -18,7 +18,7 @@ import { IonicPage, NavParams } from 'ionic-angular';
 /**
  * Page to display a URL in an iframe.
  */
-@IonicPage()
+@IonicPage({segment: "core-viewer-iframe"})
 @Component({
     selector: 'page-core-viewer-iframe',
     templateUrl: 'iframe.html',
diff --git a/src/core/viewer/pages/text/text.ts b/src/core/viewer/pages/text/text.ts
index 94486c69f..dd0d6281d 100644
--- a/src/core/viewer/pages/text/text.ts
+++ b/src/core/viewer/pages/text/text.ts
@@ -19,7 +19,7 @@ import { CoreTextUtilsProvider } from '../../../../providers/utils/text';
 /**
  * Page to render a certain text. If opened as a modal, it will have a button to close the modal.
  */
-@IonicPage()
+@IonicPage({segment: "core-viewer-text"})
 @Component({
     selector: 'page-core-viewer-text',
     templateUrl: 'text.html',