Skip to content

Commit 7b8d2d0

Browse files
authored
Merge pull request #4701 from dpalou/MOBILE-4979
MOBILE-4979 core: Rename singletons to static when appropriate
2 parents 0c21599 + 466d293 commit 7b8d2d0

File tree

671 files changed

+1783
-1756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

671 files changed

+1783
-1756
lines changed

src/addons/badges/pages/badge-class/badge-class.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
// limitations under the License.
1414

1515
import { Component, OnInit, inject, signal } from '@angular/core';
16-
import { CorePromiseUtils } from '@singletons/promise-utils';
16+
import { CorePromiseUtils } from '@static/promise-utils';
1717
import { CoreNavigator } from '@services/navigator';
1818
import { ActivatedRoute } from '@angular/router';
1919
import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
20-
import { CoreTime } from '@singletons/time';
20+
import { CoreTime } from '@static/time';
2121
import { AddonBadges, AddonBadgesBadgeClass } from '../../services/badges';
2222
import { CoreAlerts } from '@services/overlays/alerts';
2323
import { CoreSharedModule } from '@/core/shared.module';

src/addons/badges/pages/issued-badge/issued-badge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ import { Component, OnDestroy, OnInit, computed, inject, signal } from '@angular
1616
import { CoreSites } from '@services/sites';
1717
import { CoreUser } from '@features/user/services/user';
1818
import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
19-
import { CorePromiseUtils } from '@singletons/promise-utils';
19+
import { CorePromiseUtils } from '@static/promise-utils';
2020
import { CoreCourses } from '@features/courses/services/courses';
2121
import { CoreNavigator } from '@services/navigator';
2222
import { ActivatedRoute } from '@angular/router';
2323
import { CoreSwipeNavigationItemsManager } from '@classes/items-management/swipe-navigation-items-manager';
2424
import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
2525
import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
2626
import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
27-
import { CoreTime } from '@singletons/time';
27+
import { CoreTime } from '@static/time';
2828
import { CoreSharedModule } from '@/core/shared.module';
2929
import { CoreAlerts } from '@services/overlays/alerts';
3030

src/addons/badges/pages/user-badges/user-badges.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import { AfterViewInit, Component, OnDestroy, signal, viewChild, WritableSignal } from '@angular/core';
1616
import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges';
1717
import { CoreSites } from '@services/sites';
18-
import { CorePromiseUtils } from '@singletons/promise-utils';
18+
import { CorePromiseUtils } from '@static/promise-utils';
1919
import { CoreSplitViewComponent } from '@components/split-view/split-view';
2020
import { CoreNavigator } from '@services/navigator';
2121
import { CoreListItemsManager } from '@classes/items-management/list-items-manager';
2222
import { AddonBadgesUserBadgesSource } from '@addons/badges/classes/user-badges-source';
2323
import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
2424
import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
25-
import { CoreTime } from '@singletons/time';
25+
import { CoreTime } from '@static/time';
2626
import { Translate } from '@singletons';
2727
import { CoreAlerts } from '@services/overlays/alerts';
2828
import { CoreSharedModule } from '@/core/shared.module';

src/addons/badges/services/handlers/push-click.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
import { Injectable } from '@angular/core';
1616

17-
import { CoreUtils } from '@singletons/utils';
17+
import { CoreUtils } from '@static/utils';
1818
import { CorePushNotificationsClickHandler } from '@features/pushnotifications/services/push-delegate';
1919
import { AddonBadges } from '../badges';
2020
import { makeSingleton } from '@singletons';
2121
import { CorePushNotificationsNotificationBasicData } from '@features/pushnotifications/services/pushnotifications';
2222
import { CoreNavigator } from '@services/navigator';
2323
import { AddonBadgesHelper } from '../badges-helper';
24-
import { CorePromiseUtils } from '@singletons/promise-utils';
24+
import { CorePromiseUtils } from '@static/promise-utils';
2525
import { ADDONS_BADGES_USER_PROFILE_FEATURE_NAME } from '@addons/badges/constants';
2626

