feat: putting theme in fontWeight bold and normal (#1061)

Signed-off-by: Caroline Lucas Calheirani <[email protected]>
openwallet-foundation · Jan 29, 2024 · 4bbf7c6 · 4bbf7c6
1 parent 966fedf
commit 4bbf7c6
Show file tree

Hide file tree

Showing 40 changed files with 119 additions and 222 deletions.
diff --git a/packages/legacy/core/App/components/chat/ActionSlider.tsx b/packages/legacy/core/App/components/chat/ActionSlider.tsx
@@ -45,8 +45,7 @@ const ActionSlider: React.FC<Props> = ({ actions, onDismiss }) => {
       elevation: 5,
     },
     drawerTitleText: {
-      ...TextTheme.normal,
-      fontWeight: 'bold',
+      ...TextTheme.bold,
       textAlign: 'center',
       marginVertical: 10,
     },

diff --git a/packages/legacy/core/App/components/listItems/NotificationListItem.tsx b/packages/legacy/core/App/components/listItems/NotificationListItem.tsx
@@ -115,9 +115,8 @@ const NotificationListItem: React.FC<NotificationListItemProps> = ({ notificatio
       paddingBottom: 5,
     },
     headerText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       flexGrow: 1,
-      fontWeight: 'bold',
       alignSelf: 'center',
       flex: 1,
     },

diff --git a/packages/legacy/core/App/components/misc/CredentialCard11.tsx b/packages/legacy/core/App/components/misc/CredentialCard11.tsx
@@ -218,7 +218,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
     },
     credActionText: {
       fontSize: 20,
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
       color: ColorPallet.brand.link,
     },
   })
