diff options
-rw-r--r-- | src/i18n/locales/en-US.json | 4 | ||||
-rw-r--r-- | src/models/Service.ts | 25 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 58aaebc69..63face219 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -344,9 +344,9 @@ | |||
344 | "settings.service.form.editServiceHeadline": "Edit {name}", | 344 | "settings.service.form.editServiceHeadline": "Edit {name}", |
345 | "settings.service.form.enableAudio": "Enable audio", | 345 | "settings.service.form.enableAudio": "Enable audio", |
346 | "settings.service.form.enableBadge": "Show unread message badges", | 346 | "settings.service.form.enableBadge": "Show unread message badges", |
347 | "settings.service.form.enableMediaBadge": "Enable Media Play Indicator", | ||
348 | "settings.service.form.enableDarkMode": "Enable Dark Mode", | 347 | "settings.service.form.enableDarkMode": "Enable Dark Mode", |
349 | "settings.service.form.enableHibernation": "Enable hibernation", | 348 | "settings.service.form.enableHibernation": "Enable hibernation", |
349 | "settings.service.form.enableMediaBadge": "Enable Media Play Indicator", | ||
350 | "settings.service.form.enableNotification": "Enable notifications", | 350 | "settings.service.form.enableNotification": "Enable notifications", |
351 | "settings.service.form.enableProgressbar": "Enable Progress bar", | 351 | "settings.service.form.enableProgressbar": "Enable Progress bar", |
352 | "settings.service.form.enableService": "Enable service", | 352 | "settings.service.form.enableService": "Enable service", |
@@ -492,4 +492,4 @@ | |||
492 | "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdium Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", | 492 | "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdium Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", |
493 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", | 493 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", |
494 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 494 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
495 | } | 495 | } \ No newline at end of file |
diff --git a/src/models/Service.ts b/src/models/Service.ts index e45909631..493620ba4 100644 --- a/src/models/Service.ts +++ b/src/models/Service.ts | |||
@@ -47,22 +47,23 @@ export default class Service { | |||
47 | 47 | ||
48 | @observable order: number = DEFAULT_SERVICE_ORDER; | 48 | @observable order: number = DEFAULT_SERVICE_ORDER; |
49 | 49 | ||
50 | @observable isEnabled: boolean = true; | 50 | @observable isEnabled: boolean = DEFAULT_SERVICE_SETTINGS.isEnabled; |
51 | 51 | ||
52 | @observable isMuted: boolean = false; | 52 | @observable isMuted: boolean = DEFAULT_SERVICE_SETTINGS.isMuted; |
53 | 53 | ||
54 | @observable team: string = ''; | 54 | @observable team: string = ''; |
55 | 55 | ||
56 | @observable customUrl: string = ''; | 56 | @observable customUrl: string = ''; |
57 | 57 | ||
58 | @observable isNotificationEnabled: boolean = true; | 58 | @observable isNotificationEnabled: boolean = |
59 | DEFAULT_SERVICE_SETTINGS.isNotificationEnabled; | ||
59 | 60 | ||
60 | @observable isBadgeEnabled: boolean = true; | 61 | @observable isBadgeEnabled: boolean = DEFAULT_SERVICE_SETTINGS.isBadgeEnabled; |
61 | 62 | ||
62 | @observable isMediaBadgeEnabled: boolean = | 63 | @observable isMediaBadgeEnabled: boolean = |
63 | DEFAULT_SERVICE_SETTINGS.isMediaBadgeEnabled; | 64 | DEFAULT_SERVICE_SETTINGS.isMediaBadgeEnabled; |
64 | 65 | ||
65 | @observable trapLinkClicks: boolean = false; | 66 | @observable trapLinkClicks: boolean = DEFAULT_SERVICE_SETTINGS.trapLinkClicks; |
66 | 67 | ||
67 | @observable isIndirectMessageBadgeEnabled: boolean = true; | 68 | @observable isIndirectMessageBadgeEnabled: boolean = true; |
68 | 69 | ||
@@ -74,9 +75,11 @@ export default class Service { | |||
74 | 75 | ||
75 | @observable hasCrashed: boolean = false; | 76 | @observable hasCrashed: boolean = false; |
76 | 77 | ||
77 | @observable isDarkModeEnabled: boolean = false; | 78 | @observable isDarkModeEnabled: boolean = |
79 | DEFAULT_SERVICE_SETTINGS.isDarkModeEnabled; | ||
78 | 80 | ||
79 | @observable isProgressbarEnabled: boolean = true; | 81 | @observable isProgressbarEnabled: boolean = |
82 | DEFAULT_SERVICE_SETTINGS.isProgressbarEnabled; | ||
80 | 83 | ||
81 | @observable darkReaderSettings: DarkReaderInterface = { | 84 | @observable darkReaderSettings: DarkReaderInterface = { |
82 | brightness: 100, | 85 | brightness: 100, |
@@ -100,12 +103,14 @@ export default class Service { | |||
100 | 103 | ||
101 | @observable isServiceAccessRestricted: boolean = false; | 104 | @observable isServiceAccessRestricted: boolean = false; |
102 | 105 | ||
103 | // todo is this used? | 106 | // TODO: is this used? |
104 | @observable restrictionType = null; | 107 | @observable restrictionType = null; |
105 | 108 | ||
106 | @observable isHibernationEnabled: boolean = false; | 109 | @observable isHibernationEnabled: boolean = |
110 | DEFAULT_SERVICE_SETTINGS.isHibernationEnabled; | ||
107 | 111 | ||
108 | @observable isWakeUpEnabled: boolean = true; | 112 | @observable isWakeUpEnabled: boolean = |
113 | DEFAULT_SERVICE_SETTINGS.isWakeUpEnabled; | ||
109 | 114 | ||
110 | @observable isHibernationRequested: boolean = false; | 115 | @observable isHibernationRequested: boolean = false; |
111 | 116 | ||