Skip to content

Commit 60e256e

Browse files
authored
Merge pull request #3938 from crazyserver/MOBILE-4329
Mobile 4329
2 parents 94f7711 + 9e0b1d4 commit 60e256e

File tree

50 files changed

+1669
-217
lines changed

Some content is hidden

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

50 files changed

+1669
-217
lines changed

.github/workflows/acceptance.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
"@core_comments"
8585
"@core_course"
8686
"@core_courses"
87+
"@core_dataprivacy"
8788
"@core_grades"
8889
"@core_login"
8990
"@core_mainmenu"

scripts/langindex.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,6 +1677,40 @@
16771677
"core.courses.totalcoursesearchresults": "local_moodlemobileapp",
16781678
"core.currentdevice": "local_moodlemobileapp",
16791679
"core.custom": "form",
1680+
"core.dataprivacy.cancelrequest": "tool_dataprivacy",
1681+
"core.dataprivacy.cancelrequestconfirmation": "tool_dataprivacy",
1682+
"core.dataprivacy.contactdataprotectionofficer": "tool_dataprivacy",
1683+
"core.dataprivacy.createnewdatarequest": "tool_dataprivacy",
1684+
"core.dataprivacy.datarequests": "tool_dataprivacy",
1685+
"core.dataprivacy.daterequested": "tool_dataprivacy",
1686+
"core.dataprivacy.deletemyaccount": "tool_dataprivacy",
1687+
"core.dataprivacy.message": "tool_dataprivacy",
1688+
"core.dataprivacy.newrequest": "tool_dataprivacy",
1689+
"core.dataprivacy.nodatarequests": "tool_dataprivacy",
1690+
"core.dataprivacy.pluginname": "tool_dataprivacy",
1691+
"core.dataprivacy.replyto": "tool_dataprivacy",
1692+
"core.dataprivacy.requestactions": "tool_dataprivacy",
1693+
"core.dataprivacy.requestby": "tool_dataprivacy",
1694+
"core.dataprivacy.requestcomments": "tool_dataprivacy",
1695+
"core.dataprivacy.requeststatus": "tool_dataprivacy",
1696+
"core.dataprivacy.requestsubmitted": "tool_dataprivacy",
1697+
"core.dataprivacy.requesttype": "tool_dataprivacy",
1698+
"core.dataprivacy.requesttype_help": "tool_dataprivacy",
1699+
"core.dataprivacy.requesttypedelete": "tool_dataprivacy",
1700+
"core.dataprivacy.requesttypeexport": "tool_dataprivacy",
1701+
"core.dataprivacy.requesttypeothers": "tool_dataprivacy",
1702+
"core.dataprivacy.send": "tool_dataprivacy",
1703+
"core.dataprivacy.statusapproved": "tool_dataprivacy",
1704+
"core.dataprivacy.statusawaitingapproval": "tool_dataprivacy",
1705+
"core.dataprivacy.statuscancelled": "tool_dataprivacy",
1706+
"core.dataprivacy.statuscomplete": "tool_dataprivacy",
1707+
"core.dataprivacy.statusdeleted": "tool_dataprivacy",
1708+
"core.dataprivacy.statusexpired": "tool_dataprivacy",
1709+
"core.dataprivacy.statuspending": "tool_dataprivacy",
1710+
"core.dataprivacy.statuspreprocessing": "tool_dataprivacy",
1711+
"core.dataprivacy.statusprocessing": "tool_dataprivacy",
1712+
"core.dataprivacy.statusready": "tool_dataprivacy",
1713+
"core.dataprivacy.statusrejected": "tool_dataprivacy",
16801714
"core.datastoredoffline": "local_moodlemobileapp",
16811715
"core.date": "moodle",
16821716
"core.datecreated": "repository",

