diff --git a/ios/minibits_wallet.xcodeproj/project.pbxproj b/ios/minibits_wallet.xcodeproj/project.pbxproj index 78e254c..a16acb5 100644 --- a/ios/minibits_wallet.xcodeproj/project.pbxproj +++ b/ios/minibits_wallet.xcodeproj/project.pbxproj @@ -298,10 +298,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-minibits_wallet.debug.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = AppIconGolden; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = GR2ZKMCLAM; ENABLE_BITCODE = NO; INFOPLIST_FILE = minibits_wallet/Info.plist; @@ -334,10 +335,11 @@ isa = XCBuildConfiguration; baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-minibits_wallet.release.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = AppIconGolden; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = GR2ZKMCLAM; INFOPLIST_FILE = minibits_wallet/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Minibits; @@ -452,10 +454,7 @@ "-DFOLLY_HAVE_CLOCK_GETTIME=1", "-DRCT_REMOVE_LEGACY_ARCH=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -543,10 +542,7 @@ "-DFOLLY_HAVE_CLOCK_GETTIME=1", "-DRCT_REMOVE_LEGACY_ARCH=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme b/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme index 72677cb..9a1b755 100644 --- a/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme +++ b/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme @@ -31,7 +31,7 @@ shouldAutocreateTestPlan = "YES"> ( }, [focused, topScale, bottomScale]) const defaultTopStyle: TextStyle = { - marginTop: spacing.small, + //marginTop: spacing.small, padding: 0, fontSize: verticalScale(56), - fontFamily: typography.fonts.hammersmithOne.normal, + fontFamily: typography.primary?.bold, + fontWeight: 'bold', // android textAlign: "center", color: amountInputColor, } @@ -230,9 +231,11 @@ export const AmountInput = forwardRef( const defaultBottomStyle: TextStyle = { margin: 0, + marginBottom: spacing.tiny, padding: 0, fontSize: spacing.medium, - fontFamily: typography.fonts.hammersmithOne.normal, + fontFamily: typography.primary?.bold, + fontWeight: 'bold', // android color: convertedAmountColor, } diff --git a/src/screens/TranDetailScreen.tsx b/src/screens/TranDetailScreen.tsx index 5738d67..c056cd4 100644 --- a/src/screens/TranDetailScreen.tsx +++ b/src/screens/TranDetailScreen.tsx @@ -254,7 +254,7 @@ export const TranDetailScreen = observer(function TranDetailScreen({ route }: Pr {transaction.status !== TransactionStatus.COMPLETED && ( <> {walletStore.exchangeRate @@ -954,7 +954,7 @@ const UnitBalanceBlock = observer(function (props: { symbolStyle={{color: convertedBalanceColor}} amountStyle={{color: convertedBalanceColor}} size='small' - containerStyle={{marginVertical: -spacing.small}} + containerStyle={{marginVertical: -spacing.tiny}} /> )} @@ -1200,7 +1200,8 @@ const $card: ViewStyle = { const $unitBalance: TextStyle = { fontSize: verticalScale(56), lineHeight: verticalScale(56), - fontFamily: typography.fonts.hammersmithOne.normal, + fontFamily: typography.primary?.bold, + fontWeight: 'bold', // android } diff --git a/src/theme/typography.ts b/src/theme/typography.ts index 0246faa..ba43be8 100644 --- a/src/theme/typography.ts +++ b/src/theme/typography.ts @@ -10,17 +10,20 @@ const fonts = { light: 'HelveticaNeue-Light', normal: 'Helvetica Neue', medium: 'HelveticaNeue-Medium', + bold: 'HelveticaNeue-Bold', }, courier: { // iOS only font. normal: 'Courier', }, sansSerif: { - // Android only font. + // Android only font. Bold is achieved via fontWeight: 'bold' / '700' in styles, + // not a separate family name — 'sans-serif-bold' does not work on modern Android. thin: 'sans-serif-thin', light: 'sans-serif-light', normal: 'sans-serif', medium: 'sans-serif-medium', + bold: 'sans-serif', // use fontWeight: 'bold' alongside this }, monospace: { // Android only font.