From d8c6288a61a01cf9e620db945c8a19fd9df42626 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 9 Jan 2025 15:50:29 +0100 Subject: [PATCH] MOBILE-4724 core: Move some services to overlay subfolder --- .../recentlyaccesseditems/recentlyaccesseditems.ts | 2 +- src/addons/block/timeline/components/events/events.ts | 2 +- src/addons/blog/pages/edit-entry/edit-entry.ts | 2 +- src/addons/blog/pages/index/index.ts | 4 ++-- src/addons/calendar/pages/day/day.ts | 2 +- src/addons/calendar/pages/edit-event/edit-event.ts | 4 ++-- src/addons/calendar/pages/event/event.ts | 6 +++--- src/addons/calendar/pages/index/index.ts | 2 +- src/addons/calendar/pages/settings/settings.ts | 2 +- src/addons/coursecompletion/pages/report/report.ts | 2 +- src/addons/enrol/guest/services/enrol-handler.ts | 4 ++-- src/addons/enrol/self/services/enrol-handler.ts | 4 ++-- src/addons/messages/pages/discussion/discussion.ts | 4 ++-- src/addons/messages/pages/settings/settings.ts | 2 +- .../mod/assign/classes/base-feedback-plugin-component.ts | 2 +- src/addons/mod/assign/components/submission/submission.ts | 2 +- src/addons/mod/assign/pages/edit/edit.ts | 4 ++-- src/addons/mod/bigbluebuttonbn/components/index/index.ts | 2 +- src/addons/mod/book/pages/contents/contents.ts | 2 +- src/addons/mod/chat/pages/chat/chat.ts | 4 ++-- src/addons/mod/chat/pages/sessions/sessions.ts | 2 +- src/addons/mod/choice/components/index/index.ts | 2 +- src/addons/mod/data/components/action/action.ts | 2 +- src/addons/mod/data/components/index/index.ts | 2 +- src/addons/mod/data/fields/latlong/component/latlong.ts | 2 +- src/addons/mod/data/pages/edit/edit.ts | 2 +- src/addons/mod/data/services/data-helper.ts | 4 ++-- src/addons/mod/data/services/handlers/edit-link-lazy.ts | 2 +- src/addons/mod/data/services/handlers/show-link-lazy.ts | 2 +- src/addons/mod/feedback/pages/form/form.ts | 2 +- src/addons/mod/feedback/services/feedback-helper.ts | 2 +- .../mod/feedback/services/handlers/analysis-link.ts | 2 +- .../mod/feedback/services/handlers/complete-link.ts | 2 +- src/addons/mod/feedback/services/handlers/print-link.ts | 2 +- .../services/handlers/show-non-respondents-link.ts | 2 +- .../discussion-options-menu/discussion-options-menu.ts | 4 ++-- src/addons/mod/forum/components/index/index.ts | 6 +++--- src/addons/mod/forum/components/post/post.ts | 6 +++--- src/addons/mod/forum/pages/discussion/discussion.ts | 4 ++-- .../mod/forum/pages/new-discussion/new-discussion.ts | 2 +- src/addons/mod/forum/services/handlers/post-link.ts | 2 +- src/addons/mod/glossary/components/index/index.ts | 2 +- src/addons/mod/glossary/pages/edit/edit.ts | 2 +- src/addons/mod/glossary/pages/entry/entry.ts | 4 ++-- src/addons/mod/glossary/services/handlers/edit-link.ts | 2 +- src/addons/mod/glossary/services/handlers/entry-link.ts | 2 +- src/addons/mod/h5pactivity/components/index/index.ts | 2 +- .../mod/h5pactivity/services/handlers/report-link.ts | 2 +- src/addons/mod/imscp/pages/view/view.ts | 2 +- src/addons/mod/lesson/pages/player/player.ts | 2 +- src/addons/mod/lesson/services/handlers/grade-link.ts | 2 +- src/addons/mod/lesson/services/handlers/index-link.ts | 2 +- src/addons/mod/lesson/services/handlers/prefetch.ts | 2 +- src/addons/mod/lesson/services/handlers/report-link.ts | 2 +- src/addons/mod/lti/services/lti-helper.ts | 2 +- src/addons/mod/quiz/classes/auto-save.ts | 2 +- src/addons/mod/quiz/pages/player/player.ts | 4 ++-- src/addons/mod/quiz/pages/review/review.ts | 2 +- src/addons/mod/quiz/services/quiz-helper.ts | 4 ++-- src/addons/mod/resource/services/resource-helper.ts | 2 +- src/addons/mod/scorm/pages/player/player.ts | 2 +- src/addons/mod/subsection/services/handlers/index-link.ts | 2 +- src/addons/mod/survey/components/index/index.ts | 2 +- src/addons/mod/url/services/handlers/module.ts | 2 +- src/addons/mod/url/services/url-helper.ts | 2 +- src/addons/mod/wiki/components/index/index.ts | 4 ++-- src/addons/mod/wiki/pages/edit/edit.ts | 2 +- src/addons/mod/wiki/services/handlers/create-link-lazy.ts | 2 +- src/addons/mod/wiki/services/handlers/edit-link-lazy.ts | 2 +- .../mod/wiki/services/handlers/page-or-map-link-lazy.ts | 2 +- .../components/assessment-strategy/assessment-strategy.ts | 2 +- .../mod/workshop/components/assessment/assessment.ts | 2 +- src/addons/mod/workshop/components/index/index.ts | 2 +- src/addons/mod/workshop/pages/assessment/assessment.ts | 2 +- .../mod/workshop/pages/edit-submission/edit-submission.ts | 2 +- src/addons/mod/workshop/pages/submission/submission.ts | 2 +- src/addons/notes/components/add/add-modal.ts | 4 ++-- src/addons/notes/pages/list/list.ts | 4 ++-- src/addons/notifications/pages/settings/settings.ts | 2 +- src/addons/privatefiles/pages/index/index.ts | 6 +++--- src/addons/privatefiles/services/privatefiles-helper.ts | 4 ++-- .../report/insights/services/handlers/action-link.ts | 4 ++-- .../storagemanager/pages/course-storage/course-storage.ts | 2 +- .../pages/courses-storage/courses-storage.ts | 2 +- src/core/classes/page-loads-manager.ts | 2 +- src/core/classes/sites/authenticated-site.ts | 2 +- src/core/classes/sites/site.ts | 2 +- src/core/components/combobox/combobox.ts | 2 +- src/core/components/context-menu/context-menu.ts | 2 +- src/core/components/local-file/local-file.ts | 2 +- src/core/components/password-modal/password-modal.ts | 2 +- src/core/components/sheet-modal/sheet-modal.ts | 2 +- src/core/core.module.ts | 6 +++--- src/core/directives/download-file.ts | 2 +- src/core/directives/link.ts | 2 +- src/core/directives/reading-mode.ts | 2 +- .../components/side-blocks-button/side-blocks-button.ts | 2 +- src/core/features/comments/pages/viewer/viewer.ts | 4 ++-- .../features/contentlinks/classes/module-grade-handler.ts | 2 +- .../features/contentlinks/services/contentlinks-helper.ts | 2 +- .../features/course/classes/main-resource-component.ts | 2 +- .../course/components/course-format/course-format.ts | 2 +- .../components/module-completion/module-completion.ts | 2 +- .../components/module-navigation/module-navigation.ts | 2 +- .../course/directives/download-module-main-file.ts | 2 +- .../course/pages/module-preview/module-preview.ts | 2 +- src/core/features/course/services/course-helper.ts | 4 ++-- src/core/features/course/services/course.ts | 2 +- .../components/course-list-item/course-list-item.ts | 4 ++-- .../courses/services/handlers/base-link-handler.ts | 2 +- .../courses/services/handlers/enrol-push-click.ts | 2 +- .../courses/services/handlers/request-push-click.ts | 2 +- .../dataprivacy/components/contactdpo/contactdpo.ts | 4 ++-- .../dataprivacy/components/newrequest/newrequest.ts | 4 ++-- src/core/features/dataprivacy/pages/main/main.ts | 4 ++-- .../emulator/components/capture-media/capture-media.ts | 2 +- .../features/fileuploader/services/fileuploader-helper.ts | 4 ++-- src/core/features/fileuploader/services/fileuploader.ts | 2 +- src/core/features/grades/services/grades-helper.ts | 2 +- src/core/features/login/pages/credentials/credentials.ts | 2 +- .../features/login/pages/email-signup/email-signup.ts | 2 +- .../login/pages/forgotten-password/forgotten-password.ts | 2 +- src/core/features/login/pages/reconnect/reconnect.ts | 2 +- src/core/features/login/pages/site/site.ts | 4 ++-- src/core/features/login/pages/sites/sites.ts | 2 +- src/core/features/login/services/login-helper.ts | 2 +- .../components/user-menu-button/user-menu-button.ts | 2 +- .../features/mainmenu/components/user-menu/user-menu.ts | 2 +- src/core/features/policy/pages/acceptances/acceptances.ts | 4 ++-- src/core/features/policy/pages/site-policy/site-policy.ts | 4 ++-- .../features/rating/components/aggregate/aggregate.ts | 2 +- src/core/features/rating/components/rate/rate.ts | 4 ++-- .../reminders/components/set-button/set-button.ts | 4 ++-- .../components/set-reminder-menu/set-reminder-menu.ts | 2 +- src/core/features/reportbuilder/pages/report/report.ts | 2 +- .../features/search/pages/global-search/global-search.ts | 2 +- src/core/features/settings/pages/dev/dev.ts | 2 +- src/core/features/settings/pages/deviceinfo/deviceinfo.ts | 2 +- src/core/features/settings/pages/site/site.ts | 2 +- .../settings/pages/synchronization/synchronization.ts | 2 +- .../features/sharedfiles/services/sharedfiles-helper.ts | 2 +- src/core/features/sitehome/pages/index/index.ts | 2 +- .../siteplugins/classes/call-ws-click-directive.ts | 2 +- .../siteplugins/components/module-index/module-index.ts | 2 +- src/core/features/siteplugins/directives/call-ws.ts | 2 +- src/core/features/user/pages/about/about.ts | 2 +- src/core/features/viewer/services/viewer.ts | 2 +- src/core/services/navigator.ts | 2 +- src/core/services/{ => overlays}/loadings.ts | 0 src/core/services/{ => overlays}/modals.ts | 2 +- src/core/services/{ => overlays}/popovers.ts | 0 src/core/services/{ => overlays}/toasts.ts | 0 src/core/services/qrscan.ts | 2 +- src/core/services/urlschemes.ts | 2 +- src/core/services/utils/dom.ts | 8 ++++---- src/core/services/utils/iframe.ts | 2 +- src/core/singletons/text.ts | 2 +- src/testing/utils.ts | 2 +- src/types/config.d.ts | 2 +- 159 files changed, 199 insertions(+), 199 deletions(-) rename src/core/services/{ => overlays}/loadings.ts (100%) rename src/core/services/{ => overlays}/modals.ts (99%) rename src/core/services/{ => overlays}/popovers.ts (100%) rename src/core/services/{ => overlays}/toasts.ts (100%) diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts index b6d166d85..257fb415d 100644 --- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts +++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts @@ -20,7 +20,7 @@ import { AddonBlockRecentlyAccessedItemsItemCalculatedData, } from '../../services/recentlyaccesseditems'; import { CoreText } from '@singletons/text'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreUtils } from '@singletons/utils'; import { CoreSharedModule } from '@/core/shared.module'; diff --git a/src/addons/block/timeline/components/events/events.ts b/src/addons/block/timeline/components/events/events.ts index c980dc591..4df86e7d8 100644 --- a/src/addons/block/timeline/components/events/events.ts +++ b/src/addons/block/timeline/components/events/events.ts @@ -14,7 +14,7 @@ import { Component, Input, Output, EventEmitter, OnInit, HostBinding } from '@angular/core'; import { CoreSites } from '@services/sites'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreText } from '@singletons/text'; import { CoreEnrolledCourseDataWithOptions } from '@features/courses/services/courses-helper'; import { AddonBlockTimelineDayEvents } from '@addons/block/timeline/classes/section'; diff --git a/src/addons/blog/pages/edit-entry/edit-entry.ts b/src/addons/blog/pages/edit-entry/edit-entry.ts index 5f732f19c..cbfb0e3f8 100644 --- a/src/addons/blog/pages/edit-entry/edit-entry.ts +++ b/src/addons/blog/pages/edit-entry/edit-entry.ts @@ -35,7 +35,7 @@ import { CoreEditorComponentsModule } from '@features/editor/components/componen import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fileuploader/services/fileuploader'; import { CoreTagComponentsModule } from '@features/tag/components/components.module'; import { CanLeave } from '@guards/can-leave'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreNavigator } from '@services/navigator'; import { CoreNetwork } from '@services/network'; import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; diff --git a/src/addons/blog/pages/index/index.ts b/src/addons/blog/pages/index/index.ts index 64ef920d2..e486d4985 100644 --- a/src/addons/blog/pages/index/index.ts +++ b/src/addons/blog/pages/index/index.ts @@ -40,8 +40,8 @@ import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreArray } from '@singletons/array'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreTime } from '@singletons/time'; -import { CorePopovers } from '@services/popovers'; -import { CoreLoadings } from '@services/loadings'; +import { CorePopovers } from '@services/overlays/popovers'; +import { CoreLoadings } from '@services/overlays/loadings'; import { Subscription } from 'rxjs'; /** diff --git a/src/addons/calendar/pages/day/day.ts b/src/addons/calendar/pages/day/day.ts index 0c0acf2f7..3f8badc77 100644 --- a/src/addons/calendar/pages/day/day.ts +++ b/src/addons/calendar/pages/day/day.ts @@ -46,7 +46,7 @@ import { AddonCalendarEventsSource } from '@addons/calendar/classes/events-sourc import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { CoreUrl } from '@singletons/url'; import { CoreTime } from '@singletons/time'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { ADDON_CALENDAR_AUTO_SYNCED, ADDON_CALENDAR_DELETED_EVENT_EVENT, diff --git a/src/addons/calendar/pages/edit-event/edit-event.ts b/src/addons/calendar/pages/edit-event/edit-event.ts index c3850c4a5..1990a141b 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.ts +++ b/src/addons/calendar/pages/edit-event/edit-event.ts @@ -50,8 +50,8 @@ import { AddonCalendarEventType, } from '@addons/calendar/constants'; import { ContextLevel } from '@/core/constants'; -import { CorePopovers } from '@services/popovers'; -import { CoreLoadings } from '@services/loadings'; +import { CorePopovers } from '@services/overlays/popovers'; +import { CoreLoadings } from '@services/overlays/loadings'; import { REMINDERS_DISABLED, CoreRemindersUnits } from '@features/reminders/constants'; import { CorePromiseUtils } from '@singletons/promise-utils'; diff --git a/src/addons/calendar/pages/event/event.ts b/src/addons/calendar/pages/event/event.ts index 5226f55af..ddc5db7c7 100644 --- a/src/addons/calendar/pages/event/event.ts +++ b/src/addons/calendar/pages/event/event.ts @@ -41,9 +41,9 @@ import { CoreReminders } from '@features/reminders/services/reminders'; import { CoreLocalNotifications } from '@services/local-notifications'; import { CorePlatform } from '@services/platform'; import { CoreConfig } from '@services/config'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CorePopovers } from '@services/popovers'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CorePopovers } from '@services/overlays/popovers'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreUrl } from '@singletons/url'; import { ADDON_CALENDAR_AUTO_SYNCED, diff --git a/src/addons/calendar/pages/index/index.ts b/src/addons/calendar/pages/index/index.ts index 0ab5b077a..f67248240 100644 --- a/src/addons/calendar/pages/index/index.ts +++ b/src/addons/calendar/pages/index/index.ts @@ -30,7 +30,7 @@ import { AddonCalendarCalendarComponent } from '../../components/calendar/calend import { AddonCalendarUpcomingEventsComponent } from '../../components/upcoming-events/upcoming-events'; import { CoreNavigator } from '@services/navigator'; import { CoreConstants } from '@/core/constants'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { ADDON_CALENDAR_AUTO_SYNCED, ADDON_CALENDAR_DELETED_EVENT_EVENT, diff --git a/src/addons/calendar/pages/settings/settings.ts b/src/addons/calendar/pages/settings/settings.ts index 87237d62e..b7651acf5 100644 --- a/src/addons/calendar/pages/settings/settings.ts +++ b/src/addons/calendar/pages/settings/settings.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component, OnInit } from '@angular/core'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; import { CoreReminders, CoreRemindersService, diff --git a/src/addons/coursecompletion/pages/report/report.ts b/src/addons/coursecompletion/pages/report/report.ts index d481458cb..bb1a46923 100644 --- a/src/addons/coursecompletion/pages/report/report.ts +++ b/src/addons/coursecompletion/pages/report/report.ts @@ -19,7 +19,7 @@ import { import { Component, OnInit } from '@angular/core'; import { CoreUser, CoreUserProfile } from '@features/user/services/user'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreNavigator } from '@services/navigator'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/addons/enrol/guest/services/enrol-handler.ts b/src/addons/enrol/guest/services/enrol-handler.ts index 712646143..057fb9863 100644 --- a/src/addons/enrol/guest/services/enrol-handler.ts +++ b/src/addons/enrol/guest/services/enrol-handler.ts @@ -22,10 +22,10 @@ import { import { makeSingleton } from '@singletons'; import { AddonEnrolGuest } from './guest'; import { CorePasswordModalResponse } from '@components/password-modal/password-modal'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreWSError } from '@classes/errors/wserror'; import { CoreEnrol, CoreEnrolEnrolmentMethod } from '@features/enrol/services/enrol'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Enrol handler. diff --git a/src/addons/enrol/self/services/enrol-handler.ts b/src/addons/enrol/self/services/enrol-handler.ts index cca133662..8f6fdcef9 100644 --- a/src/addons/enrol/self/services/enrol-handler.ts +++ b/src/addons/enrol/self/services/enrol-handler.ts @@ -19,8 +19,8 @@ import { AddonEnrolSelf } from './self'; import { CorePasswordModalResponse } from '@components/password-modal/password-modal'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreEnrol, CoreEnrolEnrolmentMethod } from '@features/enrol/services/enrol'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CORE_COURSES_ENROL_INVALID_KEY } from '@features/courses/constants'; /** diff --git a/src/addons/messages/pages/discussion/discussion.ts b/src/addons/messages/pages/discussion/discussion.ts index 9da031d1b..fdc52d97a 100644 --- a/src/addons/messages/pages/discussion/discussion.ts +++ b/src/addons/messages/pages/discussion/discussion.ts @@ -44,8 +44,8 @@ import { CoreDom } from '@singletons/dom'; import { CoreKeyboard } from '@singletons/keyboard'; import { CoreText } from '@singletons/text'; import { CoreWait } from '@singletons/wait'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; import { ADDON_MESSAGES_AUTO_SYNCED, ADDON_MESSAGES_LIMIT_MESSAGES, diff --git a/src/addons/messages/pages/settings/settings.ts b/src/addons/messages/pages/settings/settings.ts index 1d8142ffb..5cdbe81be 100644 --- a/src/addons/messages/pages/settings/settings.ts +++ b/src/addons/messages/pages/settings/settings.ts @@ -28,7 +28,7 @@ import { CoreConstants } from '@/core/constants'; import { AddonNotificationsPreferencesNotificationProcessorState } from '@addons/notifications/services/notifications'; import { CorePlatform } from '@services/platform'; import { CoreErrorHelper } from '@services/error-helper'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { ADDON_MESSAGES_NOTIFICATION_PREFERENCES_KEY, AddonMessagesMessagePrivacy } from '@addons/messages/constants'; /** diff --git a/src/addons/mod/assign/classes/base-feedback-plugin-component.ts b/src/addons/mod/assign/classes/base-feedback-plugin-component.ts index fd740ca95..df3e242da 100644 --- a/src/addons/mod/assign/classes/base-feedback-plugin-component.ts +++ b/src/addons/mod/assign/classes/base-feedback-plugin-component.ts @@ -15,7 +15,7 @@ import { Component, Input } from '@angular/core'; import { CoreCanceledError } from '@classes/errors/cancelederror'; import { CoreError } from '@classes/errors/error'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { AddonModAssignFeedbackCommentsTextData } from '../feedback/comments/services/handler'; import { AddonModAssignAssign, AddonModAssignPlugin, AddonModAssignSubmission } from '../services/assign'; import { toBoolean } from '@/core/transforms/boolean'; diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts index ae4849e10..6af701742 100644 --- a/src/addons/mod/assign/components/submission/submission.ts +++ b/src/addons/mod/assign/components/submission/submission.ts @@ -69,7 +69,7 @@ import { ADDON_MOD_ASSIGN_UNLIMITED_ATTEMPTS, } from '../../constants'; import { CoreViewer } from '@features/viewer/services/viewer'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; /** diff --git a/src/addons/mod/assign/pages/edit/edit.ts b/src/addons/mod/assign/pages/edit/edit.ts index 811a677d8..51c6fbeb9 100644 --- a/src/addons/mod/assign/pages/edit/edit.ts +++ b/src/addons/mod/assign/pages/edit/edit.ts @@ -45,8 +45,8 @@ import { ADDON_MOD_ASSIGN_SUBMISSION_SAVED_EVENT, ADDON_MOD_ASSIGN_SUBMITTED_FOR_GRADING_EVENT, } from '../../constants'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; /** diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.ts b/src/addons/mod/bigbluebuttonbn/components/index/index.ts index e17df7e76..1482d7be9 100644 --- a/src/addons/mod/bigbluebuttonbn/components/index/index.ts +++ b/src/addons/mod/bigbluebuttonbn/components/index/index.ts @@ -32,7 +32,7 @@ import { AddonModBBBRecordingPlaybackTypes, } from '../../services/bigbluebuttonbn'; import { ADDON_MOD_BBB_COMPONENT } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { convertTextToHTMLElement } from '@/core/utils/create-html-element'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreOpener } from '@singletons/opener'; diff --git a/src/addons/mod/book/pages/contents/contents.ts b/src/addons/mod/book/pages/contents/contents.ts index b9c72d556..62ea65c69 100644 --- a/src/addons/mod/book/pages/contents/contents.ts +++ b/src/addons/mod/book/pages/contents/contents.ts @@ -37,7 +37,7 @@ import { import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { CoreUrl } from '@singletons/url'; import { ADDON_MOD_BOOK_COMPONENT, AddonModBookNavStyle } from '../../constants'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Page that displays a book contents. diff --git a/src/addons/mod/chat/pages/chat/chat.ts b/src/addons/mod/chat/pages/chat/chat.ts index 81fb81cb7..d96d2e809 100644 --- a/src/addons/mod/chat/pages/chat/chat.ts +++ b/src/addons/mod/chat/pages/chat/chat.ts @@ -31,8 +31,8 @@ import { CoreTime } from '@singletons/time'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { CoreKeyboard } from '@singletons/keyboard'; import { CoreWait } from '@singletons/wait'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays a chat session. diff --git a/src/addons/mod/chat/pages/sessions/sessions.ts b/src/addons/mod/chat/pages/sessions/sessions.ts index 517ae447e..acefafa03 100644 --- a/src/addons/mod/chat/pages/sessions/sessions.ts +++ b/src/addons/mod/chat/pages/sessions/sessions.ts @@ -25,7 +25,7 @@ import { CoreTime } from '@singletons/time'; import { Translate } from '@singletons'; import { AddonModChat } from '@addons/mod/chat/services/chat'; import { CorePromiseUtils } from '@singletons/promise-utils'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays list of chat sessions. diff --git a/src/addons/mod/choice/components/index/index.ts b/src/addons/mod/choice/components/index/index.ts index 764bb7750..104fd11e6 100644 --- a/src/addons/mod/choice/components/index/index.ts +++ b/src/addons/mod/choice/components/index/index.ts @@ -41,7 +41,7 @@ import { ADDON_MOD_CHOICE_PUBLISH_ANONYMOUS, AddonModChoiceShowResults, } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays a choice. diff --git a/src/addons/mod/data/components/action/action.ts b/src/addons/mod/data/components/action/action.ts index bcbc10a43..672e65837 100644 --- a/src/addons/mod/data/components/action/action.ts +++ b/src/addons/mod/data/components/action/action.ts @@ -26,7 +26,7 @@ import { } from '../../services/data'; import { AddonModDataHelper } from '../../services/data-helper'; import { AddonModDataOffline } from '../../services/data-offline'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; import { AddonModDataActionsMenuItem } from '../actionsmenu/actionsmenu'; import { ADDON_MOD_DATA_ENTRY_CHANGED, diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts index 92a4e4489..9109a4496 100644 --- a/src/addons/mod/data/components/index/index.ts +++ b/src/addons/mod/data/components/index/index.ts @@ -51,7 +51,7 @@ import { AddonModDataTemplateType, AddonModDataTemplateMode, } from '../../constants'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreObject } from '@singletons/object'; diff --git a/src/addons/mod/data/fields/latlong/component/latlong.ts b/src/addons/mod/data/fields/latlong/component/latlong.ts index 12365765a..a1242943b 100644 --- a/src/addons/mod/data/fields/latlong/component/latlong.ts +++ b/src/addons/mod/data/fields/latlong/component/latlong.ts @@ -19,7 +19,7 @@ import { FormBuilder } from '@angular/forms'; import { SafeUrl } from '@angular/platform-browser'; import { CoreAnyError } from '@classes/errors/error'; import { CoreGeolocation, CoreGeolocationError, CoreGeolocationErrorReason } from '@services/geolocation'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePlatform } from '@services/platform'; import { CoreDomUtils } from '@services/utils/dom'; import { DomSanitizer } from '@singletons'; diff --git a/src/addons/mod/data/pages/edit/edit.ts b/src/addons/mod/data/pages/edit/edit.ts index a24bcfa1a..30cddec7e 100644 --- a/src/addons/mod/data/pages/edit/edit.ts +++ b/src/addons/mod/data/pages/edit/edit.ts @@ -44,7 +44,7 @@ import { CoreText } from '@singletons/text'; import { CoreTime } from '@singletons/time'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_DATA_COMPONENT, ADDON_MOD_DATA_ENTRY_CHANGED, AddonModDataTemplateType } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreWSError } from '@classes/errors/wserror'; import { CoreArray } from '@singletons/array'; diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts index 3abf13517..50e603456 100644 --- a/src/addons/mod/data/services/data-helper.ts +++ b/src/addons/mod/data/services/data-helper.ts @@ -47,8 +47,8 @@ import { AddonModDataTemplateType, AddonModDataTemplateMode, } from '../constants'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Service that provides helper functions for datas. diff --git a/src/addons/mod/data/services/handlers/edit-link-lazy.ts b/src/addons/mod/data/services/handlers/edit-link-lazy.ts index d76c88685..6b11e84ed 100644 --- a/src/addons/mod/data/services/handlers/edit-link-lazy.ts +++ b/src/addons/mod/data/services/handlers/edit-link-lazy.ts @@ -17,7 +17,7 @@ import { Params } from '@angular/router'; import { CoreCourse } from '@features/course/services/course'; import { CoreNavigator } from '@services/navigator'; import { CoreSitesReadingStrategy } from '@services/sites'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_DATA_FEATURE_NAME, ADDON_MOD_DATA_PAGE_NAME } from '../../constants'; import { AddonModDataEditLinkHandlerService } from '@addons/mod/data/services/handlers/edit-link'; diff --git a/src/addons/mod/data/services/handlers/show-link-lazy.ts b/src/addons/mod/data/services/handlers/show-link-lazy.ts index 3b6e441be..90d102458 100644 --- a/src/addons/mod/data/services/handlers/show-link-lazy.ts +++ b/src/addons/mod/data/services/handlers/show-link-lazy.ts @@ -17,7 +17,7 @@ import { Params } from '@angular/router'; import { CoreCourse } from '@features/course/services/course'; import { CoreNavigator } from '@services/navigator'; import { CoreSitesReadingStrategy } from '@services/sites'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_DATA_PAGE_NAME } from '../../constants'; import { AddonModDataShowLinkHandlerService } from '@addons/mod/data/services/handlers/show-link'; diff --git a/src/addons/mod/feedback/pages/form/form.ts b/src/addons/mod/feedback/pages/form/form.ts index 446684fec..f36b8a20d 100644 --- a/src/addons/mod/feedback/pages/form/form.ts +++ b/src/addons/mod/feedback/pages/form/form.ts @@ -42,7 +42,7 @@ import { ADDON_MOD_FEEDBACK_PAGE_NAME, AddonModFeedbackIndexTabName, } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreError } from '@classes/errors/error'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreWSError } from '@classes/errors/wserror'; diff --git a/src/addons/mod/feedback/services/feedback-helper.ts b/src/addons/mod/feedback/services/feedback-helper.ts index e6e88c46c..16e7cb8b4 100644 --- a/src/addons/mod/feedback/services/feedback-helper.ts +++ b/src/addons/mod/feedback/services/feedback-helper.ts @@ -40,7 +40,7 @@ import { ADDON_MOD_FEEDBACK_MULTICHOICE_HIDENOSELECT, ADDON_MOD_FEEDBACK_PAGE_NAME, } from '../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreText } from '@singletons/text'; const MODE_RESPONSETIME = 1; diff --git a/src/addons/mod/feedback/services/handlers/analysis-link.ts b/src/addons/mod/feedback/services/handlers/analysis-link.ts index 6f91ac109..b6737d42b 100644 --- a/src/addons/mod/feedback/services/handlers/analysis-link.ts +++ b/src/addons/mod/feedback/services/handlers/analysis-link.ts @@ -20,7 +20,7 @@ import { CoreNavigator } from '@services/navigator'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_FEEDBACK_PAGE_NAME, AddonModFeedbackIndexTabName } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Content links handler for a feedback analysis. diff --git a/src/addons/mod/feedback/services/handlers/complete-link.ts b/src/addons/mod/feedback/services/handlers/complete-link.ts index 38120de01..277df62d7 100644 --- a/src/addons/mod/feedback/services/handlers/complete-link.ts +++ b/src/addons/mod/feedback/services/handlers/complete-link.ts @@ -21,7 +21,7 @@ import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_FEEDBACK_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Content links handler for feedback complete questions. diff --git a/src/addons/mod/feedback/services/handlers/print-link.ts b/src/addons/mod/feedback/services/handlers/print-link.ts index 5104e8465..583ac27b4 100644 --- a/src/addons/mod/feedback/services/handlers/print-link.ts +++ b/src/addons/mod/feedback/services/handlers/print-link.ts @@ -21,7 +21,7 @@ import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_FEEDBACK_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Content links handler for feedback print questions. diff --git a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts index 603947ba7..14044111c 100644 --- a/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts +++ b/src/addons/mod/feedback/services/handlers/show-non-respondents-link.ts @@ -21,7 +21,7 @@ import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_FEEDBACK_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Content links handler for feedback show non respondents. * Match mod/feedback/show_nonrespondents.php with a valid feedback id. diff --git a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.ts b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.ts index d974562cb..0d3b9799e 100644 --- a/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.ts +++ b/src/addons/mod/forum/components/discussion-options-menu/discussion-options-menu.ts @@ -19,9 +19,9 @@ import { PopoverController } from '@singletons'; import { CoreEvents } from '@singletons/events'; import { AddonModForum, AddonModForumDiscussion } from '../../services/forum'; import { ADDON_MOD_FORUM_CHANGE_DISCUSSION_EVENT } from '../../constants'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; import { CoreSharedModule } from '@/core/shared.module'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * This component is meant to display a popover with the discussion options. diff --git a/src/addons/mod/forum/components/index/index.ts b/src/addons/mod/forum/components/index/index.ts index 961a9fd9d..6c5771c58 100644 --- a/src/addons/mod/forum/components/index/index.ts +++ b/src/addons/mod/forum/components/index/index.ts @@ -65,9 +65,9 @@ import { AddonModForumType, } from '@addons/mod/forum/constants'; import { CoreSearchGlobalSearch } from '@features/search/services/global-search'; -import { CoreToasts } from '@services/toasts'; -import { CorePopovers } from '@services/popovers'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts } from '@services/overlays/toasts'; +import { CorePopovers } from '@services/overlays/popovers'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays a forum entry page. */ diff --git a/src/addons/mod/forum/components/post/post.ts b/src/addons/mod/forum/components/post/post.ts index 04a356ec5..cebe03538 100644 --- a/src/addons/mod/forum/components/post/post.ts +++ b/src/addons/mod/forum/components/post/post.ts @@ -53,10 +53,10 @@ import { AddonModForumSharedPostFormData } from '../../pages/discussion/discussi import { CoreDom } from '@singletons/dom'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_FORUM_CHANGE_DISCUSSION_EVENT, ADDON_MOD_FORUM_COMPONENT } from '../../constants'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; import { toBoolean } from '@/core/transforms/boolean'; -import { CorePopovers } from '@services/popovers'; -import { CoreLoadings } from '@services/loadings'; +import { CorePopovers } from '@services/overlays/popovers'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreWSFile } from '@services/ws'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreWSError } from '@classes/errors/wserror'; diff --git a/src/addons/mod/forum/pages/discussion/discussion.ts b/src/addons/mod/forum/pages/discussion/discussion.ts index df9779cb4..31778c8aa 100644 --- a/src/addons/mod/forum/pages/discussion/discussion.ts +++ b/src/addons/mod/forum/pages/discussion/discussion.ts @@ -60,8 +60,8 @@ import { AddonModForumType, } from '../../constants'; import { CoreCourseContentsPage } from '@features/course/pages/contents/contents'; -import { CoreToasts } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreObject } from '@singletons/object'; diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts index ab009aa9f..8001b72ea 100644 --- a/src/addons/mod/forum/pages/new-discussion/new-discussion.ts +++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.ts @@ -52,7 +52,7 @@ import { ADDON_MOD_FORUM_NEW_DISCUSSION_EVENT, } from '../../constants'; import { CoreCourseContentsPage } from '@features/course/pages/contents/contents'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; type NewDiscussionData = { diff --git a/src/addons/mod/forum/services/handlers/post-link.ts b/src/addons/mod/forum/services/handlers/post-link.ts index 046731b9e..5c0f08e1b 100644 --- a/src/addons/mod/forum/services/handlers/post-link.ts +++ b/src/addons/mod/forum/services/handlers/post-link.ts @@ -18,7 +18,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl import { CoreCourse } from '@features/course/services/course'; import { CoreNavigator } from '@services/navigator'; import { CoreSitesReadingStrategy } from '@services/sites'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_FORUM_PAGE_NAME } from '../../constants'; diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts index 6e9a4df07..043e4c2e0 100644 --- a/src/addons/mod/glossary/components/index/index.ts +++ b/src/addons/mod/glossary/components/index/index.ts @@ -58,7 +58,7 @@ import { ADDON_MOD_GLOSSARY_PAGE_NAME, GLOSSARY_AUTO_SYNCED, } from '../../constants'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; /** * Component that displays a glossary entry page. diff --git a/src/addons/mod/glossary/pages/edit/edit.ts b/src/addons/mod/glossary/pages/edit/edit.ts index 59b62abbc..702485649 100644 --- a/src/addons/mod/glossary/pages/edit/edit.ts +++ b/src/addons/mod/glossary/pages/edit/edit.ts @@ -40,7 +40,7 @@ import { AddonModGlossaryHelper } from '../../services/glossary-helper'; import { AddonModGlossaryOffline } from '../../services/glossary-offline'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_GLOSSARY_COMPONENT } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays the edit form. diff --git a/src/addons/mod/glossary/pages/entry/entry.ts b/src/addons/mod/glossary/pages/entry/entry.ts index 5c0425525..e23d765e8 100644 --- a/src/addons/mod/glossary/pages/entry/entry.ts +++ b/src/addons/mod/glossary/pages/entry/entry.ts @@ -40,8 +40,8 @@ import { CoreTime } from '@singletons/time'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_GLOSSARY_COMPONENT, ADDON_MOD_GLOSSARY_ENTRY_UPDATED, ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants'; import { CoreCourseContentsPage } from '@features/course/pages/contents/contents'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays a glossary entry. diff --git a/src/addons/mod/glossary/services/handlers/edit-link.ts b/src/addons/mod/glossary/services/handlers/edit-link.ts index bd6f8e908..3d9216ca1 100644 --- a/src/addons/mod/glossary/services/handlers/edit-link.ts +++ b/src/addons/mod/glossary/services/handlers/edit-link.ts @@ -21,7 +21,7 @@ import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Content links handler for glossary new entry. diff --git a/src/addons/mod/glossary/services/handlers/entry-link.ts b/src/addons/mod/glossary/services/handlers/entry-link.ts index f890b2b73..735edda6c 100644 --- a/src/addons/mod/glossary/services/handlers/entry-link.ts +++ b/src/addons/mod/glossary/services/handlers/entry-link.ts @@ -22,7 +22,7 @@ import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { AddonModGlossary } from '../glossary'; import { ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Handler to treat links to glossary entries. diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts index 4a06bdea4..30ca179c5 100644 --- a/src/addons/mod/h5pactivity/components/index/index.ts +++ b/src/addons/mod/h5pactivity/components/index/index.ts @@ -54,7 +54,7 @@ import { ADDON_MOD_H5PACTIVITY_TRACK_COMPONENT, } from '../../constants'; import { CoreH5PMissingDependenciesError } from '@features/h5p/classes/errors/missing-dependencies-error'; -import { CoreToasts, ToastDuration } from '@services/toasts'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; import { Subscription } from 'rxjs'; import { NgZone, Translate } from '@singletons'; import { CoreError } from '@classes/errors/error'; diff --git a/src/addons/mod/h5pactivity/services/handlers/report-link.ts b/src/addons/mod/h5pactivity/services/handlers/report-link.ts index 1d70bfe31..acba0c538 100644 --- a/src/addons/mod/h5pactivity/services/handlers/report-link.ts +++ b/src/addons/mod/h5pactivity/services/handlers/report-link.ts @@ -24,7 +24,7 @@ import { CorePromiseUtils } from '@singletons/promise-utils'; import { makeSingleton } from '@singletons'; import { AddonModH5PActivity } from '../h5pactivity'; import { ADDON_MOD_H5PACTIVITY_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Handler to treat links to H5P activity report. diff --git a/src/addons/mod/imscp/pages/view/view.ts b/src/addons/mod/imscp/pages/view/view.ts index ad4e232ad..fba93136a 100644 --- a/src/addons/mod/imscp/pages/view/view.ts +++ b/src/addons/mod/imscp/pages/view/view.ts @@ -27,7 +27,7 @@ import { CoreErrorHelper } from '@services/error-helper'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { Translate } from '@singletons'; import { AddonModImscp, AddonModImscpImscp, AddonModImscpTocItem } from '../../services/imscp'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Page that displays a IMSCP content. diff --git a/src/addons/mod/lesson/pages/player/player.ts b/src/addons/mod/lesson/pages/player/player.ts index 618797f69..a6d879c53 100644 --- a/src/addons/mod/lesson/pages/player/player.ts +++ b/src/addons/mod/lesson/pages/player/player.ts @@ -54,7 +54,7 @@ import { AddonModLessonSync } from '../../services/lesson-sync'; import { CoreFormFields, CoreForms } from '@singletons/form'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_LESSON_COMPONENT, AddonModLessonJumpTo } from '../../constants'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreWSError } from '@classes/errors/wserror'; import { CoreDom } from '@singletons/dom'; diff --git a/src/addons/mod/lesson/services/handlers/grade-link.ts b/src/addons/mod/lesson/services/handlers/grade-link.ts index de59e4418..539c17512 100644 --- a/src/addons/mod/lesson/services/handlers/grade-link.ts +++ b/src/addons/mod/lesson/services/handlers/grade-link.ts @@ -23,7 +23,7 @@ import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { AddonModLesson } from '../lesson'; import { ADDON_MOD_LESSON_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Handler to treat links to lesson grade. diff --git a/src/addons/mod/lesson/services/handlers/index-link.ts b/src/addons/mod/lesson/services/handlers/index-link.ts index adb07e876..5121a8ac6 100644 --- a/src/addons/mod/lesson/services/handlers/index-link.ts +++ b/src/addons/mod/lesson/services/handlers/index-link.ts @@ -19,7 +19,7 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl import { CoreCourse } from '@features/course/services/course'; import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CoreSitesReadingStrategy } from '@services/sites'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { makeSingleton } from '@singletons'; import { AddonModLesson } from '../lesson'; diff --git a/src/addons/mod/lesson/services/handlers/prefetch.ts b/src/addons/mod/lesson/services/handlers/prefetch.ts index 853d3550c..8c3effc9d 100644 --- a/src/addons/mod/lesson/services/handlers/prefetch.ts +++ b/src/addons/mod/lesson/services/handlers/prefetch.ts @@ -21,7 +21,7 @@ import { CoreFilepool } from '@services/filepool'; import { CoreGroups } from '@services/groups'; import { CoreFileSizeSum, CorePluginFileDelegate } from '@services/plugin-file-delegate'; import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreWSFile } from '@services/ws'; import { makeSingleton, Translate } from '@singletons'; diff --git a/src/addons/mod/lesson/services/handlers/report-link.ts b/src/addons/mod/lesson/services/handlers/report-link.ts index e22aab6c7..c897784ee 100644 --- a/src/addons/mod/lesson/services/handlers/report-link.ts +++ b/src/addons/mod/lesson/services/handlers/report-link.ts @@ -22,7 +22,7 @@ import { CoreSitesReadingStrategy } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { ADDON_MOD_LESSON_PAGE_NAME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Handler to treat links to lesson report. diff --git a/src/addons/mod/lti/services/lti-helper.ts b/src/addons/mod/lti/services/lti-helper.ts index 66fe7d200..dd655edc3 100644 --- a/src/addons/mod/lti/services/lti-helper.ts +++ b/src/addons/mod/lti/services/lti-helper.ts @@ -23,7 +23,7 @@ import { makeSingleton } from '@singletons'; import { CoreEvents } from '@singletons/events'; import { AddonModLti, AddonModLtiLti } from './lti'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Service that provides some helper functions for LTI. diff --git a/src/addons/mod/quiz/classes/auto-save.ts b/src/addons/mod/quiz/classes/auto-save.ts index 17fc9e6c0..9798d94db 100644 --- a/src/addons/mod/quiz/classes/auto-save.ts +++ b/src/addons/mod/quiz/classes/auto-save.ts @@ -18,7 +18,7 @@ import { CoreQuestionHelper } from '@features/question/services/question-helper' import { CoreQuestionsAnswers } from '@features/question/services/question'; import { CoreLogger } from '@singletons/logger'; import { AddonModQuiz, AddonModQuizAttemptWSData, AddonModQuizQuizWSData } from '../services/quiz'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; /** * Class to support auto-save in quiz. Every certain seconds, it will check if there are changes in the current page answers diff --git a/src/addons/mod/quiz/pages/player/player.ts b/src/addons/mod/quiz/pages/player/player.ts index b15811d56..7872dfd77 100644 --- a/src/addons/mod/quiz/pages/player/player.ts +++ b/src/addons/mod/quiz/pages/player/player.ts @@ -54,8 +54,8 @@ import { CoreWSError } from '@classes/errors/wserror'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_QUIZ_ATTEMPT_FINISHED_EVENT, AddonModQuizAttemptStates, ADDON_MOD_QUIZ_COMPONENT } from '../../constants'; import { CoreWait } from '@singletons/wait'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that allows attempting a quiz. diff --git a/src/addons/mod/quiz/pages/review/review.ts b/src/addons/mod/quiz/pages/review/review.ts index da4db89ae..e392e0b5f 100644 --- a/src/addons/mod/quiz/pages/review/review.ts +++ b/src/addons/mod/quiz/pages/review/review.ts @@ -35,7 +35,7 @@ import { import { AddonModQuizHelper } from '../../services/quiz-helper'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_QUIZ_COMPONENT } from '../../constants'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Page that allows reviewing a quiz attempt. diff --git a/src/addons/mod/quiz/services/quiz-helper.ts b/src/addons/mod/quiz/services/quiz-helper.ts index db7699497..febbe0103 100644 --- a/src/addons/mod/quiz/services/quiz-helper.ts +++ b/src/addons/mod/quiz/services/quiz-helper.ts @@ -40,8 +40,8 @@ import { import { QuestionDisplayOptionsMarks } from '@features/question/constants'; import { CoreGroups } from '@services/groups'; import { CoreTimeUtils } from '@services/utils/time'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; import { convertTextToHTMLElement } from '@/core/utils/create-html-element'; import { CorePromiseUtils } from '@singletons/promise-utils'; diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts index 84ce659f7..970033c76 100644 --- a/src/addons/mod/resource/services/resource-helper.ts +++ b/src/addons/mod/resource/services/resource-helper.ts @@ -31,7 +31,7 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { CoreText } from '@singletons/text'; import { CoreTimeUtils } from '@services/utils/time'; import { ADDON_MOD_RESOURCE_COMPONENT } from '../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreOpenerOpenFileOptions } from '@singletons/opener'; /** diff --git a/src/addons/mod/scorm/pages/player/player.ts b/src/addons/mod/scorm/pages/player/player.ts index 7e8987be4..fe96177cf 100644 --- a/src/addons/mod/scorm/pages/player/player.ts +++ b/src/addons/mod/scorm/pages/player/player.ts @@ -42,7 +42,7 @@ import { ADDON_MOD_SCORM_UPDATE_TOC_EVENT, } from '../../constants'; import { CoreWait } from '@singletons/wait'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Page that allows playing a SCORM. diff --git a/src/addons/mod/subsection/services/handlers/index-link.ts b/src/addons/mod/subsection/services/handlers/index-link.ts index 18455aca7..58f324f9b 100644 --- a/src/addons/mod/subsection/services/handlers/index-link.ts +++ b/src/addons/mod/subsection/services/handlers/index-link.ts @@ -16,7 +16,7 @@ import { Injectable } from '@angular/core'; import { CoreContentLinksModuleIndexHandler } from '@features/contentlinks/classes/module-index-handler'; import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate'; import { CoreCourse } from '@features/course/services/course'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton } from '@singletons'; import { CoreSites } from '@services/sites'; diff --git a/src/addons/mod/survey/components/index/index.ts b/src/addons/mod/survey/components/index/index.ts index ab9bf61ed..ad3c25cb8 100644 --- a/src/addons/mod/survey/components/index/index.ts +++ b/src/addons/mod/survey/components/index/index.ts @@ -38,7 +38,7 @@ import { } from '../../services/survey-sync'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { ADDON_MOD_SURVEY_AUTO_SYNCED, ADDON_MOD_SURVEY_COMPONENT } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays a survey. diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts index 27512cf62..a66870387 100644 --- a/src/addons/mod/url/services/handlers/module.ts +++ b/src/addons/mod/url/services/handlers/module.ts @@ -20,7 +20,7 @@ import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/servic import { CoreCourseModuleData } from '@features/course/services/course-helper'; import { CoreCourseModuleHandler, CoreCourseModuleHandlerData } from '@features/course/services/module-delegate'; import { CoreNavigationOptions } from '@services/navigator'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { makeSingleton } from '@singletons'; import { AddonModUrl } from '../url'; diff --git a/src/addons/mod/url/services/url-helper.ts b/src/addons/mod/url/services/url-helper.ts index e379b7269..710df28cc 100644 --- a/src/addons/mod/url/services/url-helper.ts +++ b/src/addons/mod/url/services/url-helper.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Injectable } from '@angular/core'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreSites } from '@services/sites'; import { makeSingleton } from '@singletons'; diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts index 77bef4766..bad6d8548 100644 --- a/src/addons/mod/wiki/components/index/index.ts +++ b/src/addons/mod/wiki/components/index/index.ts @@ -58,8 +58,8 @@ import { ADDON_MOD_WIKI_PAGE_CREATED_EVENT, ADDON_MOD_WIKI_PAGE_NAME, } from '../../constants'; -import { CoreModals } from '@services/modals'; -import { CorePopovers } from '@services/popovers'; +import { CoreModals } from '@services/overlays/modals'; +import { CorePopovers } from '@services/overlays/popovers'; /** * Component that displays a wiki entry page. diff --git a/src/addons/mod/wiki/pages/edit/edit.ts b/src/addons/mod/wiki/pages/edit/edit.ts index daf0e2d40..19f13cadf 100644 --- a/src/addons/mod/wiki/pages/edit/edit.ts +++ b/src/addons/mod/wiki/pages/edit/edit.ts @@ -32,7 +32,7 @@ import { AddonModWikiOffline } from '../../services/wiki-offline'; import { AddonModWikiSync } from '../../services/wiki-sync'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ADDON_MOD_WIKI_COMPONENT, ADDON_MOD_WIKI_PAGE_CREATED_EVENT, ADDON_MOD_WIKI_RENEW_LOCK_TIME } from '../../constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreFileHelper } from '@services/file-helper'; /** diff --git a/src/addons/mod/wiki/services/handlers/create-link-lazy.ts b/src/addons/mod/wiki/services/handlers/create-link-lazy.ts index 977b10968..8187226df 100644 --- a/src/addons/mod/wiki/services/handlers/create-link-lazy.ts +++ b/src/addons/mod/wiki/services/handlers/create-link-lazy.ts @@ -22,7 +22,7 @@ import { makeSingleton } from '@singletons'; import { AddonModWiki } from '../wiki'; import { ADDON_MOD_WIKI_PAGE_NAME } from '../../constants'; import { AddonModWikiCreateLinkHandlerService } from '@addons/mod/wiki/services/handlers/create-link'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Handler to treat links to create a wiki page. diff --git a/src/addons/mod/wiki/services/handlers/edit-link-lazy.ts b/src/addons/mod/wiki/services/handlers/edit-link-lazy.ts index 0bdc5b3df..fcdda3e5f 100644 --- a/src/addons/mod/wiki/services/handlers/edit-link-lazy.ts +++ b/src/addons/mod/wiki/services/handlers/edit-link-lazy.ts @@ -21,7 +21,7 @@ import { makeSingleton } from '@singletons'; import { AddonModWiki } from '../wiki'; import { ADDON_MOD_WIKI_PAGE_NAME } from '../../constants'; import { AddonModWikiEditLinkHandlerService } from '@addons/mod/wiki/services/handlers/edit-link'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Handler to treat links to edit a wiki page. diff --git a/src/addons/mod/wiki/services/handlers/page-or-map-link-lazy.ts b/src/addons/mod/wiki/services/handlers/page-or-map-link-lazy.ts index d8db96fcb..7c2319b35 100644 --- a/src/addons/mod/wiki/services/handlers/page-or-map-link-lazy.ts +++ b/src/addons/mod/wiki/services/handlers/page-or-map-link-lazy.ts @@ -22,7 +22,7 @@ import { Md5 } from 'ts-md5'; import { AddonModWiki } from '../wiki'; import { ADDON_MOD_WIKI_PAGE_NAME } from '../../constants'; import { AddonModWikiPageOrMapLinkHandlerService } from '@addons/mod/wiki/services/handlers/page-or-map-link'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Handler to treat links to a wiki page or the wiki map. diff --git a/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts b/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts index d237d0482..b7e016b05 100644 --- a/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts +++ b/src/addons/mod/workshop/components/assessment-strategy/assessment-strategy.ts @@ -42,7 +42,7 @@ import { AddonModWorkshopOverallFeedbackMode, } from '@addons/mod/workshop/constants'; import { toBoolean } from '@/core/transforms/boolean'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreWSError } from '@classes/errors/wserror'; import { CoreObject } from '@singletons/object'; diff --git a/src/addons/mod/workshop/components/assessment/assessment.ts b/src/addons/mod/workshop/components/assessment/assessment.ts index 9be8235fd..ed8509410 100644 --- a/src/addons/mod/workshop/components/assessment/assessment.ts +++ b/src/addons/mod/workshop/components/assessment/assessment.ts @@ -26,7 +26,7 @@ import { AddonModWorkshopSubmissionDataWithOfflineData, } from '../../services/workshop-helper'; import { AddonModWorkshopOffline } from '../../services/workshop-offline'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays workshop assessment. diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts index 20e3d6346..26223abf9 100644 --- a/src/addons/mod/workshop/components/index/index.ts +++ b/src/addons/mod/workshop/components/index/index.ts @@ -21,7 +21,7 @@ import { IonContent } from '@ionic/angular'; import { CoreGroupInfo, CoreGroups } from '@services/groups'; import { CoreNavigator } from '@services/navigator'; import { CorePlatform } from '@services/platform'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreObject } from '@singletons/object'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { Subscription } from 'rxjs'; diff --git a/src/addons/mod/workshop/pages/assessment/assessment.ts b/src/addons/mod/workshop/pages/assessment/assessment.ts index 53f591a08..41b88263c 100644 --- a/src/addons/mod/workshop/pages/assessment/assessment.ts +++ b/src/addons/mod/workshop/pages/assessment/assessment.ts @@ -44,7 +44,7 @@ import { ADDON_MOD_WORKSHOP_COMPONENT, AddonModWorkshopPhase, } from '@addons/mod/workshop/constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays a workshop assessment. diff --git a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts index 5908e9c2e..efef8fbc0 100644 --- a/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts +++ b/src/addons/mod/workshop/pages/edit-submission/edit-submission.ts @@ -44,7 +44,7 @@ import { AddonModWorkshopAction, AddonModWorkshopSubmissionType, } from '@addons/mod/workshop/constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreDom } from '@singletons/dom'; /** diff --git a/src/addons/mod/workshop/pages/submission/submission.ts b/src/addons/mod/workshop/pages/submission/submission.ts index d7977bab1..83d30b56f 100644 --- a/src/addons/mod/workshop/pages/submission/submission.ts +++ b/src/addons/mod/workshop/pages/submission/submission.ts @@ -55,7 +55,7 @@ import { AddonModWorkshopAction, AddonModWorkshopPhase, } from '@addons/mod/workshop/constants'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays a workshop submission. diff --git a/src/addons/notes/components/add/add-modal.ts b/src/addons/notes/components/add/add-modal.ts index be4d547e8..bc4ee426b 100644 --- a/src/addons/notes/components/add/add-modal.ts +++ b/src/addons/notes/components/add/add-modal.ts @@ -20,8 +20,8 @@ import { CoreForms } from '@singletons/form'; import { ModalController } from '@singletons'; import { CoreKeyboard } from '@singletons/keyboard'; import { CoreSharedModule } from '@/core/shared.module'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays a text area for composing a note. diff --git a/src/addons/notes/pages/list/list.ts b/src/addons/notes/pages/list/list.ts index 31e46570f..43fffa8e0 100644 --- a/src/addons/notes/pages/list/list.ts +++ b/src/addons/notes/pages/list/list.ts @@ -31,8 +31,8 @@ import { CorePromiseUtils } from '@singletons/promise-utils'; import { Translate } from '@singletons'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreTime } from '@singletons/time'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CoreModals } from '@services/modals'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CoreModals } from '@services/overlays/modals'; import { ADDON_NOTES_AUTO_SYNCED } from '@addons/notes/services/constants'; /** diff --git a/src/addons/notifications/pages/settings/settings.ts b/src/addons/notifications/pages/settings/settings.ts index f8729db9a..0484f0731 100644 --- a/src/addons/notifications/pages/settings/settings.ts +++ b/src/addons/notifications/pages/settings/settings.ts @@ -40,7 +40,7 @@ import { CoreTime } from '@singletons/time'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { Translate } from '@singletons'; import { CoreErrorHelper } from '@services/error-helper'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays notifications settings. diff --git a/src/addons/privatefiles/pages/index/index.ts b/src/addons/privatefiles/pages/index/index.ts index 1e4668a65..9f201a8ec 100644 --- a/src/addons/privatefiles/pages/index/index.ts +++ b/src/addons/privatefiles/pages/index/index.ts @@ -33,10 +33,10 @@ import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreNavigator } from '@services/navigator'; import { CoreTime } from '@singletons/time'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreFilepool } from '@services/filepool'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; import { AddonPrivateFilesFileComponent } from '@addons/privatefiles/components/file/file'; /** diff --git a/src/addons/privatefiles/services/privatefiles-helper.ts b/src/addons/privatefiles/services/privatefiles-helper.ts index c5d14ae9a..089e5cca6 100644 --- a/src/addons/privatefiles/services/privatefiles-helper.ts +++ b/src/addons/privatefiles/services/privatefiles-helper.ts @@ -15,12 +15,12 @@ import { Injectable } from '@angular/core'; import { CoreSites } from '@services/sites'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuploader-helper'; import { AddonPrivateFiles, AddonPrivateFilesGetUserInfoWSResult } from './privatefiles'; import { CoreError } from '@classes/errors/error'; import { makeSingleton, Translate } from '@singletons'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; /** * Service that provides some helper functions regarding private and site files. diff --git a/src/addons/report/insights/services/handlers/action-link.ts b/src/addons/report/insights/services/handlers/action-link.ts index 5bbc98433..9e1de6ae5 100644 --- a/src/addons/report/insights/services/handlers/action-link.ts +++ b/src/addons/report/insights/services/handlers/action-link.ts @@ -20,8 +20,8 @@ import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; import { makeSingleton, Translate } from '@singletons'; import { AddonReportInsights } from '../insights'; -import { CoreToasts } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; // Bulk actions supported, along with the related lang string. const BULK_ACTIONS = { diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.ts b/src/addons/storagemanager/pages/course-storage/course-storage.ts index 899a2eb1d..b01ecd45d 100644 --- a/src/addons/storagemanager/pages/course-storage/course-storage.ts +++ b/src/addons/storagemanager/pages/course-storage/course-storage.ts @@ -28,7 +28,7 @@ import { CoreCourseModulePrefetchHandler } from '@features/course/services/module-prefetch-delegate'; import { CoreCourses } from '@features/courses/services/courses'; import { AccordionGroupChangeEventDetail } from '@ionic/angular'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreNavigator } from '@services/navigator'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts index 857ac0d2f..ae52b8971 100644 --- a/src/addons/storagemanager/pages/courses-storage/courses-storage.ts +++ b/src/addons/storagemanager/pages/courses-storage/courses-storage.ts @@ -21,7 +21,7 @@ import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CoreCourses, CoreEnrolledCourseData } from '@features/courses/services/courses'; import { CoreSettingsHelper, CoreSiteSpaceUsage } from '@features/settings/services/settings-helper'; import { CoreSiteHome } from '@features/sitehome/services/sitehome'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreNavigator } from '@services/navigator'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/core/classes/page-loads-manager.ts b/src/core/classes/page-loads-manager.ts index 174f6a66d..1bf43f50b 100644 --- a/src/core/classes/page-loads-manager.ts +++ b/src/core/classes/page-loads-manager.ts @@ -13,7 +13,7 @@ // limitations under the License. import { CoreNavigator } from '@services/navigator'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { Subject } from 'rxjs'; import { AsyncDirective } from './async-directive'; import { PageLoadWatcher } from './page-load-watcher'; diff --git a/src/core/classes/sites/authenticated-site.ts b/src/core/classes/sites/authenticated-site.ts index 3d60d14f2..714272f54 100644 --- a/src/core/classes/sites/authenticated-site.ts +++ b/src/core/classes/sites/authenticated-site.ts @@ -21,7 +21,7 @@ import { CoreWSPreSetsSplitRequest, CoreWSTypeExpected, } from '@services/ws'; -import { CoreToasts, ToastDuration } from '@services/toasts'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; import { CoreText } from '@singletons/text'; import { CoreUtils } from '@singletons/utils'; import { CoreCacheUpdateFrequency, CoreConstants, MINIMUM_MOODLE_VERSION, MOODLE_RELEASES } from '@/core/constants'; diff --git a/src/core/classes/sites/site.ts b/src/core/classes/sites/site.ts index 296b5d9d0..25aa422c7 100644 --- a/src/core/classes/sites/site.ts +++ b/src/core/classes/sites/site.ts @@ -54,7 +54,7 @@ import { CoreSiteInfo } from './unauthenticated-site'; import { CoreAuthenticatedSite, CoreAuthenticatedSiteOptionalData, CoreSiteWSPreSets, WSObservable } from './authenticated-site'; import { firstValueFrom } from 'rxjs'; import { CorePlatform } from '@services/platform'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; /** diff --git a/src/core/components/combobox/combobox.ts b/src/core/components/combobox/combobox.ts index 8602dec8d..c994b8ad9 100644 --- a/src/core/components/combobox/combobox.ts +++ b/src/core/components/combobox/combobox.ts @@ -15,7 +15,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Translate } from '@singletons'; import { ModalOptions } from '@ionic/core'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { toBoolean } from '@/core/transforms/boolean'; diff --git a/src/core/components/context-menu/context-menu.ts b/src/core/components/context-menu/context-menu.ts index 44f1d470e..353e2e1ed 100644 --- a/src/core/components/context-menu/context-menu.ts +++ b/src/core/components/context-menu/context-menu.ts @@ -15,7 +15,7 @@ import { Component, Input, OnInit, OnDestroy, ElementRef, ChangeDetectorRef } from '@angular/core'; import { Subject, Subscription } from 'rxjs'; import { auditTime } from 'rxjs/operators'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; import { CoreUtils } from '@singletons/utils'; import { Translate } from '@singletons'; import { CoreContextMenuItemComponent } from './context-menu-item'; diff --git a/src/core/components/local-file/local-file.ts b/src/core/components/local-file/local-file.ts index e05d3865e..9ac652940 100644 --- a/src/core/components/local-file/local-file.ts +++ b/src/core/components/local-file/local-file.ts @@ -28,7 +28,7 @@ import { CoreForms } from '@singletons/form'; import { CorePath } from '@singletons/path'; import { CorePlatform } from '@services/platform'; import { toBoolean } from '@/core/transforms/boolean'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreFileUtils } from '@singletons/file-utils'; /** diff --git a/src/core/components/password-modal/password-modal.ts b/src/core/components/password-modal/password-modal.ts index 519a707cb..9c7a026e7 100644 --- a/src/core/components/password-modal/password-modal.ts +++ b/src/core/components/password-modal/password-modal.ts @@ -17,7 +17,7 @@ import { Component, ViewChild, ElementRef, Input } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreForms } from '@singletons/form'; import { ModalController } from '@singletons'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Modal that asks the password. diff --git a/src/core/components/sheet-modal/sheet-modal.ts b/src/core/components/sheet-modal/sheet-modal.ts index 9870071d2..69db82b92 100644 --- a/src/core/components/sheet-modal/sheet-modal.ts +++ b/src/core/components/sheet-modal/sheet-modal.ts @@ -16,7 +16,7 @@ import { Constructor } from '@/core/utils/types'; import { AfterViewInit, Component, ElementRef, Input, ViewChild } from '@angular/core'; import { CoreModalComponent } from '@classes/modal-component'; import { CorePromisedValue } from '@classes/promised-value'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreWait } from '@singletons/wait'; import { AngularFrameworkDelegate } from '@singletons'; import { CoreDirectivesRegistry } from '@singletons/directives-registry'; diff --git a/src/core/core.module.ts b/src/core/core.module.ts index fee9c1c4f..35da2af97 100644 --- a/src/core/core.module.ts +++ b/src/core/core.module.ts @@ -36,7 +36,7 @@ export async function getCoreServices(): Promise[]> { const { CoreDbProvider } = await import('@services/db'); const { CoreDomUtilsProvider } = await import('@services/utils/dom'); const { CoreErrorHelperService } = await import('@services/error-helper'); - const { CoreToastsService } = await import('@services/toasts'); + const { CoreToastsService } = await import('@services/overlays/toasts'); const { CoreFileHelperProvider } = await import('@services/file-helper'); const { CoreFilepoolProvider } = await import('@services/filepool'); const { CoreFileProvider } = await import('@services/file'); @@ -49,7 +49,7 @@ export async function getCoreServices(): Promise[]> { const { CoreMimetypeUtilsProvider } = await import('@services/utils/mimetype'); const { CoreNavigatorService } = await import('@services/navigator'); const { CorePluginFileDelegateService } = await import('@services/plugin-file-delegate'); - const { CorePopoversService } = await import('@services/popovers'); + const { CorePopoversService } = await import('@services/overlays/popovers'); const { CoreScreenService } = await import('@services/screen'); const { CoreSitesProvider } = await import('@services/sites'); const { CoreSyncProvider } = await import('@services/sync'); @@ -62,7 +62,7 @@ export async function getCoreServices(): Promise[]> { const { CoreWSProvider } = await import('@services/ws'); const { CorePlatformService } = await import('@services/platform'); const { CoreQRScanService } = await import('@services/qrscan'); - const { CoreLoadingsService } = await import('@services/loadings'); + const { CoreLoadingsService } = await import('@services/overlays/loadings'); return [ CoreAppProvider, diff --git a/src/core/directives/download-file.ts b/src/core/directives/download-file.ts index dc1fd9428..376b5c4c1 100644 --- a/src/core/directives/download-file.ts +++ b/src/core/directives/download-file.ts @@ -14,7 +14,7 @@ import { Directive, Input, OnInit, ElementRef } from '@angular/core'; import { CoreFileHelper } from '@services/file-helper'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreWSFile } from '@services/ws'; diff --git a/src/core/directives/link.ts b/src/core/directives/link.ts index 02380e6f2..fd31cd937 100644 --- a/src/core/directives/link.ts +++ b/src/core/directives/link.ts @@ -27,7 +27,7 @@ import { DomSanitizer } from '@singletons'; import { CoreFilepool } from '@services/filepool'; import { CoreDom } from '@singletons/dom'; import { toBoolean } from '../transforms/boolean'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Directive to open a link in external browser or in the app. diff --git a/src/core/directives/reading-mode.ts b/src/core/directives/reading-mode.ts index f46a5f124..476efb097 100644 --- a/src/core/directives/reading-mode.ts +++ b/src/core/directives/reading-mode.ts @@ -24,7 +24,7 @@ import { CoreIcons } from '@singletons/icons'; import { CoreDom } from '@singletons/dom'; import { CoreWait } from '@singletons/wait'; import { CoreCancellablePromise } from '@classes/cancellable-promise'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreViewer } from '@features/viewer/services/viewer'; import { CoreDirectivesRegistry } from '@singletons/directives-registry'; import { CoreCollapsibleHeaderDirective } from './collapsible-header'; diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts index 67cc3ceb4..a1d12ca5f 100644 --- a/src/core/features/block/components/side-blocks-button/side-blocks-button.ts +++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.ts @@ -16,7 +16,7 @@ import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; import { CoreCancellablePromise } from '@classes/cancellable-promise'; import { CoreUserTourDirectiveOptions } from '@directives/user-tour'; import { CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/services/user-tours'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreDom } from '@singletons/dom'; import { CoreBlockSideBlocksTourComponent } from '../side-blocks-tour/side-blocks-tour'; import { ContextLevel } from '@/core/constants'; diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts index e063f3678..e4f4f2ec9 100644 --- a/src/core/features/comments/pages/viewer/viewer.ts +++ b/src/core/features/comments/pages/viewer/viewer.ts @@ -42,8 +42,8 @@ import moment from 'moment-timezone'; import { Subscription } from 'rxjs'; import { CoreAnimations } from '@components/animations'; import { CoreKeyboard } from '@singletons/keyboard'; -import { CoreToasts, ToastDuration } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CORE_COMMENTS_AUTO_SYNCED } from '@features/comments/constants'; /** diff --git a/src/core/features/contentlinks/classes/module-grade-handler.ts b/src/core/features/contentlinks/classes/module-grade-handler.ts index 48cbec60a..218979722 100644 --- a/src/core/features/contentlinks/classes/module-grade-handler.ts +++ b/src/core/features/contentlinks/classes/module-grade-handler.ts @@ -15,7 +15,7 @@ import { CoreContentLinksAction } from '../services/contentlinks-delegate'; import { CoreContentLinksHandlerBase } from './base-handler'; import { CoreSites } from '@services/sites'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreCourseHelper } from '@features/course/services/course-helper'; /** diff --git a/src/core/features/contentlinks/services/contentlinks-helper.ts b/src/core/features/contentlinks/services/contentlinks-helper.ts index 979eb29ef..a76c68d33 100644 --- a/src/core/features/contentlinks/services/contentlinks-helper.ts +++ b/src/core/features/contentlinks/services/contentlinks-helper.ts @@ -20,7 +20,7 @@ import { CoreSite } from '@classes/sites/site'; import { makeSingleton, Translate } from '@singletons'; import { CoreNavigator } from '@services/navigator'; import { CoreCustomURLSchemes } from '@services/urlschemes'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Service that provides some features regarding content links. diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts index 2003c1e5b..a49f8a3e2 100644 --- a/src/core/features/course/classes/main-resource-component.ts +++ b/src/core/features/course/classes/main-resource-component.ts @@ -33,7 +33,7 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { CoreUrl } from '@singletons/url'; import { CoreTime } from '@singletons/time'; import { CoreText } from '@singletons/text'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreErrorHelper, CoreErrorObject } from '@services/error-helper'; import { CorePromiseUtils } from '@singletons/promise-utils'; diff --git a/src/core/features/course/components/course-format/course-format.ts b/src/core/features/course/components/course-format/course-format.ts index 83548c870..6f45c0fd0 100644 --- a/src/core/features/course/components/course-format/course-format.ts +++ b/src/core/features/course/components/course-format/course-format.ts @@ -52,7 +52,7 @@ import { CoreDom } from '@singletons/dom'; import { CoreUserTourDirectiveOptions } from '@directives/user-tour'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ContextLevel } from '@/core/constants'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreSharedModule } from '@/core/shared.module'; import { CoreBlockComponentsModule } from '@features/block/components/components.module'; import { CoreSites } from '@services/sites'; diff --git a/src/core/features/course/components/module-completion/module-completion.ts b/src/core/features/course/components/module-completion/module-completion.ts index 55689504f..1f82c9c99 100644 --- a/src/core/features/course/components/module-completion/module-completion.ts +++ b/src/core/features/course/components/module-completion/module-completion.ts @@ -16,7 +16,7 @@ import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChange } from '@a import { CoreCourseModuleCompletionBaseComponent } from '@features/course/classes/module-completion'; import { CoreCourseModuleCompletionStatus } from '@features/course/constants'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CoreUser } from '@features/user/services/user'; import { Translate } from '@singletons'; diff --git a/src/core/features/course/components/module-navigation/module-navigation.ts b/src/core/features/course/components/module-navigation/module-navigation.ts index d831d2fd2..cf4f5f7f4 100644 --- a/src/core/features/course/components/module-navigation/module-navigation.ts +++ b/src/core/features/course/components/module-navigation/module-navigation.ts @@ -17,7 +17,7 @@ import { CoreCourse, CoreCourseWSSection } from '@features/course/services/cours import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper'; import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate'; import { IonContent } from '@ionic/angular'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreNavigationOptions, CoreNavigator } from '@services/navigator'; import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/core/features/course/directives/download-module-main-file.ts b/src/core/features/course/directives/download-module-main-file.ts index 82f95acab..0f8df12b8 100644 --- a/src/core/features/course/directives/download-module-main-file.ts +++ b/src/core/features/course/directives/download-module-main-file.ts @@ -17,7 +17,7 @@ import { Directive, Input, OnInit, ElementRef } from '@angular/core'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/services/course'; import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreOpenerOpenFileOptions } from '@singletons/opener'; /** diff --git a/src/core/features/course/pages/module-preview/module-preview.ts b/src/core/features/course/pages/module-preview/module-preview.ts index b310da7b4..fec9c3a88 100644 --- a/src/core/features/course/pages/module-preview/module-preview.ts +++ b/src/core/features/course/pages/module-preview/module-preview.ts @@ -17,7 +17,7 @@ import { CoreCourseModuleSummaryResult } from '@features/course/components/modul import { CoreCourse } from '@features/course/services/course'; import { CoreCourseHelper, CoreCourseModuleData } from '@features/course/services/course-helper'; import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreNavigator } from '@services/navigator'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts index 16f50b174..56ab342e8 100644 --- a/src/core/features/course/services/course-helper.ts +++ b/src/core/features/course/services/course-helper.ts @@ -73,8 +73,8 @@ import { CoreLocalNotifications } from '@services/local-notifications'; import { CoreEnrol } from '@features/enrol/services/enrol'; import { CoreEnrolAction, CoreEnrolDelegate } from '@features/enrol/services/enrol-delegate'; import { LazyRoutesModule } from '@/app/app-routing.module'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreCourseModuleCompletionTracking, CoreCourseModuleCompletionStatus, diff --git a/src/core/features/course/services/course.ts b/src/core/features/course/services/course.ts index 3db9b068f..6311590fc 100644 --- a/src/core/features/course/services/course.ts +++ b/src/core/features/course/services/course.ts @@ -57,7 +57,7 @@ import { asyncObservable } from '@/core/utils/rxjs'; import { firstValueFrom } from 'rxjs'; import { map } from 'rxjs/operators'; import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreArray } from '@singletons/array'; import { CoreText } from '@singletons/text'; import { ArrayElement } from '@/core/utils/types'; diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts index 98810f867..962146b88 100644 --- a/src/core/features/courses/components/course-list-item/course-list-item.ts +++ b/src/core/features/courses/components/course-list-item/course-list-item.ts @@ -28,8 +28,8 @@ import { CoreCoursesHelper, CoreEnrolledCourseDataWithExtraInfoAndOptions } from import { CoreEnrolHelper } from '@features/enrol/services/enrol-helper'; import { CoreDownloadStatusTranslatable } from '@components/download-refresh/download-refresh'; import { toBoolean } from '@/core/transforms/boolean'; -import { CorePopovers } from '@services/popovers'; -import { CoreLoadings } from '@services/loadings'; +import { CorePopovers } from '@services/overlays/popovers'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CORE_COURSES_MY_COURSES_UPDATED_EVENT, CoreCoursesMyCoursesUpdatedEventAction, diff --git a/src/core/features/courses/services/handlers/base-link-handler.ts b/src/core/features/courses/services/handlers/base-link-handler.ts index 7e09c897a..934f54152 100644 --- a/src/core/features/courses/services/handlers/base-link-handler.ts +++ b/src/core/features/courses/services/handlers/base-link-handler.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler'; import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CoreCourses } from '../courses'; diff --git a/src/core/features/courses/services/handlers/enrol-push-click.ts b/src/core/features/courses/services/handlers/enrol-push-click.ts index 424fd4e28..20000128b 100644 --- a/src/core/features/courses/services/handlers/enrol-push-click.ts +++ b/src/core/features/courses/services/handlers/enrol-push-click.ts @@ -17,7 +17,7 @@ import { Params } from '@angular/router'; import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CorePushNotificationsClickHandler } from '@features/pushnotifications/services/push-delegate'; import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifications/services/pushnotifications'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreNavigator } from '@services/navigator'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@singletons/utils'; diff --git a/src/core/features/courses/services/handlers/request-push-click.ts b/src/core/features/courses/services/handlers/request-push-click.ts index 265cc1d80..2fcc33066 100644 --- a/src/core/features/courses/services/handlers/request-push-click.ts +++ b/src/core/features/courses/services/handlers/request-push-click.ts @@ -24,7 +24,7 @@ import { CoreUtils } from '@singletons/utils'; import { makeSingleton } from '@singletons'; import { CorePath } from '@singletons/path'; import { CoreCourses } from '../courses'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; /** diff --git a/src/core/features/dataprivacy/components/contactdpo/contactdpo.ts b/src/core/features/dataprivacy/components/contactdpo/contactdpo.ts index f9cce9830..b98805def 100644 --- a/src/core/features/dataprivacy/components/contactdpo/contactdpo.ts +++ b/src/core/features/dataprivacy/components/contactdpo/contactdpo.ts @@ -19,11 +19,11 @@ import { CoreDataPrivacy } from '@features/dataprivacy/services/dataprivacy'; import { CoreUser } from '@features/user/services/user'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreToasts, ToastDuration } from '@services/toasts'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { ModalController } from '@singletons'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays the contact DPO page. diff --git a/src/core/features/dataprivacy/components/newrequest/newrequest.ts b/src/core/features/dataprivacy/components/newrequest/newrequest.ts index 1c29cb690..5d0cfe975 100644 --- a/src/core/features/dataprivacy/components/newrequest/newrequest.ts +++ b/src/core/features/dataprivacy/components/newrequest/newrequest.ts @@ -21,10 +21,10 @@ import { CoreDataPrivacyGetAccessInformationWSResponse, } from '@features/dataprivacy/services/dataprivacy'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreToasts, ToastDuration } from '@services/toasts'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; import { ModalController } from '@singletons'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays the new request page. diff --git a/src/core/features/dataprivacy/pages/main/main.ts b/src/core/features/dataprivacy/pages/main/main.ts index 3363004b8..d28541033 100644 --- a/src/core/features/dataprivacy/pages/main/main.ts +++ b/src/core/features/dataprivacy/pages/main/main.ts @@ -19,8 +19,8 @@ import { CoreDataPrivacyGetAccessInformationWSResponse, CoreDataPrivacyRequest, } from '@features/dataprivacy/services/dataprivacy'; -import { CoreLoadings } from '@services/loadings'; -import { CoreModals } from '@services/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; +import { CoreModals } from '@services/overlays/modals'; import { CoreNavigator } from '@services/navigator'; import { CoreScreen } from '@services/screen'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/core/features/emulator/components/capture-media/capture-media.ts b/src/core/features/emulator/components/capture-media/capture-media.ts index cd83912a3..15a9e0a42 100644 --- a/src/core/features/emulator/components/capture-media/capture-media.ts +++ b/src/core/features/emulator/components/capture-media/capture-media.ts @@ -25,7 +25,7 @@ import { CoreCaptureError } from '@classes/errors/captureerror'; import { CoreCanceledError } from '@classes/errors/cancelederror'; import { CorePath } from '@singletons/path'; import { toBoolean } from '@/core/transforms/boolean'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page to capture media in browser. diff --git a/src/core/features/fileuploader/services/fileuploader-helper.ts b/src/core/features/fileuploader/services/fileuploader-helper.ts index 745b37bd7..2cf257130 100644 --- a/src/core/features/fileuploader/services/fileuploader-helper.ts +++ b/src/core/features/fileuploader/services/fileuploader-helper.ts @@ -44,8 +44,8 @@ import { CorePath } from '@singletons/path'; import { CorePromisedValue } from '@classes/promised-value'; import { CorePlatform } from '@services/platform'; import { Chooser } from '@features/native/plugins'; -import { CoreToasts } from '@services/toasts'; -import { CoreLoadings } from '@services/loadings'; +import { CoreToasts } from '@services/overlays/toasts'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreFileUtils } from '@singletons/file-utils'; /** diff --git a/src/core/features/fileuploader/services/fileuploader.ts b/src/core/features/fileuploader/services/fileuploader.ts index 6a4add07a..b00670f57 100644 --- a/src/core/features/fileuploader/services/fileuploader.ts +++ b/src/core/features/fileuploader/services/fileuploader.ts @@ -33,7 +33,7 @@ import { CoreSite } from '@classes/sites/site'; import { CoreFileEntry, CoreFileHelper } from '@services/file-helper'; import { CorePath } from '@singletons/path'; import { CorePlatform } from '@services/platform'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CorePromiseUtils } from '@singletons/promise-utils'; /** diff --git a/src/core/features/grades/services/grades-helper.ts b/src/core/features/grades/services/grades-helper.ts index 23bc939a3..b7a1dc9b2 100644 --- a/src/core/features/grades/services/grades-helper.ts +++ b/src/core/features/grades/services/grades-helper.ts @@ -43,7 +43,7 @@ import { CoreError } from '@classes/errors/error'; import { CoreCourseHelper } from '@features/course/services/course-helper'; import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate'; import { CoreCourseAccess } from '@features/course/services/course-options-delegate'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { convertTextToHTMLElement } from '@/core/utils/create-html-element'; import { CoreCourseAccessDataType } from '@features/course/constants'; import { CorePromiseUtils } from '@singletons/promise-utils'; diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts index 57ac284cb..a1909859c 100644 --- a/src/core/features/login/pages/credentials/credentials.ts +++ b/src/core/features/login/pages/credentials/credentials.ts @@ -41,7 +41,7 @@ import { import { CoreCustomURLSchemes } from '@services/urlschemes'; import { CoreSiteError } from '@classes/errors/siteerror'; import { CoreKeyboard } from '@singletons/keyboard'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page to enter the user credentials. diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts index 2604de18c..bdc00321e 100644 --- a/src/core/features/login/pages/email-signup/email-signup.ts +++ b/src/core/features/login/pages/email-signup/email-signup.ts @@ -37,7 +37,7 @@ import { CoreSitesFactory } from '@services/sites-factory'; import { EMAIL_SIGNUP_FEATURE_NAME } from '@features/login/constants'; import { CoreInputErrorsMessages } from '@components/input-errors/input-errors'; import { CoreViewer } from '@features/viewer/services/viewer'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreOpener } from '@singletons/opener'; diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.ts b/src/core/features/login/pages/forgotten-password/forgotten-password.ts index 1e29997db..54f35172a 100644 --- a/src/core/features/login/pages/forgotten-password/forgotten-password.ts +++ b/src/core/features/login/pages/forgotten-password/forgotten-password.ts @@ -25,7 +25,7 @@ import { CoreSitePublicConfigResponse, CoreUnauthenticatedSite } from '@classes/ import { CoreUserSupportConfig } from '@features/user/classes/support/support-config'; import { CoreUserGuestSupportConfig } from '@features/user/classes/support/guest-support-config'; import { CoreSitesFactory } from '@services/sites-factory'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page to recover a forgotten password. diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts index 4c9cb9a69..b2e365ac4 100644 --- a/src/core/features/login/pages/reconnect/reconnect.ts +++ b/src/core/features/login/pages/reconnect/reconnect.ts @@ -33,7 +33,7 @@ import { SafeHtml } from '@angular/platform-browser'; import { CoreSitePublicConfigResponse } from '@classes/sites/unauthenticated-site'; import { ALWAYS_SHOW_LOGIN_FORM_CHANGED, FORGOTTEN_PASSWORD_FEATURE_NAME } from '@features/login/constants'; import { CoreKeyboard } from '@singletons/keyboard'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreLoginMethodsComponent, CoreLoginMethodsCurrentLogin } from '@features/login/components/login-methods/login-methods'; /** diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts index 71051aa74..f6e1c8432 100644 --- a/src/core/features/login/pages/site/site.ts +++ b/src/core/features/login/pages/site/site.ts @@ -46,9 +46,9 @@ import { CoreSitesFactory } from '@services/sites-factory'; import { ONBOARDING_DONE } from '@features/login/constants'; import { CoreUnauthenticatedSite } from '@classes/sites/unauthenticated-site'; import { CoreKeyboard } from '@singletons/keyboard'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreQRScan } from '@services/qrscan'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreCountries } from '@singletons/countries'; diff --git a/src/core/features/login/pages/sites/sites.ts b/src/core/features/login/pages/sites/sites.ts index 82a980ad0..f69cfbd18 100644 --- a/src/core/features/login/pages/sites/sites.ts +++ b/src/core/features/login/pages/sites/sites.ts @@ -20,7 +20,7 @@ import { CoreAccountsList, CoreLoginHelper } from '@features/login/services/logi import { CoreNavigator } from '@services/navigator'; import { CoreFilter } from '@features/filter/services/filter'; import { CoreAnimations } from '@components/animations'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page that displays the list of sites stored in the device. diff --git a/src/core/features/login/services/login-helper.ts b/src/core/features/login/services/login-helper.ts index fa26b1bf2..c61fb6c09 100644 --- a/src/core/features/login/services/login-helper.ts +++ b/src/core/features/login/services/login-helper.ts @@ -59,7 +59,7 @@ import { import { LazyRoutesModule } from '@/app/app-routing.module'; import { CoreSiteError } from '@classes/errors/siteerror'; import { CoreQRScan } from '@services/qrscan'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreErrorHelper } from '@services/error-helper'; import { CoreSSO } from '@singletons/sso'; import { CorePromiseUtils } from '@singletons/promise-utils'; diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts index eaa5afad6..1216fa17f 100644 --- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts +++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts @@ -19,7 +19,7 @@ import { CoreUserToursAlignment, CoreUserToursSide } from '@features/usertours/s import { IonRouterOutlet } from '@ionic/angular'; import { CoreScreen } from '@services/screen'; import { CoreSites } from '@services/sites'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreMainMenuUserMenuTourComponent } from '../user-menu-tour/user-menu-tour'; import { CoreMainMenuPage } from '@features/mainmenu/pages/menu/menu'; import { toBoolean } from '@/core/transforms/boolean'; diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts index 0cb2ba4d5..0b9b5a5ea 100644 --- a/src/core/features/mainmenu/components/user-menu/user-menu.ts +++ b/src/core/features/mainmenu/components/user-menu/user-menu.ts @@ -26,7 +26,7 @@ import { CoreUserProfileHandlerType, CoreUserDelegateContext, } from '@features/user/services/user-delegate'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreNavigator } from '@services/navigator'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; diff --git a/src/core/features/policy/pages/acceptances/acceptances.ts b/src/core/features/policy/pages/acceptances/acceptances.ts index c41bf30dd..4f145ff83 100644 --- a/src/core/features/policy/pages/acceptances/acceptances.ts +++ b/src/core/features/policy/pages/acceptances/acceptances.ts @@ -26,8 +26,8 @@ import { Subscription } from 'rxjs'; import { CORE_DATAPRIVACY_FEATURE_NAME, CORE_DATAPRIVACY_PAGE_NAME } from '@features/dataprivacy/constants'; import { CoreNavigator } from '@services/navigator'; import { CoreDataPrivacy } from '@features/dataprivacy/services/dataprivacy'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Page to view user acceptances. diff --git a/src/core/features/policy/pages/site-policy/site-policy.ts b/src/core/features/policy/pages/site-policy/site-policy.ts index dfab2c14f..026b3314c 100644 --- a/src/core/features/policy/pages/site-policy/site-policy.ts +++ b/src/core/features/policy/pages/site-policy/site-policy.ts @@ -30,8 +30,8 @@ import { CoreScreen } from '@services/screen'; import { Subscription } from 'rxjs'; import { CoreDom } from '@singletons/dom'; import { CoreWait } from '@singletons/wait'; -import { CoreModals } from '@services/modals'; -import { CoreLoadings } from '@services/loadings'; +import { CoreModals } from '@services/overlays/modals'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; /** diff --git a/src/core/features/rating/components/aggregate/aggregate.ts b/src/core/features/rating/components/aggregate/aggregate.ts index 9687202ed..60e83099d 100644 --- a/src/core/features/rating/components/aggregate/aggregate.ts +++ b/src/core/features/rating/components/aggregate/aggregate.ts @@ -20,7 +20,7 @@ import { CoreRatingInfoItem, CoreRatingProvider, } from '@features/rating/services/rating'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreSites } from '@services/sites'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; diff --git a/src/core/features/rating/components/rate/rate.ts b/src/core/features/rating/components/rate/rate.ts index cf6729efa..71f836c0a 100644 --- a/src/core/features/rating/components/rate/rate.ts +++ b/src/core/features/rating/components/rate/rate.ts @@ -24,10 +24,10 @@ import { import { CoreRatingOffline } from '@features/rating/services/rating-offline'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreToasts, ToastDuration } from '@services/toasts'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; import { Translate } from '@singletons'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Component that displays the user rating select. diff --git a/src/core/features/reminders/components/set-button/set-button.ts b/src/core/features/reminders/components/set-button/set-button.ts index f5cedf7dd..70cfd02b6 100644 --- a/src/core/features/reminders/components/set-button/set-button.ts +++ b/src/core/features/reminders/components/set-button/set-button.ts @@ -14,10 +14,10 @@ import { CoreReminderData, CoreReminders } from '@features/reminders/services/reminders'; import { Component, Input, OnInit } from '@angular/core'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; import { Translate } from '@singletons'; import { CoreTimeUtils } from '@services/utils/time'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; import { REMINDERS_DISABLED } from '@features/reminders/constants'; /** diff --git a/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.ts b/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.ts index e43530cb0..8284f0902 100644 --- a/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.ts +++ b/src/core/features/reminders/components/set-reminder-menu/set-reminder-menu.ts @@ -18,7 +18,7 @@ import { CoreRemindersService, CoreReminderValueAndUnit, } from '@features/reminders/services/reminders'; -import { CorePopovers } from '@services/popovers'; +import { CorePopovers } from '@services/overlays/popovers'; import { CoreWait } from '@singletons/wait'; import { PopoverController } from '@singletons'; import { CoreSharedModule } from '@/core/shared.module'; diff --git a/src/core/features/reportbuilder/pages/report/report.ts b/src/core/features/reportbuilder/pages/report/report.ts index 1321e4629..403529cba 100644 --- a/src/core/features/reportbuilder/pages/report/report.ts +++ b/src/core/features/reportbuilder/pages/report/report.ts @@ -14,7 +14,7 @@ import { Component, OnInit } from '@angular/core'; import { CoreReportBuilderReportDetail } from '@features/reportbuilder/services/reportbuilder'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreNavigator } from '@services/navigator'; @Component({ diff --git a/src/core/features/search/pages/global-search/global-search.ts b/src/core/features/search/pages/global-search/global-search.ts index 69f3205e9..2e05b430f 100644 --- a/src/core/features/search/pages/global-search/global-search.ts +++ b/src/core/features/search/pages/global-search/global-search.ts @@ -29,7 +29,7 @@ import { } from '@features/search/services/global-search'; import { CoreNavigator } from '@services/navigator'; import { CoreSearchBoxComponent } from '@features/search/components/search-box/search-box'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CorePromiseUtils } from '@singletons/promise-utils'; @Component({ diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts index 6f781f668..138c1083b 100644 --- a/src/core/features/settings/pages/dev/dev.ts +++ b/src/core/features/settings/pages/dev/dev.ts @@ -30,7 +30,7 @@ import { CoreNavigator } from '@services/navigator'; import { CorePlatform } from '@services/platform'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreToasts, ToastDuration } from '@services/toasts'; +import { CoreToasts, ToastDuration } from '@services/overlays/toasts'; import { CoreText } from '@singletons/text'; /** diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts index d4e0e3ecd..6314c3f52 100644 --- a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts +++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts @@ -23,7 +23,7 @@ import { CorePromiseUtils } from '@singletons/promise-utils'; import { Subscription } from 'rxjs'; import { CorePushNotifications } from '@features/pushnotifications/services/pushnotifications'; import { CoreConfig } from '@services/config'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; import { CoreNavigator } from '@services/navigator'; import { CorePlatform } from '@services/platform'; import { CoreNetwork } from '@services/network'; diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts index a3575362c..8037d28ba 100644 --- a/src/core/features/settings/pages/site/site.ts +++ b/src/core/features/settings/pages/site/site.ts @@ -29,7 +29,7 @@ import { NgZone } from '@singletons'; import { CoreConstants } from '@/core/constants'; import { CoreConfig } from '@services/config'; import { CoreSettingsHandlersSource } from '@features/settings/classes/settings-handlers-source'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; /** * Page that displays the list of site settings pages. diff --git a/src/core/features/settings/pages/synchronization/synchronization.ts b/src/core/features/settings/pages/synchronization/synchronization.ts index 2b778e6d3..90ec7b52d 100644 --- a/src/core/features/settings/pages/synchronization/synchronization.ts +++ b/src/core/features/settings/pages/synchronization/synchronization.ts @@ -25,7 +25,7 @@ import { CoreAccountsList, CoreLoginHelper } from '@features/login/services/logi import { CoreNetwork } from '@services/network'; import { Subscription } from 'rxjs'; import { CoreNavigator } from '@services/navigator'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; /** * Page that displays the synchronization settings. diff --git a/src/core/features/sharedfiles/services/sharedfiles-helper.ts b/src/core/features/sharedfiles/services/sharedfiles-helper.ts index 325bfd63a..ded3dad88 100644 --- a/src/core/features/sharedfiles/services/sharedfiles-helper.ts +++ b/src/core/features/sharedfiles/services/sharedfiles-helper.ts @@ -30,7 +30,7 @@ import { SHAREDFILES_PAGE_NAME } from '../constants'; import { CoreSharedFilesChooseSitePage } from '../pages/choose-site/choose-site'; import { CoreError } from '@classes/errors/error'; import { CorePlatform } from '@services/platform'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Helper service to share files with the app. diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts index 07672dbe9..3de7c9f64 100644 --- a/src/core/features/sitehome/pages/index/index.ts +++ b/src/core/features/sitehome/pages/index/index.ts @@ -31,7 +31,7 @@ import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreTime } from '@singletons/time'; import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; import { ContextLevel } from '@/core/constants'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; /** * Page that displays site home index. diff --git a/src/core/features/siteplugins/classes/call-ws-click-directive.ts b/src/core/features/siteplugins/classes/call-ws-click-directive.ts index bb656d9c3..0dca4e0b1 100644 --- a/src/core/features/siteplugins/classes/call-ws-click-directive.ts +++ b/src/core/features/siteplugins/classes/call-ws-click-directive.ts @@ -20,7 +20,7 @@ import { Translate } from '@singletons'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; import { CoreSitePluginsCallWSBaseDirective } from './call-ws-directive'; import { toBoolean } from '@/core/transforms/boolean'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; /** * Base class for directives to call a WS when the element is clicked. diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts index 4ffd03c41..ba424a0fd 100644 --- a/src/core/features/siteplugins/components/module-index/module-index.ts +++ b/src/core/features/siteplugins/components/module-index/module-index.ts @@ -28,7 +28,7 @@ import { CoreSitePluginsContent, CoreSitePluginsCourseModuleHandlerData, } from '@features/siteplugins/services/siteplugins'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreUtils } from '@singletons/utils'; import { CoreSitePluginsPluginContentComponent, CoreSitePluginsPluginContentLoadedData } from '../plugin-content/plugin-content'; import { CoreCompileHtmlComponentModule } from '@features/compile/components/compile-html/compile-html.module'; diff --git a/src/core/features/siteplugins/directives/call-ws.ts b/src/core/features/siteplugins/directives/call-ws.ts index 8b29b4d6b..b18162b7a 100644 --- a/src/core/features/siteplugins/directives/call-ws.ts +++ b/src/core/features/siteplugins/directives/call-ws.ts @@ -15,7 +15,7 @@ import { Directive, Input, ElementRef, Optional } from '@angular/core'; import { Translate } from '@singletons'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; import { CoreNavigator } from '@services/navigator'; import { CoreSitePluginsCallWSOnClickBaseDirective } from '../classes/call-ws-click-directive'; import { CoreSitePluginsPluginContentComponent } from '../components/plugin-content/plugin-content'; diff --git a/src/core/features/user/pages/about/about.ts b/src/core/features/user/pages/about/about.ts index a0b3b092d..37860bd11 100644 --- a/src/core/features/user/pages/about/about.ts +++ b/src/core/features/user/pages/about/about.ts @@ -32,7 +32,7 @@ import { CoreFileUploaderHelper } from '@features/fileuploader/services/fileuplo import { CoreMimetypeUtils } from '@services/utils/mimetype'; import { Translate } from '@singletons'; import { CoreUrl } from '@singletons/url'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreTime } from '@singletons/time'; /** diff --git a/src/core/features/viewer/services/viewer.ts b/src/core/features/viewer/services/viewer.ts index 9efcfc277..94b7ac3bc 100644 --- a/src/core/features/viewer/services/viewer.ts +++ b/src/core/features/viewer/services/viewer.ts @@ -16,7 +16,7 @@ import { ContextLevel } from '@/core/constants'; import { Injectable } from '@angular/core'; import { ModalOptions } from '@ionic/angular'; import { CoreConfig } from '@services/config'; -import { CoreModals } from '@services/modals'; +import { CoreModals } from '@services/overlays/modals'; import { CoreNavigator } from '@services/navigator'; import { CoreWSFile } from '@services/ws'; import { makeSingleton } from '@singletons'; diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts index 0c840b043..a6ea83392 100644 --- a/src/core/services/navigator.ts +++ b/src/core/services/navigator.ts @@ -32,7 +32,7 @@ import { CorePlatform } from '@services/platform'; import { filter } from 'rxjs/operators'; import { CorePromisedValue } from '@classes/promised-value'; import { BehaviorSubject } from 'rxjs'; -import { CoreLoadings } from './loadings'; +import { CoreLoadings } from './overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; /** diff --git a/src/core/services/loadings.ts b/src/core/services/overlays/loadings.ts similarity index 100% rename from src/core/services/loadings.ts rename to src/core/services/overlays/loadings.ts diff --git a/src/core/services/modals.ts b/src/core/services/overlays/modals.ts similarity index 99% rename from src/core/services/modals.ts rename to src/core/services/overlays/modals.ts index b8d5bc69a..0f68b2aa3 100644 --- a/src/core/services/modals.ts +++ b/src/core/services/overlays/modals.ts @@ -22,7 +22,7 @@ import { AngularFrameworkDelegate, makeSingleton, ModalController, Router } from import { CoreDirectivesRegistry } from '@singletons/directives-registry'; import { Subscription, filter } from 'rxjs'; import { Md5 } from 'ts-md5'; -import { fixOverlayAriaHidden } from '../utils/fix-aria-hidden'; +import { fixOverlayAriaHidden } from '../../utils/fix-aria-hidden'; import { ModalOptions } from '@ionic/angular'; import { CoreCanceledError } from '@classes/errors/cancelederror'; import { CoreWSError } from '@classes/errors/wserror'; diff --git a/src/core/services/popovers.ts b/src/core/services/overlays/popovers.ts similarity index 100% rename from src/core/services/popovers.ts rename to src/core/services/overlays/popovers.ts diff --git a/src/core/services/toasts.ts b/src/core/services/overlays/toasts.ts similarity index 100% rename from src/core/services/toasts.ts rename to src/core/services/overlays/toasts.ts diff --git a/src/core/services/qrscan.ts b/src/core/services/qrscan.ts index c4699e1b4..f46d46ae1 100644 --- a/src/core/services/qrscan.ts +++ b/src/core/services/qrscan.ts @@ -17,7 +17,7 @@ import { makeSingleton } from '@singletons'; import { CoreCanceledError } from '@classes/errors/cancelederror'; import { CorePromisedValue } from '@classes/promised-value'; import { QRScanner } from '@features/native/plugins'; -import { CoreModals } from './modals'; +import { CoreModals } from './overlays/modals'; import { CorePlatform } from './platform'; import { Subscription } from 'rxjs'; import { CoreCustomURLSchemes } from './urlschemes'; diff --git a/src/core/services/urlschemes.ts b/src/core/services/urlschemes.ts index 05b4cca6a..a6a9d351d 100644 --- a/src/core/services/urlschemes.ts +++ b/src/core/services/urlschemes.ts @@ -29,7 +29,7 @@ import { CoreSiteCheckResponse, CoreSites } from './sites'; import { CoreDomUtils } from './utils/dom'; import { CoreErrorHelper, CoreErrorObject } from './error-helper'; import { CoreUrl } from '@singletons/url'; -import { CoreLoadings } from './loadings'; +import { CoreLoadings } from './overlays/loadings'; /* * Provider to handle custom URL schemes. diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts index 5ca591d25..5b4f403f6 100644 --- a/src/core/services/utils/dom.ts +++ b/src/core/services/utils/dom.ts @@ -48,12 +48,12 @@ import { CorePasswordModalParams, CorePasswordModalResponse } from '@components/ import { CoreErrorLogs } from '@singletons/error-logs'; import { CoreKeyboard } from '@singletons/keyboard'; import { CoreWait } from '@singletons/wait'; -import { CoreToasts, ToastDuration, ShowToastOptions } from '../toasts'; +import { CoreToasts, ToastDuration, ShowToastOptions } from '../overlays/toasts'; import { fixOverlayAriaHidden } from '@/core/utils/fix-aria-hidden'; -import { CoreModals, OpenModalOptions } from '@services/modals'; -import { CorePopovers, OpenPopoverOptions } from '@services/popovers'; +import { CoreModals, OpenModalOptions } from '@services/overlays/modals'; +import { CorePopovers, OpenPopoverOptions } from '@services/overlays/popovers'; import { CoreViewer } from '@features/viewer/services/viewer'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CoreErrorHelper, CoreErrorObject } from '@services/error-helper'; import { convertTextToHTMLElement } from '@/core/utils/create-html-element'; import { CoreHTMLClasses } from '@singletons/html-classes'; diff --git a/src/core/services/utils/iframe.ts b/src/core/services/utils/iframe.ts index 327fa6a62..2cdaeace1 100644 --- a/src/core/services/utils/iframe.ts +++ b/src/core/services/utils/iframe.ts @@ -35,7 +35,7 @@ import { CoreMimetypeUtils } from './mimetype'; import { CoreFilepool } from '@services/filepool'; import { CoreSite } from '@classes/sites/site'; import { CoreNative } from '@features/native/services/native'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreFileUtils } from '@singletons/file-utils'; diff --git a/src/core/singletons/text.ts b/src/core/singletons/text.ts index 19f0c49fc..1a542bc32 100644 --- a/src/core/singletons/text.ts +++ b/src/core/singletons/text.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Clipboard, Translate } from '@singletons'; -import { CoreToasts } from '@services/toasts'; +import { CoreToasts } from '@services/overlays/toasts'; import { Locutus } from './locutus'; import { CoreError } from '@classes/errors/error'; import { convertTextToHTMLElement } from '../utils/create-html-element'; diff --git a/src/testing/utils.ts b/src/testing/utils.ts index 633f6f6b2..9c4566801 100644 --- a/src/testing/utils.ts +++ b/src/testing/utils.ts @@ -27,7 +27,7 @@ import { CoreNetwork } from '@services/network'; import { CorePlatform } from '@services/platform'; import { CoreDB } from '@services/db'; import { CoreNavigator, CoreNavigatorService } from '@services/navigator'; -import { CoreLoadings } from '@services/loadings'; +import { CoreLoadings } from '@services/overlays/loadings'; import { TranslateModule, TranslateService, TranslateStore } from '@ngx-translate/core'; import { CoreIonLoadingElement } from '@classes/ion-loading'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/src/types/config.d.ts b/src/types/config.d.ts index c618ae9fd..99074637d 100644 --- a/src/types/config.d.ts +++ b/src/types/config.d.ts @@ -18,7 +18,7 @@ import { CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites'; import { OpenFileAction } from '@singletons/opener'; import { CoreLoginSiteFinderSettings, CoreLoginSiteSelectorListMethod } from '@features/login/services/login-helper'; import { CoreDatabaseConfiguration } from '@classes/database/database-table'; -import { ToastDuration } from '@services/toasts'; +import { ToastDuration } from '@services/overlays/toasts'; /* eslint-disable @typescript-eslint/naming-convention */