-
-
Notifications
You must be signed in to change notification settings - Fork 411
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: removed the non official themes from the UI
Closes #1283 Ref eclipse-theia/theia#11151 Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
- Loading branch information
Akos Kitta
committed
Apr 14, 2023
1 parent
3676960
commit 417c2b7
Showing
6 changed files
with
642 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 170 additions & 10 deletions
180
arduino-ide-extension/src/browser/theia/core/theming.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,186 @@ | ||
| import type { Theme } from '@theia/core/lib/common/theme'; | ||
| import { injectable } from '@theia/core/shared/inversify'; | ||
| import { ThemeServiceWithDB as TheiaThemeServiceWithDB } from '@theia/monaco/lib/browser/monaco-indexed-db'; | ||
| import { | ||
| BuiltinThemeProvider, | ||
| ThemeService, | ||
| } from '@theia/core/lib/browser/theming'; | ||
| import { nls } from '@theia/core/lib/common/nls'; | ||
| import type { Theme, ThemeType } from '@theia/core/lib/common/theme'; | ||
| import { assertUnreachable } from '../../../common/utils'; | ||
|
|
||
| export namespace ArduinoThemes { | ||
| export const Light: Theme = { | ||
| export const light: Theme = { | ||
| id: 'arduino-theme', | ||
| type: 'light', | ||
| label: 'Light (Arduino)', | ||
| editorTheme: 'arduino-theme', | ||
| }; | ||
| export const Dark: Theme = { | ||
| export const dark: Theme = { | ||
| id: 'arduino-theme-dark', | ||
| type: 'dark', | ||
| label: 'Dark (Arduino)', | ||
| editorTheme: 'arduino-theme-dark', | ||
| }; | ||
| } | ||
|
|
||
| @injectable() | ||
| export class ThemeServiceWithDB extends TheiaThemeServiceWithDB { | ||
| protected override init(): void { | ||
| this.register(ArduinoThemes.Light, ArduinoThemes.Dark); | ||
| super.init(); | ||
| const builtInThemeIds = new Set( | ||
| [ | ||
| ArduinoThemes.light, | ||
| ArduinoThemes.dark, | ||
| BuiltinThemeProvider.hcTheme, | ||
| // TODO: add the HC light theme after Theia 1.36 | ||
| ].map(({ id }) => id) | ||
| ); | ||
| const deprecatedThemeIds = new Set( | ||
| [BuiltinThemeProvider.lightTheme, BuiltinThemeProvider.darkTheme].map( | ||
| ({ id }) => id | ||
| ) | ||
| ); | ||
|
|
||
| export const lightThemeLabel = nls.localize('arduino/theme/light', 'Light'); | ||
| export const darkThemeLabel = nls.localize('arduino/theme/dark', 'Dark'); | ||
| export const hcThemeLabel = nls.localize('arduino/theme/hc', 'High Contrast'); | ||
| export function userThemeLabel(theme: Theme): string { | ||
| return nls.localize('arduino/theme/user', '{0} (user)', theme.label); | ||
| } | ||
| export function deprecatedThemeLabel(theme: Theme): string { | ||
| return nls.localize( | ||
| 'arduino/theme/deprecated', | ||
| '{0} (deprecated)', | ||
| theme.label | ||
| ); | ||
| } | ||
|
|
||
| export function themeLabelForSettings(theme: Theme): string { | ||
| switch (theme.id) { | ||
| case ArduinoThemes.light.id: | ||
| return lightThemeLabel; | ||
| case ArduinoThemes.dark.id: | ||
| return darkThemeLabel; | ||
| case BuiltinThemeProvider.hcTheme.id: | ||
| return hcThemeLabel; | ||
| case BuiltinThemeProvider.lightTheme.id: // fall-through | ||
| case BuiltinThemeProvider.darkTheme.id: | ||
| return deprecatedThemeLabel(theme); | ||
| default: | ||
| return userThemeLabel(theme); | ||
| } | ||
| } | ||
|
|
||
| export function compatibleBuiltInTheme(theme: Theme): Theme { | ||
| switch (theme.type) { | ||
| case 'light': | ||
| return ArduinoThemes.light; | ||
| case 'dark': | ||
| return ArduinoThemes.dark; | ||
| case 'hc': | ||
| return BuiltinThemeProvider.hcTheme; | ||
| default: { | ||
| console.warn( | ||
| `Unhandled theme type: ${theme.type}. Theme ID: ${theme.id}, label: ${theme.label}` | ||
| ); | ||
| return ArduinoThemes.light; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // For tests without DI | ||
| interface ThemeProvider { | ||
| themes(): Theme[]; | ||
| currentTheme(): Theme; | ||
| } | ||
|
|
||
| /** | ||
| * Returns with a list of built-in themes officially supported by IDE2 (https://github.com/arduino/arduino-ide/issues/1283). | ||
| * The themes in the array follow the following order: | ||
| * - built-in themes first (in `Light`, `Dark`, `High Contrast`), // TODO -> High Contrast will be split up to HC Dark and HC Light after the Theia version uplift | ||
| * - followed by user installed (VSIX) themes grouped by theme type, then alphabetical order, | ||
| * - if the `currentTheme` is either Light (Theia) or Dark (Theia), the last item of the array will be the selected theme with `(deprecated)` suffix. | ||
| */ | ||
| export function userConfigurableThemes(service: ThemeService): Theme[][]; | ||
| export function userConfigurableThemes(provider: ThemeProvider): Theme[][]; | ||
| export function userConfigurableThemes( | ||
| serviceOrProvider: ThemeService | ThemeProvider | ||
| ): Theme[][] { | ||
| const provider = | ||
| serviceOrProvider instanceof ThemeService | ||
| ? { | ||
| currentTheme: () => serviceOrProvider.getCurrentTheme(), | ||
| themes: () => serviceOrProvider.getThemes(), | ||
| } | ||
| : serviceOrProvider; | ||
| const currentTheme = provider.currentTheme(); | ||
| const allThemes = provider | ||
| .themes() | ||
| .map((theme) => ({ ...theme, arduinoThemeType: arduinoThemeTypeOf(theme) })) | ||
| .filter( | ||
| (theme) => | ||
| theme.arduinoThemeType !== 'deprecated' || currentTheme.id === theme.id | ||
| ) | ||
| .sort((left, right) => { | ||
| const leftArduinoThemeType = left.arduinoThemeType; | ||
| const rightArduinoThemeType = right.arduinoThemeType; | ||
| if (leftArduinoThemeType === rightArduinoThemeType) { | ||
| const result = themeTypeOrder[left.type] - themeTypeOrder[right.type]; | ||
| if (result) { | ||
| return result; | ||
| } | ||
| return left.label.localeCompare(right.label); // alphabetical order | ||
| } | ||
| return ( | ||
| arduinoThemeTypeOrder[leftArduinoThemeType] - | ||
| arduinoThemeTypeOrder[rightArduinoThemeType] | ||
| ); | ||
| }); | ||
| const builtInThemes: Theme[] = []; | ||
| const userThemes: Theme[] = []; | ||
| const deprecatedThemes: Theme[] = []; | ||
| allThemes.forEach((theme) => { | ||
| const { arduinoThemeType } = theme; | ||
| switch (arduinoThemeType) { | ||
| case 'built-in': | ||
| builtInThemes.push(theme); | ||
| break; | ||
| case 'user': | ||
| userThemes.push(theme); | ||
| break; | ||
| case 'deprecated': | ||
| deprecatedThemes.push(theme); | ||
| break; | ||
| default: | ||
| assertUnreachable(arduinoThemeType); | ||
| } | ||
| }); | ||
| const groupedThemes: Theme[][] = []; | ||
| if (builtInThemes.length) { | ||
| groupedThemes.push(builtInThemes); | ||
| } | ||
| if (userThemes.length) { | ||
| groupedThemes.push(userThemes); | ||
| } | ||
| if (deprecatedThemes.length) { | ||
| groupedThemes.push(deprecatedThemes); | ||
| } | ||
| return groupedThemes; | ||
| } | ||
|
|
||
| export type ArduinoThemeType = 'built-in' | 'user' | 'deprecated'; | ||
| const arduinoThemeTypeOrder: Record<ArduinoThemeType, number> = { | ||
| 'built-in': 0, | ||
| user: 1, | ||
| deprecated: 2, | ||
| }; | ||
| const themeTypeOrder: Record<ThemeType, number> = { | ||
| light: 0, | ||
| dark: 1, | ||
| hc: 2, | ||
| }; | ||
|
|
||
| export function arduinoThemeTypeOf(theme: Theme | string): ArduinoThemeType { | ||
| const themeId = typeof theme === 'string' ? theme : theme.id; | ||
| if (builtInThemeIds.has(themeId)) { | ||
| return 'built-in'; | ||
| } | ||
| if (deprecatedThemeIds.has(themeId)) { | ||
| return 'deprecated'; | ||
| } | ||
| return 'user'; | ||
| } |
Oops, something went wrong.