Viewer theme can be switched between dark or light theme #433
Conversation
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
ruchimotwaniBC
changed the title
ruchimotwaniBC
changed the title
forman
reviewed
Oct 10, 2024
There was a problem hiding this comment.
@ruchimotwaniBC , looks good, thanks!
Could you please change the implementation logic as follows:
- Change the control state's
currentAppThemetype tostring. - If
Config.instance.branding.themeNameis set, initialize control state'scurrentAppThemeto its value. - Only if
Config.instance.branding.themeNameis NOT set, allow for changing the theme in the Settings.
clarasb
reviewed
Oct 30, 2024
Ok I check. Thanks @clarasb |
forman
requested changes
Nov 13, 2024
| @@ -45,6 +45,7 @@ const mapStateToProps = (state: AppState) => { | |||
| userVariables: selectedUserVariablesSelector(state), | |||
| expressionCapabilities: expressionCapabilitiesSelector(state), | |||
| serverUrl: selectedServerSelector(state).url, | |||
| applicationTheme: state.controlState.applicationTheme, | |||
There was a problem hiding this comment.
The current theme should be available through the MUI theme context object. Please double-check the MUI docs on how to that (usually using the React ? useContext()` hook.
| @@ -73,6 +74,7 @@ export default function UserVariablesDialog({ | |||
| updateDatasetUserVariables, | |||
| expressionCapabilities, | |||
| serverUrl, | |||
| applicationTheme, | |||
src/components/MarkdownPopover.tsx
Outdated
| } | ||
|
|
||
| export default function MarkdownPopover({ | ||
| anchorEl, | ||
| markdownText, | ||
| open, | ||
| onClose, | ||
| applicationTheme, |
src/components/HelpButton.tsx
Outdated
| @@ -32,9 +32,10 @@ import MarkdownPopover from "@/components/MarkdownPopover"; | |||
| interface HelpButtonProps { | |||
| size?: "small" | "medium" | "large"; | |||
| helpUrl?: string; | |||
| applicationTheme?: string; | |||
| @@ -79,7 +79,7 @@ export interface Branding { | |||
| windowTitle: string; | |||
| windowIcon: string | null; | |||
| compact: boolean; | |||
| themeName: "dark" | "light"; | |||
| themeName: "light"; | |||
There was a problem hiding this comment.
A type with one choice? Why does this make sense?
The branding should provide the initial theme.
clarasb
approved these changes
Nov 25, 2024
forman
approved these changes
Nov 29, 2024
Comment on lines
+45
to
+46
| APPLICATION_THEMES, | ||
| ApplicationThemes, |
| @@ -79,7 +79,7 @@ export interface Branding { | |||
| windowTitle: string; | |||
| windowIcon: string | null; | |||
| compact: boolean; | |||
| themeName: "dark" | "light"; | |||
| themeName: "light"; | |||
| @@ -160,6 +166,7 @@ export interface ControlState { | |||
| exportPlacesAsCollection: boolean; | |||
| exportZipArchive: boolean; | |||
| exportFileName: string; | |||
| themeMode: string; | |||
There was a problem hiding this comment.
"light" | "dark" | "system" - I will fix that
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implemented the theme changing dropdown in Settings dialog.
The default theme of the application is taken from config.json and if not then default theme is according to users system.
Changes in MarkdownPopover are to support the link color for dark theme.