@@ -298,10 +298,9 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
         ) : (
           <Text
             style={[
-              TextTheme.normal,
+              TextTheme.bold,
               {
                 fontSize: 0.5 * logoHeight,
-                fontWeight: 'bold',
                 alignSelf: 'center',
                 color: '#000',
               },
@@ -346,11 +345,10 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
         ) : (
           <Text
             style={[
-              TextTheme.normal,
+              TextTheme.bold,
               styles.textContainer,
               {
                 lineHeight: 24,
-                fontWeight: 'bold',
               },
               { color: warn ? ColorPallet.notification.warnText : styles.textContainer.color },
             ]}
@@ -432,10 +430,9 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
             <Text
               testID={testIdWithKey('CredentialName')}
               style={[
-                TextTheme.normal,
+                TextTheme.bold,
                 styles.textContainer,
                 {
-                  fontWeight: 'bold',
                   lineHeight: 24,
                   flex: 1,
                   flexWrap: 'wrap',

diff --git a/packages/legacy/core/App/components/misc/InfoBox.tsx b/packages/legacy/core/App/components/misc/InfoBox.tsx
@@ -72,10 +72,9 @@ const InfoBox: React.FC<BifoldErrorProps> = ({
       flexGrow: 0,
     },
     headerText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       marginLeft: 7,
       flexShrink: 1,
-      fontWeight: 'bold',
       alignSelf: 'center',
       color: ColorPallet.notification.infoText,
     },
@@ -91,7 +90,7 @@ const InfoBox: React.FC<BifoldErrorProps> = ({
     },
     showDetailsText: {
       ...TextTheme.title,
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       color: ColorPallet.brand.link,
     },
   })

diff --git a/packages/legacy/core/App/components/misc/ScanTab.tsx b/packages/legacy/core/App/components/misc/ScanTab.tsx
@@ -13,7 +13,7 @@ interface ScanTabProps {
 }
 
 const ScanTab: React.FC<ScanTabProps> = ({ onPress, active, iconName, title }) => {
-  const { TabTheme } = useTheme()
+  const { TabTheme, TextTheme } = useTheme()
   const { fontScale } = useWindowDimensions()
   const showLabels = fontScale * TabTheme.tabBarTextStyle.fontSize < 18
 
@@ -24,7 +24,7 @@ const ScanTab: React.FC<ScanTabProps> = ({ onPress, active, iconName, title }) =
     text: {
       ...TabTheme.tabBarTextStyle,
       color: active ? TabTheme.tabBarActiveTintColor : TabTheme.tabBarInactiveTintColor,
-      fontWeight: active ? 'bold' : 'normal',
+      fontWeight: active ? TextTheme.bold.fontWeight : TextTheme.normal.fontWeight,
     },
   })
   return (

diff --git a/packages/legacy/core/App/components/misc/SharedProofData.tsx b/packages/legacy/core/App/components/misc/SharedProofData.tsx
@@ -69,12 +69,12 @@ const SharedDataCard: React.FC<{ sharedData: GroupedSharedProofDataItem }> = ({
     },
     attributeName: {
       fontSize: 16,
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       color: ColorPallet.grayscale.black,
     },
     attributeValue: {
       fontSize: 18,
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
       color: ColorPallet.grayscale.black,
     },
   })
@@ -161,10 +161,9 @@ const SharedDataCard: React.FC<{ sharedData: GroupedSharedProofDataItem }> = ({
         ) : (
           <Text
             style={[
-              TextTheme.normal,
+              TextTheme.bold,
               {
                 fontSize: 0.5 * logoHeight,
-                fontWeight: 'bold',
                 alignSelf: 'center',
                 color: ColorPallet.grayscale.black,
               },

diff --git a/packages/legacy/core/App/components/modals/AppGuideModal.tsx b/packages/legacy/core/App/components/modals/AppGuideModal.tsx
@@ -63,7 +63,6 @@ const AppGuideModal: React.FC<AppGuideModalProps> = ({
     },
     headerText: {
       ...TextTheme.headingThree,
-      fontWeight: 'bold',
       alignSelf: 'flex-start',
       flexWrap: 'wrap',
       color: ColorPallet.notification.infoText,

diff --git a/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx b/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx
@@ -52,7 +52,7 @@ const Dropdown: React.FC<RemoveProps> = ({ title, content }) => {
           },
         ]}
       >
-        <Text style={[TextTheme.modalNormal, { fontWeight: 'bold' }]}>{title}</Text>
+        <Text style={[TextTheme.modalNormal, { fontWeight: TextTheme.bold.fontWeight }]}>{title}</Text>
         <Icon name={isCollapsed ? 'expand-more' : 'expand-less'} size={24} color={TextTheme.modalNormal.color} />
       </TouchableOpacity>
       <Collapsible collapsed={isCollapsed} enablePointerEvents={true}>

diff --git a/packages/legacy/core/App/components/modals/DismissiblePopupModal.tsx b/packages/legacy/core/App/components/modals/DismissiblePopupModal.tsx
@@ -72,8 +72,7 @@ const DismissiblePopupModal: React.FC<DismissiblePopupModalProps> = ({
       flexGrow: 1,
     },
     headerText: {
-      ...TextTheme.normal,
-      fontWeight: 'bold',
+      ...TextTheme.bold,
       alignSelf: 'flex-start',
       color: ColorPallet.notification.infoText,
     },

diff --git a/packages/legacy/core/App/components/modals/NotificationModal.tsx b/packages/legacy/core/App/components/modals/NotificationModal.tsx
@@ -101,7 +101,9 @@ const NotificationModal: React.FC<NotificationModalProps> = ({
           </View>
         ) : null}
         <View style={styles.childContainer}>
-          <Text style={[TextTheme.headingThree, { fontWeight: 'normal', textAlign: 'center' }]}>{title}</Text>
+          <Text style={[TextTheme.headingThree, { fontWeight: TextTheme.normal.fontWeight, textAlign: 'center' }]}>
+            {title}
+          </Text>
           {children}
         </View>
         {doneVisible ? (

diff --git a/packages/legacy/core/App/components/record/RecordField.tsx b/packages/legacy/core/App/components/record/RecordField.tsx
@@ -98,10 +98,7 @@ const RecordField: React.FC<RecordFieldProps> = ({
         {fieldLabel ? (
           fieldLabel(field)
         ) : (
-          <Text
-            style={[ListItems.recordAttributeLabel, { fontWeight: 'bold' }]}
-            testID={testIdWithKey('AttributeName')}
-          >
+          <Text style={[ListItems.recordAttributeLabel]} testID={testIdWithKey('AttributeName')}>
             {field.label ?? startCase(field.name || '')}
           </Text>
         )}

diff --git a/packages/legacy/core/App/components/texts/InfoTextBox.tsx b/packages/legacy/core/App/components/texts/InfoTextBox.tsx
@@ -26,9 +26,8 @@ const InfoTextBox: React.FC<TextBoxProps> = ({ children }) => {
       alignItems: 'center',
     },
     textContainer: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       color: ColorPallet.notification.infoText,
-      fontWeight: 'bold',
       alignSelf: 'center',
       flexShrink: 1,
     },

diff --git a/packages/legacy/core/App/components/toast/BaseToast.tsx b/packages/legacy/core/App/components/toast/BaseToast.tsx
@@ -50,7 +50,7 @@ const BaseToast: React.FC<BaseToastProps> = ({ title, body, toastType, onPress =
       marginHorizontal: 15,
     },
     title: {
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
     },
     body: {
       marginTop: 10,

diff --git a/packages/legacy/core/App/components/tour/TourBox.tsx b/packages/legacy/core/App/components/tour/TourBox.tsx
@@ -100,7 +100,6 @@ export function TourBox(props: TourBoxProps): ReactElement {
     },
     headerText: {
       ...TextTheme.headingThree,
-      fontWeight: 'bold',
       alignSelf: 'flex-start',
       color: ColorPallet.notification.infoText,
     },
@@ -116,9 +115,8 @@ export function TourBox(props: TourBoxProps): ReactElement {
       justifyContent: 'space-around',
     },
     navText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       color: ColorPallet.brand.primary,
-      fontWeight: 'bold',
     },
     pagerContainer: {
       flexDirection: 'row',

diff --git a/packages/legacy/core/App/components/views/FauxNavigationBar.tsx b/packages/legacy/core/App/components/views/FauxNavigationBar.tsx
@@ -33,10 +33,9 @@ const FauxNavigationBar: React.FC<FauxNavigationBarProps> = ({ title, onHomeTouc
       justifyContent: 'space-between',
     },
     label: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       color: ColorPallet.brand.headerText,
       fontSize: 17,
-      fontWeight: 'bold',
       flexGrow: 1,
       textAlign: 'center',
       paddingBottom: 12,

diff --git a/packages/legacy/core/App/components/views/HomeFooterView.tsx b/packages/legacy/core/App/components/views/HomeFooterView.tsx
@@ -19,7 +19,7 @@ const HomeFooterView: React.FC<HomeFooterViewProps> = ({ children }) => {
     ...useCredentialByState(CredentialState.Done),
   ]
   const notifications = useNotifications()
-  const { HomeTheme } = useTheme()
+  const { HomeTheme, TextTheme } = useTheme()
   const { t } = useTranslation()
   const styles = StyleSheet.create({
     container: {
@@ -45,15 +45,15 @@ const HomeFooterView: React.FC<HomeFooterViewProps> = ({ children }) => {
     if (credentialCount === 1) {
       credentialMsg = (
         <Text>
-          {t('Home.YouHave')} <Text style={{ fontWeight: 'bold' }}>{credentialCount}</Text> {t('Home.Credential')}{' '}
-          {t('Home.InYourWallet')}
+          {t('Home.YouHave')} <Text style={{ fontWeight: TextTheme.bold.fontWeight }}>{credentialCount}</Text>{' '}
+          {t('Home.Credential')} {t('Home.InYourWallet')}
         </Text>
       )
     } else if (credentialCount > 1) {
       credentialMsg = (
         <Text>
-          {t('Home.YouHave')} <Text style={{ fontWeight: 'bold' }}>{credentialCount}</Text> {t('Home.Credentials')}{' '}
-          {t('Home.InYourWallet')}
+          {t('Home.YouHave')} <Text style={{ fontWeight: TextTheme.bold.fontWeight }}>{credentialCount}</Text>{' '}
+          {t('Home.Credentials')} {t('Home.InYourWallet')}
         </Text>
       )
     } else {

diff --git a/packages/legacy/core/App/navigators/TabStack.tsx b/packages/legacy/core/App/navigators/TabStack.tsx
@@ -25,7 +25,7 @@ const TabStack: React.FC = () => {
   const { t } = useTranslation()
   const Tab = createBottomTabNavigator<TabStackParams>()
   const { assertConnectedNetwork } = useNetwork()
-  const { ColorPallet, TabTheme } = useTheme()
+  const { ColorPallet, TabTheme, TextTheme } = useTheme()
   const [orientation, setOrientation] = useState(OrientationType.PORTRAIT)
   const showLabels = fontScale * TabTheme.tabBarTextStyle.fontSize < 18
   const styles = StyleSheet.create({
@@ -74,7 +74,7 @@ const TabStack: React.FC = () => {
                       style={{
                         ...TabTheme.tabBarTextStyle,
                         color: focused ? TabTheme.tabBarActiveTintColor : TabTheme.tabBarInactiveTintColor,
-                        fontWeight: focused ? 'bold' : 'normal',
+                        fontWeight: focused ? TextTheme.bold.fontWeight : TextTheme.normal.fontWeight,
                       }}
                     >
                       {t('TabStack.Home')}
@@ -189,7 +189,7 @@ const TabStack: React.FC = () => {
                       style={{
                         ...TabTheme.tabBarTextStyle,
                         color: focused ? TabTheme.tabBarActiveTintColor : TabTheme.tabBarInactiveTintColor,
-                        fontWeight: focused ? 'bold' : 'normal',
+                        fontWeight: focused ? TextTheme.bold.fontWeight : TextTheme.normal.fontWeight,
                       }}
                     >
                       {t('TabStack.Credentials')}

diff --git a/packages/legacy/core/App/screens/AttemptLockout.tsx b/packages/legacy/core/App/screens/AttemptLockout.tsx
@@ -49,9 +49,8 @@ const AttemptLockout: React.FC = () => {
       textAlign: 'center',
     },
     countDown: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       textAlign: 'center',
-      fontWeight: 'bold',
     },
     image: {
       width: 150,

diff --git a/packages/legacy/core/App/screens/Connection.tsx b/packages/legacy/core/App/screens/Connection.tsx
@@ -63,7 +63,7 @@ const Connection: React.FC<ConnectionProps> = ({ navigation, route }) => {
       alignItems: 'center',
     },
     messageText: {
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       textAlign: 'center',
       marginTop: 30,
     },

diff --git a/packages/legacy/core/App/screens/CredentialOffer.tsx b/packages/legacy/core/App/screens/CredentialOffer.tsx
@@ -49,7 +49,7 @@ const CredentialOffer: React.FC<CredentialOfferProps> = ({ navigation, route })
 
   const { agent } = useAppAgent()
   const { t, i18n } = useTranslation()
-  const { ListItems, ColorPallet } = useTheme()
+  const { TextTheme, ColorPallet } = useTheme()
   const { RecordLoading } = useAnimatedComponents()
   const { assertConnectedNetwork } = useNetwork()
   const { OCABundleResolver, enableTours: enableToursConfig } = useConfiguration()
@@ -71,7 +71,7 @@ const CredentialOffer: React.FC<CredentialOfferProps> = ({ navigation, route })
       paddingVertical: 16,
     },
     headerText: {
-      ...ListItems.recordAttributeLabel,
+      ...TextTheme.normal,
       flexShrink: 1,
     },
     footerButton: {

diff --git a/packages/legacy/core/App/screens/CredentialOfferAccept.tsx b/packages/legacy/core/App/screens/CredentialOfferAccept.tsx
@@ -50,7 +50,6 @@ const CredentialOfferAccept: React.FC<CredentialOfferAcceptProps> = ({ visible,
       alignItems: 'center',
     },
     messageText: {
-      fontWeight: 'normal',
       textAlign: 'center',
       marginTop: 30,
     },

diff --git a/packages/legacy/core/App/screens/Developer.tsx b/packages/legacy/core/App/screens/Developer.tsx
@@ -35,10 +35,9 @@ const Developer: React.FC = () => {
       alignItems: 'center',
     },
     settingLabelText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       marginRight: 10,
       textAlign: 'left',
-      fontWeight: 'bold',
     },
     settingSwitchContainer: {
       justifyContent: 'center',

diff --git a/packages/legacy/core/App/screens/OnboardingPages.tsx b/packages/legacy/core/App/screens/OnboardingPages.tsx
@@ -51,8 +51,6 @@ export const createCarouselStyle = (OnboardingTheme: any): OnboardingStyleSheet
     },
     pagerNavigationButton: {
       ...OnboardingTheme.pagerNavigationButton,
-      fontSize: 18,
-      fontWeight: 'bold',
     },
   })
 }

diff --git a/packages/legacy/core/App/screens/PINCreate.tsx b/packages/legacy/core/App/screens/PINCreate.tsx
@@ -175,7 +175,7 @@ const PINCreate: React.FC<PINCreateProps> = ({ setAuthenticated, route }) => {
       <View style={style.screenContainer}>
         <View style={style.contentContainer}>
           <Text style={[TextTheme.normal, { marginBottom: 16 }]}>
-            <Text style={{ fontWeight: 'bold' }}>
+            <Text style={{ fontWeight: TextTheme.bold.fontWeight }}>
               {updatePin ? t('PINCreate.RememberChangePIN') : t('PINCreate.RememberPIN')}
             </Text>{' '}
             {t('PINCreate.PINDisclaimer')}