Skip to content

Commit ee1ea38

Browse files
authored
Merge pull request #37 from CodeDead/feature/theme-toggle-setting
feature/theme-toggle-setting
2 parents c469640 + b3c2ef9 commit ee1ea38

File tree

16 files changed

+79
-22
lines changed

16 files changed

+79
-22
lines changed

src/components/TopBar/index.jsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ const TopBar = () => {
5151
const [state, d1] = useContext(MainContext);
5252

5353
const {
54-
languageIndex, minimizeEnabled, maximizeEnabled, languageEnabled, themeStyle,
54+
languageIndex,
55+
minimizeEnabled,
56+
maximizeEnabled,
57+
languageEnabled,
58+
themeStyle,
59+
themeToggleEnabled,
5560
} = state;
5661
const language = state.languages[languageIndex];
5762

@@ -154,9 +159,11 @@ const TopBar = () => {
154159
{language.appName}
155160
</Typography>
156161

157-
<IconButton color="inherit" onClick={changeThemeStyle}>
158-
{themeStyle === 'dark' ? <Brightness5Icon /> : <Brightness7Icon />}
159-
</IconButton>
162+
{themeToggleEnabled ? (
163+
<IconButton color="inherit" onClick={changeThemeStyle}>
164+
{themeStyle === 'dark' ? <Brightness5Icon /> : <Brightness7Icon />}
165+
</IconButton>
166+
) : null}
160167

161168
{languageEnabled
162169
? (

src/contexts/MainContextProvider/index.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const autoUpdate = localStorage.autoUpdate && localStorage.autoUpdate === 'true'
2828
const minimizeEnabled = localStorage.minimizeEnabled && localStorage.minimizeEnabled === 'true' ? true : !localStorage.minimizeEnabled;
2929
const maximizeEnabled = localStorage.maximizeEnabled && localStorage.maximizeEnabled === 'true' ? true : !localStorage.maximizeEnabled;
3030
const languageEnabled = localStorage.languageEnabled && localStorage.languageEnabled === 'true' ? true : !localStorage.languageEnabled;
31+
const themeToggleEnabled = localStorage.themeToggleEnabled && localStorage.themeToggleEnabled === 'true' ? true : !localStorage.themeToggleEnabled;
3132
const canDragDrop = localStorage.canDragDrop && localStorage.canDragDrop === 'true' ? true : !localStorage.canDragDrop;
3233

3334
const initState = {
@@ -53,6 +54,7 @@ const initState = {
5354
minimizeEnabled,
5455
maximizeEnabled,
5556
languageEnabled,
57+
themeToggleEnabled,
5658
canDragDrop,
5759
};
5860

src/languages/de_DE/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const de_DE = () => ({
8181
dark: 'Dunkel',
8282
orange: 'Orange',
8383
orangeThemeDescription: 'Lass uns Niederländisch werden.',
84+
themeToggleEnabled: 'Thema umschalten',
8485
});
8586

8687
// eslint-disable-next-line camelcase

src/languages/en_US/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const en_US = () => ({
8181
dark: 'Dark',
8282
orange: 'Orange',
8383
orangeThemeDescription: 'Let\'s get Dutch.',
84+
themeToggleEnabled: 'Theme toggle',
8485
});
8586

8687
// eslint-disable-next-line camelcase

src/languages/es_ES/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const es_ES = () => ({
8181
dark: 'Oscuro',
8282
orange: 'Naranja',
8383
orangeThemeDescription: 'Vamos a holandeses.',
84+
themeToggleEnabled: 'Alternar tema',
8485
});
8586

8687
// eslint-disable-next-line camelcase

src/languages/fr_FR/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const fr_FR = () => ({
8181
dark: 'Foncé',
8282
orange: 'Orange',
8383
orangeThemeDescription: 'Il faut que ça Néerlandais.',
84+
themeToggleEnabled: 'Basculer le thème',
8485
});
8586

8687
// eslint-disable-next-line camelcase

src/languages/it_IT/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const it_IT = () => ({
8181
dark: 'Buio',
8282
orange: 'Arancia',
8383
orangeThemeDescription: 'Prendiamo l\'olandese.',
84+
themeToggleEnabled: 'Commutazione del tema',
8485
});
8586

8687
// eslint-disable-next-line camelcase

src/languages/jp_JP/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const jp_JP = () => ({
8181
dark: '闇',
8282
orange: 'オレンジ',
8383
orangeThemeDescription: 'オランダ語を取得しましょう。',
84+
themeToggleEnabled: 'テーマの切り替え',
8485
});
8586

8687
// eslint-disable-next-line camelcase

src/languages/nl_NL/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const nl_NL = () => ({
8181
dark: 'Donker',
8282
orange: 'Oranje',
8383
orangeThemeDescription: 'Op z\'n Nederlands.',
84+
themeToggleEnabled: 'Thema wisselen',
8485
});
8586

8687
// eslint-disable-next-line camelcase

src/languages/pt_PT/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const pt_PT = () => ({
8181
dark: 'Sombrio',
8282
orange: 'Laranja',
8383
orangeThemeDescription: 'Vamos para o holandês.',
84+
themeToggleEnabled: 'Alternar tema',
8485
});
8586

8687
// eslint-disable-next-line camelcase

0 commit comments

Comments
 (0)