laantungir/minibits_wallet
1
0
Fork 0
mirror of https://github.com/minibits-cash/minibits_wallet.git synced 2026-07-22 07:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Amount style update, iOS icon fix

Browse Source
This commit is contained in:
minibits-cash
2026-03-23 14:59:26 +01:00
parent c0312d770c
commit 9aca87f66a
7 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ios/minibits_wallet.xcodeproj/project.pbxproj
View File

@@ -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;

2
ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme
View File

@@ -31,7 +31,7 @@
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

9
src/components/AmountInput.tsx
View File

@@ -214,10 +214,11 @@ export const AmountInput = forwardRef<TextInput, AmountInputProps>(
}, [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<TextInput, AmountInputProps>(
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,
}

2
src/screens/TranDetailScreen.tsx
View File

@@ -254,7 +254,7 @@ export const TranDetailScreen = observer(function TranDetailScreen({ route }: Pr
<Text
preset="heading"
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 && (
<View

2
src/screens/Wallet/CurrencyAmount.tsx
View File

@@ -77,7 +77,7 @@ export const CurrencyAmount = observer(function (props: {
const $amount: TextStyle = {
// fontSize: verticalScale(20),
fontFamily: typography.fonts?.hammersmithOne.normal,
fontFamily: typography.primary?.medium,
alignSelf: 'center',
// marginLeft: spacing.extraSmall
}

7
src/screens/WalletScreen.tsx
View File

@@ -942,7 +942,7 @@ const UnitBalanceBlock = observer(function (props: {
mintUnit={unitBalance.unit}
symbolStyle={{display: 'none'}}
amountStyle={[$unitBalance, {color: balanceColor}]}
containerStyle={{marginTop: spacing.large}}
containerStyle={{marginTop: spacing.small}}
/>
<>
{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
}

5
src/theme/typography.ts
View File

@@ -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.