fix 🐛 issue where the theme should revert to the system default when ignoreSystemMode is disabled. #7
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
jontsai
requested changes
Sep 17, 2024
features/theme/index.tsx
Outdated
Comment on lines
126
to
131
| if (ignoreSystemMode) { | ||
| Colors.setScheme(scheme as SchemeType); | ||
| } else { | ||
| const systemScheme = Appearance.getColorScheme() as 'light' | 'dark' | null; | ||
| Colors.setScheme(systemScheme || 'default'); | ||
| } |
There was a problem hiding this comment.
Since lines 126-131 are repeated of lines 89-95, can you write a common function to handle both, please?
features/theme/index.tsx
Outdated
Comment on lines
89
to
95
| if (next.ignoreSystemMode) { | ||
| Colors.setScheme(scheme as SchemeType); | ||
| } else { | ||
| Colors.setScheme('default'); | ||
| // Revert to system default if ignoreSystemMode is false | ||
| const systemScheme = Appearance.getColorScheme() as 'light' | 'dark' | null; | ||
| Colors.setScheme(systemScheme || 'default'); | ||
| } |
There was a problem hiding this comment.
Lines 89-95 are repeated down below on lines 126-131. You should make a function that takes ignoreSystemMode as a parameter and handle both with 1 function, instead of duplicating the logic in multiple places.
features/theme/index.tsx
Outdated
| @@ -145,7 +152,8 @@ export function createTheme({ | |||
| if (next.ignoreSystemMode) { | |||
| Colors.setScheme(prev.scheme || defaultScheme); | |||
| } else { | |||
| Colors.setScheme('default'); | |||
| const systemScheme = Appearance.getColorScheme() as 'light' | 'dark' | null; | |||
| Colors.setScheme(systemScheme || 'default'); | |||
| } | |||
There was a problem hiding this comment.
This logic seems to be repeated again; please write a function to handle all 3 places.
jontsai
approved these changes
Sep 18, 2024
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.
Status
Ready
Description