Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix 🐛 issue where the theme should revert to the system default when ignoreSystemMode is disabled. #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix 🐛 issue where the theme should revert to the system default when ignoreSystemMode is disabled. #7

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a4b525
fix system thmem to revert if ignoresystemmode is not enabled
YosefAshenafi Sep 17, 2024
06b4128
make the code reusable
YosefAshenafi Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions features/theme/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ export function createTheme({
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');
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


return next;
Expand Down Expand Up @@ -121,7 +123,12 @@ export function createTheme({
);

React.useEffect(() => {
Colors.setScheme(scheme as SchemeType);
if (ignoreSystemMode) {
Colors.setScheme(scheme as SchemeType);
} else {
const systemScheme = Appearance.getColorScheme() as 'light' | 'dark' | null;
Colors.setScheme(systemScheme || 'default');
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since lines 126-131 are repeated of lines 89-95, can you write a common function to handle both, please?

setNavThemeState(
createReactNavigationTheme(
availableSchemes[scheme],
Expand All @@ -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');
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic seems to be repeated again; please write a function to handle all 3 places.


return next;
Expand Down