mirror of
https://github.com/minibits-cash/minibits_wallet.git
synced 2026-10-05 11:18:24 +00:00
Amount style update, iOS icon fix
This commit is contained in:
@@ -298,10 +298,11 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-minibits_wallet.debug.xcconfig */;
|
baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-minibits_wallet.debug.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
|
ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = AppIconGolden;
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements;
|
CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements;
|
||||||
CURRENT_PROJECT_VERSION = 19;
|
CURRENT_PROJECT_VERSION = 20;
|
||||||
DEVELOPMENT_TEAM = GR2ZKMCLAM;
|
DEVELOPMENT_TEAM = GR2ZKMCLAM;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = minibits_wallet/Info.plist;
|
INFOPLIST_FILE = minibits_wallet/Info.plist;
|
||||||
@@ -334,10 +335,11 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-minibits_wallet.release.xcconfig */;
|
baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-minibits_wallet.release.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
|
ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = AppIconGolden;
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements;
|
CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements;
|
||||||
CURRENT_PROJECT_VERSION = 19;
|
CURRENT_PROJECT_VERSION = 20;
|
||||||
DEVELOPMENT_TEAM = GR2ZKMCLAM;
|
DEVELOPMENT_TEAM = GR2ZKMCLAM;
|
||||||
INFOPLIST_FILE = minibits_wallet/Info.plist;
|
INFOPLIST_FILE = minibits_wallet/Info.plist;
|
||||||
INFOPLIST_KEY_CFBundleDisplayName = Minibits;
|
INFOPLIST_KEY_CFBundleDisplayName = Minibits;
|
||||||
@@ -452,10 +454,7 @@
|
|||||||
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
|
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
|
||||||
"-DRCT_REMOVE_LEGACY_ARCH=1",
|
"-DRCT_REMOVE_LEGACY_ARCH=1",
|
||||||
);
|
);
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = "$(inherited) ";
|
||||||
"$(inherited)",
|
|
||||||
" ",
|
|
||||||
);
|
|
||||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
|
||||||
@@ -543,10 +542,7 @@
|
|||||||
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
|
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
|
||||||
"-DRCT_REMOVE_LEGACY_ARCH=1",
|
"-DRCT_REMOVE_LEGACY_ARCH=1",
|
||||||
);
|
);
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = "$(inherited) ";
|
||||||
"$(inherited)",
|
|
||||||
" ",
|
|
||||||
);
|
|
||||||
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_COMPILATION_MODE = wholemodule;
|
SWIFT_COMPILATION_MODE = wholemodule;
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
shouldAutocreateTestPlan = "YES">
|
shouldAutocreateTestPlan = "YES">
|
||||||
</TestAction>
|
</TestAction>
|
||||||
<LaunchAction
|
<LaunchAction
|
||||||
buildConfiguration = "Debug"
|
buildConfiguration = "Release"
|
||||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
launchStyle = "0"
|
launchStyle = "0"
|
||||||
|
|||||||
@@ -214,10 +214,11 @@ export const AmountInput = forwardRef<TextInput, AmountInputProps>(
|
|||||||
}, [focused, topScale, bottomScale])
|
}, [focused, topScale, bottomScale])
|
||||||
|
|
||||||
const defaultTopStyle: TextStyle = {
|
const defaultTopStyle: TextStyle = {
|
||||||
marginTop: spacing.small,
|
//marginTop: spacing.small,
|
||||||
padding: 0,
|
padding: 0,
|
||||||
fontSize: verticalScale(56),
|
fontSize: verticalScale(56),
|
||||||
fontFamily: typography.fonts.hammersmithOne.normal,
|
fontFamily: typography.primary?.bold,
|
||||||
|
fontWeight: 'bold', // android
|
||||||
textAlign: "center",
|
textAlign: "center",
|
||||||
color: amountInputColor,
|
color: amountInputColor,
|
||||||
}
|
}
|
||||||
@@ -230,9 +231,11 @@ export const AmountInput = forwardRef<TextInput, AmountInputProps>(
|
|||||||
|
|
||||||
const defaultBottomStyle: TextStyle = {
|
const defaultBottomStyle: TextStyle = {
|
||||||
margin: 0,
|
margin: 0,
|
||||||
|
marginBottom: spacing.tiny,
|
||||||
padding: 0,
|
padding: 0,
|
||||||
fontSize: spacing.medium,
|
fontSize: spacing.medium,
|
||||||
fontFamily: typography.fonts.hammersmithOne.normal,
|
fontFamily: typography.primary?.bold,
|
||||||
|
fontWeight: 'bold', // android
|
||||||
color: convertedAmountColor,
|
color: convertedAmountColor,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ export const TranDetailScreen = observer(function TranDetailScreen({ route }: Pr
|
|||||||
<Text
|
<Text
|
||||||
preset="heading"
|
preset="heading"
|
||||||
text={getFormattedAmount()}
|
text={getFormattedAmount()}
|
||||||
style={[$tranAmount, {color: headerTitle, fontFamily: typography.fonts?.hammersmithOne.normal}]}
|
style={[$tranAmount, {color: headerTitle, fontFamily: typography.primary?.bold, fontWeight: 'bold'}]}
|
||||||
/>
|
/>
|
||||||
{transaction.status !== TransactionStatus.COMPLETED && (
|
{transaction.status !== TransactionStatus.COMPLETED && (
|
||||||
<View
|
<View
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ export const CurrencyAmount = observer(function (props: {
|
|||||||
|
|
||||||
const $amount: TextStyle = {
|
const $amount: TextStyle = {
|
||||||
// fontSize: verticalScale(20),
|
// fontSize: verticalScale(20),
|
||||||
fontFamily: typography.fonts?.hammersmithOne.normal,
|
fontFamily: typography.primary?.medium,
|
||||||
alignSelf: 'center',
|
alignSelf: 'center',
|
||||||
// marginLeft: spacing.extraSmall
|
// marginLeft: spacing.extraSmall
|
||||||
}
|
}
|
||||||
@@ -942,7 +942,7 @@ const UnitBalanceBlock = observer(function (props: {
|
|||||||
mintUnit={unitBalance.unit}
|
mintUnit={unitBalance.unit}
|
||||||
symbolStyle={{display: 'none'}}
|
symbolStyle={{display: 'none'}}
|
||||||
amountStyle={[$unitBalance, {color: balanceColor}]}
|
amountStyle={[$unitBalance, {color: balanceColor}]}
|
||||||
containerStyle={{marginTop: spacing.large}}
|
containerStyle={{marginTop: spacing.small}}
|
||||||
/>
|
/>
|
||||||
<>
|
<>
|
||||||
{walletStore.exchangeRate
|
{walletStore.exchangeRate
|
||||||
@@ -954,7 +954,7 @@ const UnitBalanceBlock = observer(function (props: {
|
|||||||
symbolStyle={{color: convertedBalanceColor}}
|
symbolStyle={{color: convertedBalanceColor}}
|
||||||
amountStyle={{color: convertedBalanceColor}}
|
amountStyle={{color: convertedBalanceColor}}
|
||||||
size='small'
|
size='small'
|
||||||
containerStyle={{marginVertical: -spacing.small}}
|
containerStyle={{marginVertical: -spacing.tiny}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
@@ -1200,7 +1200,8 @@ const $card: ViewStyle = {
|
|||||||
const $unitBalance: TextStyle = {
|
const $unitBalance: TextStyle = {
|
||||||
fontSize: verticalScale(56),
|
fontSize: verticalScale(56),
|
||||||
lineHeight: verticalScale(56),
|
lineHeight: verticalScale(56),
|
||||||
fontFamily: typography.fonts.hammersmithOne.normal,
|
fontFamily: typography.primary?.bold,
|
||||||
|
fontWeight: 'bold', // android
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,17 +10,20 @@ const fonts = {
|
|||||||
light: 'HelveticaNeue-Light',
|
light: 'HelveticaNeue-Light',
|
||||||
normal: 'Helvetica Neue',
|
normal: 'Helvetica Neue',
|
||||||
medium: 'HelveticaNeue-Medium',
|
medium: 'HelveticaNeue-Medium',
|
||||||
|
bold: 'HelveticaNeue-Bold',
|
||||||
},
|
},
|
||||||
courier: {
|
courier: {
|
||||||
// iOS only font.
|
// iOS only font.
|
||||||
normal: 'Courier',
|
normal: 'Courier',
|
||||||
},
|
},
|
||||||
sansSerif: {
|
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',
|
thin: 'sans-serif-thin',
|
||||||
light: 'sans-serif-light',
|
light: 'sans-serif-light',
|
||||||
normal: 'sans-serif',
|
normal: 'sans-serif',
|
||||||
medium: 'sans-serif-medium',
|
medium: 'sans-serif-medium',
|
||||||
|
bold: 'sans-serif', // use fontWeight: 'bold' alongside this
|
||||||
},
|
},
|
||||||
monospace: {
|
monospace: {
|
||||||
// Android only font.
|
// Android only font.
|
||||||
|
|||||||
Reference in New Issue
Block a user