Adjust styles and StyleUtils to the new menu color palette

software-mansion-labs · Dec 6, 2023 · cd2bf3a · cd2bf3a
1 parent 07b296a
commit cd2bf3a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts
@@ -542,6 +542,9 @@ function getIconFillColor(theme: ThemeColors, buttonState: ButtonStateName = CON
     switch (buttonState) {
         case CONST.BUTTON_STATES.ACTIVE:
         case CONST.BUTTON_STATES.PRESSED:
+            if (isMenuIcon) {
+                return theme.iconMenuHovered;
+            }
             return theme.iconHovered;
         case CONST.BUTTON_STATES.COMPLETE:
             return theme.iconSuccessFill;

diff --git a/src/styles/styles.ts b/src/styles/styles.ts
@@ -2432,6 +2432,12 @@ const styles = (theme: ThemeColors) =>
             paddingBottom: 20,
         },
 
+        avatarSectionWrapperSettings: {
+            width: '100%',
+            alignItems: 'center',
+            paddingTop: 20,
+        },
+
         selectCircle: {
             width: variables.componentSizeSmall,
             height: variables.componentSizeSmall,

diff --git a/src/styles/themes/default.ts b/src/styles/themes/default.ts
@@ -12,8 +12,9 @@ const darkTheme = {
     borderLighter: colors.darkDefaultButton,
     borderFocus: colors.green400,
     icon: colors.darkIcons,
-    iconMenu: colors.green400,
+    iconMenu: colors.darkIcons,
     iconHovered: colors.darkPrimaryText,
+    iconMenuHovered: colors.green400,
     iconSuccessFill: colors.green400,
     iconReversed: colors.darkAppBackground,
     iconColorfulBackground: `${colors.ivory}cc`,
@@ -124,7 +125,7 @@ const darkTheme = {
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
         [SCREENS.SETTINGS.ROOT]: {
-            backgroundColor: colors.darkHighlightBackground,
+            backgroundColor: colors.darkAppBackground,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
     },

diff --git a/src/styles/themes/light.ts b/src/styles/themes/light.ts
@@ -12,8 +12,9 @@ const lightTheme = {
     borderLighter: colors.lightDefaultButtonPressed,
     borderFocus: colors.green400,
     icon: colors.lightIcons,
-    iconMenu: colors.green400,
+    iconMenu: colors.darkIcons,
     iconHovered: colors.lightPrimaryText,
+    iconMenuHovered: colors.green400,
     iconSuccessFill: colors.green400,
     iconReversed: colors.lightAppBackground,
     iconColorfulBackground: `${colors.ivory}cc`,
@@ -124,7 +125,7 @@ const lightTheme = {
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
         [SCREENS.SETTINGS.ROOT]: {
-            backgroundColor: colors.lightHighlightBackground,
+            backgroundColor: colors.lightAppBackground,
             statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
     },

diff --git a/src/styles/themes/types.ts b/src/styles/themes/types.ts
@@ -17,6 +17,7 @@ type ThemeColors = {
     icon: Color;
     iconMenu: Color;
     iconHovered: Color;
+    iconMenuHovered: Color;
     iconSuccessFill: Color;
     iconReversed: Color;
     iconColorfulBackground: Color;