From fff951f57a3a6b7236c0ee2ccf537ac4445f2f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Le=C3=B3n=20Aissa?= Date: Wed, 22 Jan 2025 13:57:11 +0100 Subject: [PATCH 1/2] Remove Code Duplication --- js/Navigator.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/js/Navigator.js b/js/Navigator.js index 5898967..5d8fd53 100644 --- a/js/Navigator.js +++ b/js/Navigator.js @@ -257,10 +257,9 @@ export default function Navigator() { const tabBarLabel = (title, { focused }) => { const style = { - color: focused - ? colorContext.colorScheme.dhbwRed - : colorContext.colorScheme.tabBarText, + color: getFocusedColor(focused), }; + if (Platform.isPad) { // on iPad, tab bar labels are places beside icon: add some margin style.marginLeft = 20; @@ -269,6 +268,7 @@ export default function Navigator() { // to prevent line breaks in "Vorlesungen" style.fontSize = PixelRatio.get() <= 2 ? 8 : 10; } + return {title}; }; @@ -277,15 +277,18 @@ export default function Navigator() { ); }; + const getFocusedColor = (focused) => { + return focused + ? colorContext.colorScheme.dhbwRed + : colorContext.colorScheme.tabBarText + + }; + const tabsConfig = () => ({ headerShown: false, tabBarStyle: { From f00dc3095bc59d51e80ee11e9f301db88411d1b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Le=C3=B3n=20Aissa?= Date: Wed, 22 Jan 2025 13:57:27 +0100 Subject: [PATCH 2/2] Remove redundant code --- js/CampusApp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/CampusApp.js b/js/CampusApp.js index 5a424de..6e6bd35 100644 --- a/js/CampusApp.js +++ b/js/CampusApp.js @@ -30,9 +30,9 @@ export default function CampusApp() { const manualSetting = await AsyncStorage.getItem( 'manualDarkMode' ); - setOverrideSystemScheme(override === 'true' ? true : false); + setOverrideSystemScheme(override === 'true'); if (override !== null) { - setManualDarkMode(manualSetting === 'true' ? true : false); + setManualDarkMode(manualSetting === 'true'); } if (override === 'true') {