src/addons/badges/services/handlers/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import { Injectable } from '@angular/core';
1616
import { CoreCourseUserAdminOrNavOptionIndexed } from '@features/courses/services/courses';
1717
import {
1818
CoreUserDelegateContext,
19-
CoreUserDelegateService,
2019
CoreUserProfileHandler,
2120
CoreUserProfileHandlerData,
21+
CoreUserProfileHandlerType,
2222
} from '@features/user/services/user-delegate';
2323
import { CoreNavigator } from '@services/navigator';
2424
import { CoreSites } from '@services/sites';
@@ -33,7 +33,7 @@ export class AddonBadgesUserHandlerService implements CoreUserProfileHandler {
3333

3434
name = 'AddonBadges:fakename'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
3535
priority = 300;
36-
type = CoreUserDelegateService.TYPE_NEW_PAGE;
36+
type = CoreUserProfileHandlerType.LIST_ITEM;
3737

3838
/**
3939
* @inheritdoc

src/addons/blog/services/handlers/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
1616
import {
1717
CoreUserProfileHandler,
1818
CoreUserProfileHandlerData,
19-
CoreUserDelegateService,
19+
CoreUserProfileHandlerType,
2020
CoreUserDelegateContext,
2121
} from '@features/user/services/user-delegate';
2222
import { CoreNavigator } from '@services/navigator';
@@ -32,7 +32,7 @@ export class AddonBlogUserHandlerService implements CoreUserProfileHandler {
3232

3333
name = 'AddonBlog'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
3434
priority = 200;
35-
type = CoreUserDelegateService.TYPE_NEW_PAGE;
35+
type = CoreUserProfileHandlerType.LIST_ITEM;
3636

3737
/**
3838
* @inheritdoc

src/addons/competency/services/handlers/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { COURSE_PAGE_NAME } from '@features/course/course.module';
1818
import { CoreUserProfile } from '@features/user/services/user';
1919
import {
2020
CoreUserProfileHandler,
21-
CoreUserDelegateService,
21+
CoreUserProfileHandlerType,
2222
CoreUserProfileHandlerData,
2323
CoreUserDelegateContext,
2424
} from '@features/user/services/user-delegate';
@@ -36,7 +36,7 @@ export class AddonCompetencyUserHandlerService implements CoreUserProfileHandler
3636

3737
name = 'AddonCompetency'; // This name doesn't match any disabled feature, they'll be checked in isEnabledForContext.
3838
priority = 100;
39-
type = CoreUserDelegateService.TYPE_NEW_PAGE;
39+
type = CoreUserProfileHandlerType.LIST_ITEM;
4040
cacheEnabled = true;
4141

4242
/**

src/addons/coursecompletion/services/handlers/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
1616
import { CoreUserProfile } from '@features/user/services/user';
1717
import {
1818
CoreUserProfileHandler,
19-
CoreUserDelegateService,
19+
CoreUserProfileHandlerType,
2020
CoreUserProfileHandlerData,
2121
CoreUserDelegateContext,
2222
} from '@features/user/services/user-delegate';
@@ -31,7 +31,7 @@ import { AddonCourseCompletion } from '../coursecompletion';
3131
export class AddonCourseCompletionUserHandlerService implements CoreUserProfileHandler {
3232

3333
name = 'AddonCourseCompletion:viewCompletion';
34-
type = CoreUserDelegateService.TYPE_NEW_PAGE;
34+
type = CoreUserProfileHandlerType.LIST_ITEM;
3535
priority = 350;
3636
cacheEnabled = true;
3737

src/addons/messages/services/handlers/user-send-message.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
import { Injectable } from '@angular/core';
1616
import { Params } from '@angular/router';
1717
import { CoreUserProfile } from '@features/user/services/user';
18-
import { CoreUserDelegateService, CoreUserProfileHandler, CoreUserProfileHandlerData } from '@features/user/services/user-delegate';
18+
import {
19+
CoreUserProfileHandlerType,
20+
CoreUserProfileHandler,
21+
CoreUserProfileHandlerData,
22+
} from '@features/user/services/user-delegate';
1923
import { CoreNavigator } from '@services/navigator';
2024
import { CoreSites } from '@services/sites';
2125
import { makeSingleton } from '@singletons';
@@ -29,7 +33,7 @@ export class AddonMessagesSendMessageUserHandlerService implements CoreUserProfi
2933

3034
name = 'AddonMessages:sendMessage';
3135
priority = 1000;
32-
type = CoreUserDelegateService.TYPE_COMMUNICATION;
36+
type = CoreUserProfileHandlerType.BUTTON;
3337

3438
/**
3539
* @inheritdoc

src/addons/notes/services/handlers/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { Injectable } from '@angular/core';
1616
import { CoreUserProfile } from '@features/user/services/user';
1717
import {
1818
CoreUserProfileHandler,
19-
CoreUserDelegateService,
19+
CoreUserProfileHandlerType,
2020
CoreUserProfileHandlerData,
2121
CoreUserDelegateContext,
2222
} from '@features/user/services/user-delegate';
@@ -33,7 +33,7 @@ export class AddonNotesUserHandlerService implements CoreUserProfileHandler {
3333

3434
name = 'AddonNotes:notes';
3535
priority = 250;
36-
type = CoreUserDelegateService.TYPE_NEW_PAGE;
36+
type = CoreUserProfileHandlerType.LIST_ITEM;
3737
cacheEnabled = true;
3838

3939
/**

src/addons/privatefiles/services/handlers/user.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { AddonPrivateFiles } from '@addons/privatefiles/services/privatefiles';
1818
import { makeSingleton } from '@singletons';
1919
import {
2020
CoreUserDelegateContext,
21-
CoreUserDelegateService,
21+
CoreUserProfileHandlerType,
2222
CoreUserProfileHandler,
2323
CoreUserProfileHandlerData,
2424
} from '@features/user/services/user-delegate';
@@ -36,7 +36,7 @@ export class AddonPrivateFilesUserHandlerService implements CoreUserProfileHandl
3636

3737
name = 'AddonPrivateFiles';
3838
priority = 400;
39-
type = CoreUserDelegateService.TYPE_NEW_PAGE;
39+
type = CoreUserProfileHandlerType.LIST_ITEM;
4040
cacheEnabled = true;
4141

4242
/**

src/core/components/empty-box/empty-box.scss

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

33
:host {
44
--image-size: 120px;
5-
--icon-color: var(--text-color);
5+
--icon-color: var(--subdued-text-color);
66

77
display: flex;
88
flex-direction: column;

0 commit comments

Comments
 (0)