2727
/**

src/addons/block/activitymodules/components/activitymodules/activitymodules.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import { CoreBlockBaseComponent } from '@features/block/classes/base-block-compo
1919
import { CoreSites } from '@services/sites';
2020
import { ContextLevel } from '@/core/constants';
2121
import { Translate } from '@singletons';
22-
import { CoreObject } from '@singletons/object';
22+
import { CoreObject } from '@static/object';
2323
import { CoreCourseHelper } from '@features/course/services/course-helper';
24-
import { CoreUrl } from '@singletons/url';
24+
import { CoreUrl } from '@static/url';
2525
import { CoreSharedModule } from '@/core/shared.module';
2626
import { ModFeature, ModArchetype, RESOURCE_ARCHETYPE_NAME } from '@addons/mod/constants';
2727
import { CoreCourseModuleHelper } from '@features/course/services/course-module-helper';

src/addons/block/myoverview/components/myoverview/myoverview.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
// limitations under the License.
1414

1515
import { Component, OnInit, OnDestroy, OnChanges, SimpleChanges, inject } from '@angular/core';
16-
import { CoreEventObserver, CoreEvents } from '@singletons/events';
17-
import { CoreTime } from '@singletons/time';
16+
import { CoreEventObserver, CoreEvents } from '@static/events';
17+
import { CoreTime } from '@static/time';
1818
import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
1919
import {
2020
CoreCourses,
@@ -26,8 +26,8 @@ import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/servi
2626
import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
2727
import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
2828
import { CoreSite } from '@classes/sites/site';
29-
import { CorePromiseUtils } from '@singletons/promise-utils';
30-
import { CoreText } from '@singletons/text';
29+
import { CorePromiseUtils } from '@static/promise-utils';
30+
import { CoreText } from '@static/text';
3131
import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
3232
import { IonSearchbar } from '@ionic/angular';
3333
import { CoreNavigator } from '@services/navigator';

src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/recentlyaccessedcourses.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import { Component, OnInit, OnDestroy } from '@angular/core';
16-
import { CoreEventObserver, CoreEvents } from '@singletons/events';
16+
import { CoreEventObserver, CoreEvents } from '@static/events';
1717
import { CoreSites } from '@services/sites';
1818
import {
1919
CoreCoursesMyCoursesUpdatedEventData,
@@ -28,7 +28,7 @@ import {
2828
import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
2929
import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
3030
import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
31-
import { CoreUtils } from '@singletons/utils';
31+
import { CoreUtils } from '@static/utils';
3232
import { CoreSite } from '@classes/sites/site';
3333
import { CoreSharedModule } from '@/core/shared.module';
3434
import { CoreCoursesCourseListItemComponent } from '@features/courses/components/course-list-item/course-list-item';
@@ -37,7 +37,7 @@ import {
3737
CoreCoursesMyCoursesUpdatedEventAction,
3838
CORE_COURSES_STATE_FAVOURITE,
3939
} from '@features/courses/constants';
40-
import { CorePromiseUtils } from '@singletons/promise-utils';
40+
import { CorePromiseUtils } from '@static/promise-utils';
4141

4242
/**
4343
* Component to render a recent courses block.

src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import {
1818
AddonBlockRecentlyAccessedItems,
1919
AddonBlockRecentlyAccessedItemsItemCalculatedData,
2020
} from '../../services/recentlyaccesseditems';
21-
import { CoreText } from '@singletons/text';
21+
import { CoreText } from '@static/text';
2222
import { CoreLoadings } from '@services/overlays/loadings';
23-
import { CoreUtils } from '@singletons/utils';
23+
import { CoreUtils } from '@static/utils';
2424
import { CoreSharedModule } from '@/core/shared.module';
2525
import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
2626

src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import { Injectable } from '@angular/core';
1616
import { CoreSites } from '@services/sites';
17-
import { CoreDom } from '@singletons/dom';
17+
import { CoreDom } from '@static/dom';
1818
import { CoreCourseModuleHelper } from '@features/course/services/course-module-helper';
1919
import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site';
2020
import { makeSingleton } from '@singletons';

src/addons/block/starredcourses/components/starredcourses/starredcourses.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
import { Component, OnInit, OnDestroy } from '@angular/core';
16-
import { CoreEventObserver, CoreEvents } from '@singletons/events';
16+
import { CoreEventObserver, CoreEvents } from '@static/events';
1717
import { CoreSites } from '@services/sites';
1818
import { CoreCoursesMyCoursesUpdatedEventData, CoreCourses } from '@features/courses/services/courses';
1919
import {
@@ -23,7 +23,7 @@ import {
2323
import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
2424
import { AddonCourseCompletion } from '@addons/coursecompletion/services/coursecompletion';
2525
import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
26-
import { CoreUtils } from '@singletons/utils';
26+
import { CoreUtils } from '@static/utils';
2727
import { CoreSite } from '@classes/sites/site';
2828
import { AddonBlockStarredCourse, AddonBlockStarredCourses } from '../../services/starredcourses';
2929
import { CoreSharedModule } from '@/core/shared.module';
@@ -33,7 +33,7 @@ import {
3333
CoreCoursesMyCoursesUpdatedEventAction,
3434
CORE_COURSES_STATE_FAVOURITE,
3535
} from '@features/courses/constants';
36-
import { CorePromiseUtils } from '@singletons/promise-utils';
36+
import { CorePromiseUtils } from '@static/promise-utils';
3737

3838
/**
3939
* Component to render a starred courses block.

0 commit comments

Comments
 (0)