Compare commits
2 Commits
v0.1.0-alp
...
v0.1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a4f5a8b6e | ||
|
|
04a2a430cc |
28
README.md
@@ -86,6 +86,34 @@ You've successfully run and modified your React Native App. :partying_face:
|
|||||||
|
|
||||||
If you're having issues getting the above steps to work, see the [Troubleshooting](https://reactnative.dev/docs/troubleshooting) page.
|
If you're having issues getting the above steps to work, see the [Troubleshooting](https://reactnative.dev/docs/troubleshooting) page.
|
||||||
|
|
||||||
|
# Versioning (Single Source of Truth)
|
||||||
|
|
||||||
|
App versioning is centralized in [version.config.json](version.config.json).
|
||||||
|
|
||||||
|
## Commands
|
||||||
|
|
||||||
|
```sh
|
||||||
|
# Sync all targets from version.config.json
|
||||||
|
npm run version:sync
|
||||||
|
|
||||||
|
# Set exact version (and optional build number)
|
||||||
|
npm run version:set -- 1.2.0
|
||||||
|
npm run version:set -- 1.2.0 42
|
||||||
|
|
||||||
|
# Bump and auto-increment build number
|
||||||
|
npm run version:bump -- patch
|
||||||
|
npm run version:bump -- minor
|
||||||
|
npm run version:bump -- major
|
||||||
|
npm run version:bump -- build
|
||||||
|
```
|
||||||
|
|
||||||
|
## Synced targets
|
||||||
|
|
||||||
|
- `package.json` → `version`
|
||||||
|
- `app.json` → `version`, `android.versionCode`, `ios.buildNumber`
|
||||||
|
- `android/app/build.gradle` → `versionName`, `versionCode`
|
||||||
|
- `ios/Expensso.xcodeproj/project.pbxproj` → `MARKETING_VERSION`, `CURRENT_PROJECT_VERSION`
|
||||||
|
|
||||||
# Learn More
|
# Learn More
|
||||||
|
|
||||||
To learn more about React Native, take a look at the following resources:
|
To learn more about React Native, take a look at the following resources:
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ android {
|
|||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "0.1.2"
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
debug {
|
debug {
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 24 KiB |
9
app.json
@@ -1,4 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "Expensso",
|
"name": "Expensso",
|
||||||
"displayName": "Expensso"
|
"displayName": "Expensso",
|
||||||
|
"version": "0.1.2",
|
||||||
|
"android": {
|
||||||
|
"versionCode": 1
|
||||||
|
},
|
||||||
|
"ios": {
|
||||||
|
"buildNumber": "1"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
45
generate-app-icons
Executable file
@@ -0,0 +1,45 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
ICON="assets/app-icon.png"
|
||||||
|
|
||||||
|
# Android icons
|
||||||
|
for d in mdpi:48 hdpi:72 xhdpi:96 xxhdpi:144 xxxhdpi:192; do
|
||||||
|
density="${d%%:*}"
|
||||||
|
size="${d##*:}"
|
||||||
|
|
||||||
|
out_dir="android/app/src/main/res/mipmap-${density}"
|
||||||
|
round_icon="${out_dir}/ic_launcher_round.png"
|
||||||
|
|
||||||
|
sips -z "$size" "$size" "$ICON" \
|
||||||
|
--out "${out_dir}/ic_launcher.png" >/dev/null
|
||||||
|
|
||||||
|
sips -z "$size" "$size" "$ICON" \
|
||||||
|
--out "$round_icon" >/dev/null
|
||||||
|
|
||||||
|
# Proper circular crop with preserved transparency (ImageMagick)
|
||||||
|
if command -v magick >/dev/null 2>&1; then
|
||||||
|
magick "$round_icon" \
|
||||||
|
-alpha set -background none \
|
||||||
|
\( -size ${size}x${size} xc:none \
|
||||||
|
-fill white -draw "circle $((size/2)),$((size/2)) $((size/2)),1" \) \
|
||||||
|
-compose CopyOpacity -composite \
|
||||||
|
"$round_icon"
|
||||||
|
else
|
||||||
|
echo "Warning: ImageMagick not found; skipping circular crop for $round_icon" >&2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# iOS icons
|
||||||
|
OUT="ios/Expensso/Images.xcassets/AppIcon.appiconset"
|
||||||
|
|
||||||
|
sips -z 40 40 "$ICON" --out "$OUT/Icon-20@2x.png" >/dev/null
|
||||||
|
sips -z 60 60 "$ICON" --out "$OUT/Icon-20@3x.png" >/dev/null
|
||||||
|
sips -z 58 58 "$ICON" --out "$OUT/Icon-29@2x.png" >/dev/null
|
||||||
|
sips -z 87 87 "$ICON" --out "$OUT/Icon-29@3x.png" >/dev/null
|
||||||
|
sips -z 80 80 "$ICON" --out "$OUT/Icon-40@2x.png" >/dev/null
|
||||||
|
sips -z 120 120 "$ICON" --out "$OUT/Icon-40@3x.png" >/dev/null
|
||||||
|
sips -z 120 120 "$ICON" --out "$OUT/Icon-60@2x.png" >/dev/null
|
||||||
|
sips -z 180 180 "$ICON" --out "$OUT/Icon-60@3x.png" >/dev/null
|
||||||
|
sips -z 1024 1024 "$ICON" --out "$OUT/Icon-1024.png" >/dev/null
|
||||||
|
|
||||||
|
echo "Icons generated!"
|
||||||
@@ -265,7 +265,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 0.1.2;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"-ObjC",
|
"-ObjC",
|
||||||
@@ -294,7 +294,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 0.1.2;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"-ObjC",
|
"-ObjC",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Expensso",
|
"name": "expensso",
|
||||||
"version": "0.0.1",
|
"version": "0.1.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"android": "react-native run-android",
|
"android": "react-native run-android",
|
||||||
@@ -8,6 +8,9 @@
|
|||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"start": "react-native start",
|
"start": "react-native start",
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
|
"version:sync": "node scripts/version.js sync",
|
||||||
|
"version:set": "node scripts/version.js set",
|
||||||
|
"version:bump": "node scripts/version.js bump",
|
||||||
"build:release": "cd android && ./gradlew assembleRelease --no-daemon",
|
"build:release": "cd android && ./gradlew assembleRelease --no-daemon",
|
||||||
"build:release:aab": "cd android && ./gradlew bundleRelease --no-daemon"
|
"build:release:aab": "cd android && ./gradlew bundleRelease --no-daemon"
|
||||||
},
|
},
|
||||||
|
|||||||
186
scripts/version.js
Normal file
@@ -0,0 +1,186 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
|
||||||
|
const fs = require('node:fs');
|
||||||
|
const path = require('node:path');
|
||||||
|
|
||||||
|
const rootDir = path.resolve(__dirname, '..');
|
||||||
|
const configPath = path.join(rootDir, 'version.config.json');
|
||||||
|
const packagePath = path.join(rootDir, 'package.json');
|
||||||
|
const appJsonPath = path.join(rootDir, 'app.json');
|
||||||
|
const androidGradlePath = path.join(rootDir, 'android', 'app', 'build.gradle');
|
||||||
|
const iosPbxprojPath = path.join(rootDir, 'ios', 'Expensso.xcodeproj', 'project.pbxproj');
|
||||||
|
|
||||||
|
function readJson(filePath) {
|
||||||
|
return JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
||||||
|
}
|
||||||
|
|
||||||
|
function writeJson(filePath, data) {
|
||||||
|
fs.writeFileSync(filePath, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
|
||||||
|
}
|
||||||
|
|
||||||
|
function readVersionConfig() {
|
||||||
|
const config = readJson(configPath);
|
||||||
|
|
||||||
|
if (!isValidVersion(config.version)) {
|
||||||
|
throw new Error(`Invalid version in version.config.json: ${config.version}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Number.isInteger(config.buildNumber) || config.buildNumber < 1) {
|
||||||
|
throw new Error(`Invalid buildNumber in version.config.json: ${config.buildNumber}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isValidVersion(version) {
|
||||||
|
return /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(version);
|
||||||
|
}
|
||||||
|
|
||||||
|
function bumpVersion(version, type) {
|
||||||
|
const base = version.split('-')[0].split('+')[0];
|
||||||
|
const [major, minor, patch] = base.split('.').map(Number);
|
||||||
|
|
||||||
|
if (![major, minor, patch].every(Number.isInteger)) {
|
||||||
|
throw new Error(`Cannot bump invalid version: ${version}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === 'major') {
|
||||||
|
return `${major + 1}.0.0`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === 'minor') {
|
||||||
|
return `${major}.${minor + 1}.0`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === 'patch') {
|
||||||
|
return `${major}.${minor}.${patch + 1}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`Unsupported bump type: ${type}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function replaceOrThrow(content, regex, replacement, targetName) {
|
||||||
|
if (!regex.test(content)) {
|
||||||
|
throw new Error(`Could not update ${targetName}. Expected pattern not found.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const updated = content.replace(regex, replacement);
|
||||||
|
|
||||||
|
return updated;
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncToTargets({version, buildNumber}) {
|
||||||
|
const packageJson = readJson(packagePath);
|
||||||
|
packageJson.version = version;
|
||||||
|
writeJson(packagePath, packageJson);
|
||||||
|
|
||||||
|
const appJson = readJson(appJsonPath);
|
||||||
|
appJson.version = version;
|
||||||
|
appJson.android = {...(appJson.android || {}), versionCode: buildNumber};
|
||||||
|
appJson.ios = {...(appJson.ios || {}), buildNumber: String(buildNumber)};
|
||||||
|
writeJson(appJsonPath, appJson);
|
||||||
|
|
||||||
|
let gradle = fs.readFileSync(androidGradlePath, 'utf8');
|
||||||
|
gradle = replaceOrThrow(
|
||||||
|
gradle,
|
||||||
|
/versionCode\s+\d+/,
|
||||||
|
`versionCode ${buildNumber}`,
|
||||||
|
'android versionCode',
|
||||||
|
);
|
||||||
|
gradle = replaceOrThrow(
|
||||||
|
gradle,
|
||||||
|
/versionName\s+"[^"]+"/,
|
||||||
|
`versionName "${version}"`,
|
||||||
|
'android versionName',
|
||||||
|
);
|
||||||
|
fs.writeFileSync(androidGradlePath, gradle, 'utf8');
|
||||||
|
|
||||||
|
let pbxproj = fs.readFileSync(iosPbxprojPath, 'utf8');
|
||||||
|
pbxproj = replaceOrThrow(
|
||||||
|
pbxproj,
|
||||||
|
/MARKETING_VERSION = [^;]+;/g,
|
||||||
|
`MARKETING_VERSION = ${version};`,
|
||||||
|
'iOS MARKETING_VERSION',
|
||||||
|
);
|
||||||
|
pbxproj = replaceOrThrow(
|
||||||
|
pbxproj,
|
||||||
|
/CURRENT_PROJECT_VERSION = [^;]+;/g,
|
||||||
|
`CURRENT_PROJECT_VERSION = ${buildNumber};`,
|
||||||
|
'iOS CURRENT_PROJECT_VERSION',
|
||||||
|
);
|
||||||
|
fs.writeFileSync(iosPbxprojPath, pbxproj, 'utf8');
|
||||||
|
}
|
||||||
|
|
||||||
|
function saveConfig(config) {
|
||||||
|
writeJson(configPath, config);
|
||||||
|
}
|
||||||
|
|
||||||
|
function printUsage() {
|
||||||
|
console.log('Usage:');
|
||||||
|
console.log(' node scripts/version.js sync');
|
||||||
|
console.log(' node scripts/version.js set <version> [buildNumber]');
|
||||||
|
console.log(' node scripts/version.js bump <major|minor|patch|build>');
|
||||||
|
}
|
||||||
|
|
||||||
|
function main() {
|
||||||
|
const [, , command, arg1, arg2] = process.argv;
|
||||||
|
|
||||||
|
if (!command) {
|
||||||
|
printUsage();
|
||||||
|
process.exitCode = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command === 'sync') {
|
||||||
|
const config = readVersionConfig();
|
||||||
|
syncToTargets(config);
|
||||||
|
console.log(`Synced version ${config.version} (${config.buildNumber})`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command === 'set') {
|
||||||
|
if (!arg1 || !isValidVersion(arg1)) {
|
||||||
|
throw new Error('set requires a valid semver, e.g. 1.2.3');
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = readVersionConfig();
|
||||||
|
const nextBuildNumber = arg2 ? Number(arg2) : config.buildNumber;
|
||||||
|
|
||||||
|
if (!Number.isInteger(nextBuildNumber) || nextBuildNumber < 1) {
|
||||||
|
throw new Error('buildNumber must be a positive integer');
|
||||||
|
}
|
||||||
|
|
||||||
|
const next = {version: arg1, buildNumber: nextBuildNumber};
|
||||||
|
saveConfig(next);
|
||||||
|
syncToTargets(next);
|
||||||
|
console.log(`Set version to ${next.version} (${next.buildNumber})`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (command === 'bump') {
|
||||||
|
if (!arg1 || !['major', 'minor', 'patch', 'build'].includes(arg1)) {
|
||||||
|
throw new Error('bump requires one of: major, minor, patch, build');
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = readVersionConfig();
|
||||||
|
const next = {
|
||||||
|
version: arg1 === 'build' ? config.version : bumpVersion(config.version, arg1),
|
||||||
|
buildNumber: config.buildNumber + 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
saveConfig(next);
|
||||||
|
syncToTargets(next);
|
||||||
|
console.log(`Bumped to ${next.version} (${next.buildNumber})`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
printUsage();
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
main();
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error instanceof Error ? error.message : String(error));
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
@@ -27,10 +27,12 @@ import {
|
|||||||
StyleSheet,
|
StyleSheet,
|
||||||
TouchableOpacity,
|
TouchableOpacity,
|
||||||
Pressable,
|
Pressable,
|
||||||
|
Platform,
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
import BottomSheet, {
|
import BottomSheet, {
|
||||||
BottomSheetBackdrop,
|
BottomSheetBackdrop,
|
||||||
BottomSheetScrollView,
|
BottomSheetScrollView,
|
||||||
|
BottomSheetTextInput,
|
||||||
BottomSheetView,
|
BottomSheetView,
|
||||||
type BottomSheetBackdropProps,
|
type BottomSheetBackdropProps,
|
||||||
} from '@gorhom/bottom-sheet';
|
} from '@gorhom/bottom-sheet';
|
||||||
@@ -199,6 +201,10 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
borderTopLeftRadius: shape.extraLarge,
|
borderTopLeftRadius: shape.extraLarge,
|
||||||
borderTopRightRadius: shape.extraLarge,
|
borderTopRightRadius: shape.extraLarge,
|
||||||
|
borderTopWidth: 1,
|
||||||
|
borderLeftWidth: 1,
|
||||||
|
borderRightWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
},
|
},
|
||||||
handleContainer: {
|
handleContainer: {
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
@@ -267,8 +273,6 @@ export interface BottomSheetInputProps {
|
|||||||
autoFocus?: boolean;
|
autoFocus?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
import {TextInput} from 'react-native';
|
|
||||||
|
|
||||||
export const BottomSheetInput: React.FC<BottomSheetInputProps> = ({
|
export const BottomSheetInput: React.FC<BottomSheetInputProps> = ({
|
||||||
label,
|
label,
|
||||||
value,
|
value,
|
||||||
@@ -283,6 +287,13 @@ export const BottomSheetInput: React.FC<BottomSheetInputProps> = ({
|
|||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const {colors, typography, shape, spacing} = theme;
|
const {colors, typography, shape, spacing} = theme;
|
||||||
const [focused, setFocused] = React.useState(false);
|
const [focused, setFocused] = React.useState(false);
|
||||||
|
const inputRef = React.useRef<React.ComponentRef<typeof BottomSheetTextInput>>(null);
|
||||||
|
|
||||||
|
const handlePressIn = React.useCallback(() => {
|
||||||
|
if (Platform.OS === 'android' && focused) {
|
||||||
|
inputRef.current?.focus();
|
||||||
|
}
|
||||||
|
}, [focused]);
|
||||||
|
|
||||||
const borderColor = error
|
const borderColor = error
|
||||||
? colors.error
|
? colors.error
|
||||||
@@ -321,7 +332,8 @@ export const BottomSheetInput: React.FC<BottomSheetInputProps> = ({
|
|||||||
{prefix}
|
{prefix}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
<TextInput
|
<BottomSheetTextInput
|
||||||
|
ref={inputRef}
|
||||||
style={{
|
style={{
|
||||||
flex: 1,
|
flex: 1,
|
||||||
...typography.bodyLarge,
|
...typography.bodyLarge,
|
||||||
@@ -336,6 +348,8 @@ export const BottomSheetInput: React.FC<BottomSheetInputProps> = ({
|
|||||||
keyboardType={keyboardType}
|
keyboardType={keyboardType}
|
||||||
multiline={multiline}
|
multiline={multiline}
|
||||||
autoFocus={autoFocus}
|
autoFocus={autoFocus}
|
||||||
|
showSoftInputOnFocus
|
||||||
|
onPressIn={handlePressIn}
|
||||||
onFocus={() => setFocused(true)}
|
onFocus={() => setFocused(true)}
|
||||||
onBlur={() => setFocused(false)}
|
onBlur={() => setFocused(false)}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -21,7 +21,13 @@ export const SummaryCard: React.FC<SummaryCardProps> = ({
|
|||||||
}) => {
|
}) => {
|
||||||
const {colors, typography, elevation, shape, spacing} = useTheme();
|
const {colors, typography, elevation, shape, spacing} = useTheme();
|
||||||
return (
|
return (
|
||||||
<View style={[styles.card, {backgroundColor: colors.surfaceContainerLow, ...elevation.level1}, style]}>
|
<View style={[styles.card, {
|
||||||
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
|
borderRadius: shape.small,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
|
...elevation.level1
|
||||||
|
}, style]}>
|
||||||
<View style={styles.cardHeader}>
|
<View style={styles.cardHeader}>
|
||||||
{icon && <View style={styles.iconContainer}>{icon}</View>}
|
{icon && <View style={styles.iconContainer}>{icon}</View>}
|
||||||
<Text style={[styles.cardTitle, {color: colors.onSurfaceVariant}]}>{title}</Text>
|
<Text style={[styles.cardTitle, {color: colors.onSurfaceVariant}]}>{title}</Text>
|
||||||
@@ -36,7 +42,6 @@ export const SummaryCard: React.FC<SummaryCardProps> = ({
|
|||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
card: {
|
card: {
|
||||||
borderRadius: 16,
|
|
||||||
padding: 16,
|
padding: 16,
|
||||||
shadowColor: '#000',
|
shadowColor: '#000',
|
||||||
shadowOffset: {width: 0, height: 2},
|
shadowOffset: {width: 0, height: 2},
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ const styles = StyleSheet.create({
|
|||||||
iconCircle: {
|
iconCircle: {
|
||||||
width: 44,
|
width: 44,
|
||||||
height: 44,
|
height: 44,
|
||||||
borderRadius: 22,
|
borderRadius: 4,
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -187,6 +187,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
flex: 1,
|
flex: 1,
|
||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
borderRadius: shape.medium,
|
borderRadius: shape.medium,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
padding: spacing.lg,
|
padding: spacing.lg,
|
||||||
...elevation.level1,
|
...elevation.level1,
|
||||||
},
|
},
|
||||||
@@ -236,6 +238,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
marginTop: spacing.md,
|
marginTop: spacing.md,
|
||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
borderRadius: shape.medium,
|
borderRadius: shape.medium,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
padding: spacing.lg,
|
padding: spacing.lg,
|
||||||
...elevation.level1,
|
...elevation.level1,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,16 +4,18 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import React, {useMemo} from 'react';
|
import React, {useMemo} from 'react';
|
||||||
import {View, Text, StyleSheet} from 'react-native';
|
import {View, Text, StyleSheet, Dimensions} from 'react-native';
|
||||||
import {LineChart} from 'react-native-gifted-charts';
|
import {LineChart} from 'react-native-gifted-charts';
|
||||||
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
|
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
|
||||||
import Animated, {FadeInDown} from 'react-native-reanimated';
|
import Animated, {FadeInDown, FadeIn} from 'react-native-reanimated';
|
||||||
|
|
||||||
import {useTheme} from '../../theme';
|
import {useTheme} from '../../theme';
|
||||||
import type {MD3Theme} from '../../theme';
|
import type {MD3Theme} from '../../theme';
|
||||||
import {formatCurrency, formatCompact} from '../../utils';
|
import {formatCurrency, formatCompact} from '../../utils';
|
||||||
import type {Currency, NetWorthSnapshot} from '../../types';
|
import type {Currency, NetWorthSnapshot} from '../../types';
|
||||||
|
|
||||||
|
const {width: SCREEN_WIDTH} = Dimensions.get('window');
|
||||||
|
|
||||||
interface NetWorthHeroCardProps {
|
interface NetWorthHeroCardProps {
|
||||||
netWorth: number;
|
netWorth: number;
|
||||||
totalAssets: number;
|
totalAssets: number;
|
||||||
@@ -39,10 +41,26 @@ export const NetWorthHeroCard: React.FC<NetWorthHeroCardProps> = ({
|
|||||||
}));
|
}));
|
||||||
}, [history]);
|
}, [history]);
|
||||||
|
|
||||||
|
// Calculate trend percentage from history
|
||||||
|
const trendPercentage = useMemo(() => {
|
||||||
|
if (history.length < 2) return null;
|
||||||
|
const latest = history[history.length - 1].netWorth;
|
||||||
|
const previous = history[history.length - 2].netWorth;
|
||||||
|
if (previous === 0) return null;
|
||||||
|
return ((latest - previous) / Math.abs(previous)) * 100;
|
||||||
|
}, [history]);
|
||||||
|
|
||||||
const isPositive = netWorth >= 0;
|
const isPositive = netWorth >= 0;
|
||||||
|
const isTrendUp = trendPercentage && trendPercentage > 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Animated.View entering={FadeInDown.duration(500).springify()} style={s.card}>
|
<Animated.View entering={FadeInDown.duration(500).springify()} style={s.card}>
|
||||||
|
{/* Decorative Background Pattern */}
|
||||||
|
<View style={s.decorativeBackground}>
|
||||||
|
<View style={[s.decorCircle, {backgroundColor: theme.colors.primary + '08'}]} />
|
||||||
|
<View style={[s.decorCircle2, {backgroundColor: theme.colors.tertiary + '06'}]} />
|
||||||
|
</View>
|
||||||
|
|
||||||
{/* Sparkline Background */}
|
{/* Sparkline Background */}
|
||||||
{sparklineData.length >= 2 && (
|
{sparklineData.length >= 2 && (
|
||||||
<View style={s.sparklineContainer}>
|
<View style={s.sparklineContainer}>
|
||||||
@@ -55,69 +73,127 @@ export const NetWorthHeroCard: React.FC<NetWorthHeroCardProps> = ({
|
|||||||
hideAxesAndRules
|
hideAxesAndRules
|
||||||
color={
|
color={
|
||||||
theme.isDark
|
theme.isDark
|
||||||
? theme.colors.primaryContainer + '40'
|
? theme.colors.primaryContainer + '60'
|
||||||
: theme.colors.primary + '25'
|
: theme.colors.primary + '35'
|
||||||
}
|
}
|
||||||
startFillColor={
|
startFillColor={
|
||||||
theme.isDark
|
theme.isDark
|
||||||
? theme.colors.primaryContainer + '20'
|
? theme.colors.primaryContainer + '25'
|
||||||
: theme.colors.primary + '12'
|
: theme.colors.primary + '15'
|
||||||
}
|
}
|
||||||
endFillColor="transparent"
|
endFillColor="transparent"
|
||||||
thickness={2}
|
thickness={2.5}
|
||||||
width={280}
|
width={SCREEN_WIDTH - 80}
|
||||||
height={100}
|
height={120}
|
||||||
adjustToWidth
|
adjustToWidth
|
||||||
isAnimated
|
isAnimated
|
||||||
animationDuration={800}
|
animationDuration={800}
|
||||||
initialSpacing={0}
|
initialSpacing={0}
|
||||||
endSpacing={0}
|
endSpacing={0}
|
||||||
yAxisOffset={Math.min(...sparklineData.map(d => d.value)) * 0.95}
|
yAxisOffset={Math.min(...sparklineData.map(d => d.value)) * 0.92}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Content Overlay */}
|
{/* Content Overlay */}
|
||||||
<View style={s.content}>
|
<View style={s.content}>
|
||||||
<View style={s.labelRow}>
|
{/* Header with trend badge */}
|
||||||
<Icon
|
<View style={s.headerRow}>
|
||||||
name="chart-line-variant"
|
<View style={s.labelRow}>
|
||||||
size={16}
|
<Icon
|
||||||
color={theme.colors.onSurfaceVariant}
|
name="chart-line-variant"
|
||||||
/>
|
size={18}
|
||||||
<Text style={s.label}>NET WORTH</Text>
|
color={theme.colors.onSurfaceVariant}
|
||||||
|
/>
|
||||||
|
<Text style={s.label}>NET WORTH</Text>
|
||||||
|
</View>
|
||||||
|
{trendPercentage !== null && (
|
||||||
|
<Animated.View entering={FadeIn.delay(300)} style={[s.trendBadge, {
|
||||||
|
backgroundColor: isTrendUp
|
||||||
|
? theme.colors.successContainer
|
||||||
|
: theme.colors.errorContainer,
|
||||||
|
}]}>
|
||||||
|
<Icon
|
||||||
|
name={isTrendUp ? 'trending-up' : 'trending-down'}
|
||||||
|
size={14}
|
||||||
|
color={isTrendUp ? theme.colors.success : theme.colors.error}
|
||||||
|
/>
|
||||||
|
<Text style={[s.trendText, {
|
||||||
|
color: isTrendUp ? theme.colors.success : theme.colors.error,
|
||||||
|
}]}>
|
||||||
|
{Math.abs(trendPercentage).toFixed(1)}%
|
||||||
|
</Text>
|
||||||
|
</Animated.View>
|
||||||
|
)}
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
|
{/* Main Value */}
|
||||||
<Text
|
<Text
|
||||||
style={[
|
style={[
|
||||||
s.value,
|
s.value,
|
||||||
{color: isPositive ? theme.colors.success : theme.colors.error},
|
{color: isPositive ? theme.colors.onSurface : theme.colors.error},
|
||||||
]}
|
]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
adjustsFontSizeToFit>
|
adjustsFontSizeToFit>
|
||||||
{formatCurrency(netWorth, currency)}
|
{formatCurrency(netWorth, currency)}
|
||||||
</Text>
|
</Text>
|
||||||
|
|
||||||
{/* Asset / Liability Split */}
|
{/* Asset / Liability Split - Enhanced */}
|
||||||
<View style={s.splitRow}>
|
<View style={s.splitContainer}>
|
||||||
<View style={s.splitItem}>
|
<Animated.View entering={FadeIn.delay(200)} style={s.splitRow}>
|
||||||
<View style={[s.splitDot, {backgroundColor: theme.colors.success}]} />
|
<View style={s.splitItem}>
|
||||||
<View>
|
<View style={[s.iconWrapper, {
|
||||||
<Text style={s.splitLabel}>Assets</Text>
|
backgroundColor: theme.colors.successContainer,
|
||||||
<Text style={[s.splitValue, {color: theme.colors.success}]}>
|
}]}>
|
||||||
{formatCompact(totalAssets, currency)}
|
<Icon
|
||||||
</Text>
|
name="trending-up"
|
||||||
|
size={16}
|
||||||
|
color={theme.colors.success}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<View style={s.splitTextContainer}>
|
||||||
|
<Text style={s.splitLabel}>Assets</Text>
|
||||||
|
<Text style={[s.splitValue, {color: theme.colors.success}]}>
|
||||||
|
{formatCompact(totalAssets, currency)}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
|
||||||
<View style={s.splitDivider} />
|
<View style={s.splitDivider} />
|
||||||
<View style={s.splitItem}>
|
|
||||||
<View style={[s.splitDot, {backgroundColor: theme.colors.error}]} />
|
<View style={s.splitItem}>
|
||||||
<View>
|
<View style={[s.iconWrapper, {
|
||||||
<Text style={s.splitLabel}>Liabilities</Text>
|
backgroundColor: theme.colors.errorContainer,
|
||||||
<Text style={[s.splitValue, {color: theme.colors.error}]}>
|
}]}>
|
||||||
{formatCompact(totalLiabilities, currency)}
|
<Icon
|
||||||
</Text>
|
name="trending-down"
|
||||||
|
size={16}
|
||||||
|
color={theme.colors.error}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<View style={s.splitTextContainer}>
|
||||||
|
<Text style={s.splitLabel}>Liabilities</Text>
|
||||||
|
<Text style={[s.splitValue, {color: theme.colors.error}]}>
|
||||||
|
{formatCompact(totalLiabilities, currency)}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
</Animated.View>
|
||||||
|
|
||||||
|
{/* Visual Progress Bar */}
|
||||||
|
<View style={s.progressBar}>
|
||||||
|
<View
|
||||||
|
style={[s.progressAsset, {
|
||||||
|
flex: totalAssets || 1,
|
||||||
|
backgroundColor: theme.colors.success,
|
||||||
|
}]}
|
||||||
|
/>
|
||||||
|
<View
|
||||||
|
style={[s.progressLiability, {
|
||||||
|
flex: totalLiabilities || 0.1,
|
||||||
|
backgroundColor: theme.colors.error,
|
||||||
|
}]}
|
||||||
|
/>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
@@ -131,70 +207,143 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
card: {
|
card: {
|
||||||
marginHorizontal: spacing.xl,
|
marginHorizontal: spacing.xl,
|
||||||
marginTop: spacing.md,
|
marginTop: spacing.md,
|
||||||
borderRadius: shape.extraLarge,
|
borderRadius: shape.medium,
|
||||||
|
borderWidth: 1.5,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
...elevation.level3,
|
...elevation.level3,
|
||||||
},
|
},
|
||||||
|
decorativeBackground: {
|
||||||
|
position: 'absolute',
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
overflow: 'hidden',
|
||||||
|
},
|
||||||
|
decorCircle: {
|
||||||
|
position: 'absolute',
|
||||||
|
width: 200,
|
||||||
|
height: 200,
|
||||||
|
borderRadius: 100,
|
||||||
|
top: -60,
|
||||||
|
right: -40,
|
||||||
|
},
|
||||||
|
decorCircle2: {
|
||||||
|
position: 'absolute',
|
||||||
|
width: 150,
|
||||||
|
height: 150,
|
||||||
|
borderRadius: 75,
|
||||||
|
bottom: -30,
|
||||||
|
left: -20,
|
||||||
|
},
|
||||||
sparklineContainer: {
|
sparklineContainer: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
left: 0,
|
left: 0,
|
||||||
right: 0,
|
right: 0,
|
||||||
opacity: 0.6,
|
opacity: 0.7,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
borderRadius: shape.extraLarge,
|
|
||||||
},
|
},
|
||||||
content: {
|
content: {
|
||||||
padding: spacing.xxl,
|
padding: spacing.xxl,
|
||||||
|
paddingTop: spacing.xl,
|
||||||
|
paddingBottom: spacing.lg,
|
||||||
|
},
|
||||||
|
headerRow: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
alignItems: 'center',
|
||||||
|
marginBottom: spacing.sm,
|
||||||
},
|
},
|
||||||
labelRow: {
|
labelRow: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
gap: spacing.xs,
|
gap: spacing.xs,
|
||||||
marginBottom: spacing.sm,
|
|
||||||
},
|
},
|
||||||
label: {
|
label: {
|
||||||
...typography.labelSmall,
|
...typography.labelMedium,
|
||||||
color: colors.onSurfaceVariant,
|
color: colors.onSurfaceVariant,
|
||||||
letterSpacing: 1.5,
|
letterSpacing: 1.2,
|
||||||
|
fontWeight: '600',
|
||||||
|
},
|
||||||
|
trendBadge: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: 4,
|
||||||
|
paddingHorizontal: spacing.sm,
|
||||||
|
paddingVertical: 4,
|
||||||
|
borderRadius: shape.small,
|
||||||
|
},
|
||||||
|
trendText: {
|
||||||
|
...typography.labelSmall,
|
||||||
|
fontWeight: '700',
|
||||||
},
|
},
|
||||||
value: {
|
value: {
|
||||||
...typography.displaySmall,
|
...typography.displaySmall,
|
||||||
fontWeight: '700',
|
fontWeight: '800',
|
||||||
marginBottom: spacing.lg,
|
marginBottom: spacing.lg,
|
||||||
|
marginTop: spacing.xs,
|
||||||
|
letterSpacing: -0.5,
|
||||||
|
},
|
||||||
|
splitContainer: {
|
||||||
|
gap: spacing.md,
|
||||||
},
|
},
|
||||||
splitRow: {
|
splitRow: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
backgroundColor: colors.surfaceContainer,
|
backgroundColor: colors.surfaceContainer,
|
||||||
borderRadius: shape.medium,
|
borderRadius: shape.medium,
|
||||||
padding: spacing.md,
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant + '50',
|
||||||
|
padding: spacing.lg,
|
||||||
},
|
},
|
||||||
splitItem: {
|
splitItem: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
gap: spacing.sm,
|
gap: spacing.sm,
|
||||||
justifyContent: 'center',
|
|
||||||
},
|
},
|
||||||
splitDot: {
|
iconWrapper: {
|
||||||
width: 8,
|
width: 32,
|
||||||
height: 8,
|
height: 32,
|
||||||
borderRadius: 4,
|
borderRadius: shape.small,
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
splitTextContainer: {
|
||||||
|
flex: 1,
|
||||||
},
|
},
|
||||||
splitLabel: {
|
splitLabel: {
|
||||||
...typography.labelSmall,
|
...typography.labelSmall,
|
||||||
color: colors.onSurfaceVariant,
|
color: colors.onSurfaceVariant,
|
||||||
|
marginBottom: 2,
|
||||||
},
|
},
|
||||||
splitValue: {
|
splitValue: {
|
||||||
...typography.titleSmall,
|
...typography.titleMedium,
|
||||||
fontWeight: '700',
|
fontWeight: '700',
|
||||||
},
|
},
|
||||||
splitDivider: {
|
splitDivider: {
|
||||||
width: 1,
|
width: 1,
|
||||||
height: 28,
|
height: 36,
|
||||||
backgroundColor: colors.outlineVariant,
|
backgroundColor: colors.outlineVariant,
|
||||||
|
marginHorizontal: spacing.xs,
|
||||||
|
},
|
||||||
|
progressBar: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
height: 6,
|
||||||
|
borderRadius: 3,
|
||||||
|
overflow: 'hidden',
|
||||||
|
backgroundColor: colors.surfaceContainerHighest,
|
||||||
|
},
|
||||||
|
progressAsset: {
|
||||||
|
borderTopLeftRadius: 3,
|
||||||
|
borderBottomLeftRadius: 3,
|
||||||
|
},
|
||||||
|
progressLiability: {
|
||||||
|
borderTopRightRadius: 3,
|
||||||
|
borderBottomRightRadius: 3,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
iconCircle: {
|
iconCircle: {
|
||||||
width: 40,
|
width: 40,
|
||||||
height: 40,
|
height: 40,
|
||||||
borderRadius: 20,
|
borderRadius: 4,
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -126,6 +126,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
marginTop: spacing.xl,
|
marginTop: spacing.xl,
|
||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
borderRadius: shape.large,
|
borderRadius: shape.large,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
padding: spacing.xl,
|
padding: spacing.xl,
|
||||||
...elevation.level1,
|
...elevation.level1,
|
||||||
},
|
},
|
||||||
@@ -164,7 +166,7 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
legendDot: {
|
legendDot: {
|
||||||
width: 10,
|
width: 10,
|
||||||
height: 10,
|
height: 10,
|
||||||
borderRadius: 5,
|
borderRadius: 2,
|
||||||
},
|
},
|
||||||
legendText: {
|
legendText: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ export const STATIC_EXCHANGE_RATES: ExchangeRates = {
|
|||||||
INR: 1,
|
INR: 1,
|
||||||
USD: 84.5, // 1 USD = 84.5 INR
|
USD: 84.5, // 1 USD = 84.5 INR
|
||||||
EUR: 91.2, // 1 EUR = 91.2 INR
|
EUR: 91.2, // 1 EUR = 91.2 INR
|
||||||
|
GBP: 106.8, // 1 GBP = 106.8 INR
|
||||||
};
|
};
|
||||||
|
|
||||||
// ─── Currency Symbols ────────────────────────────────────────────────
|
// ─── Currency Symbols ────────────────────────────────────────────────
|
||||||
@@ -56,6 +57,7 @@ export const CURRENCY_SYMBOLS: Record<string, string> = {
|
|||||||
INR: '₹',
|
INR: '₹',
|
||||||
USD: '$',
|
USD: '$',
|
||||||
EUR: '€',
|
EUR: '€',
|
||||||
|
GBP: '£',
|
||||||
};
|
};
|
||||||
|
|
||||||
// ─── Theme Colors ────────────────────────────────────────────────────
|
// ─── Theme Colors ────────────────────────────────────────────────────
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ export default {
|
|||||||
// ─── Tabs ───
|
// ─── Tabs ───
|
||||||
tabs: {
|
tabs: {
|
||||||
dashboard: 'Dashboard',
|
dashboard: 'Dashboard',
|
||||||
expenses: 'Expenses',
|
expenses: 'Transactions',
|
||||||
netWorth: 'Net Worth',
|
netWorth: 'Net Worth',
|
||||||
settings: 'Settings',
|
settings: 'Settings',
|
||||||
},
|
},
|
||||||
@@ -38,9 +38,9 @@ export default {
|
|||||||
lastMonth: 'Last Month',
|
lastMonth: 'Last Month',
|
||||||
},
|
},
|
||||||
|
|
||||||
// ─── Expenses ───
|
// ─── Transactions ───
|
||||||
expenses: {
|
expenses: {
|
||||||
title: 'Expenses',
|
title: 'Transactions',
|
||||||
addExpense: 'Add Expense',
|
addExpense: 'Add Expense',
|
||||||
addIncome: 'Add Income',
|
addIncome: 'Add Income',
|
||||||
amount: 'Amount',
|
amount: 'Amount',
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ const Tab = createBottomTabNavigator();
|
|||||||
|
|
||||||
const TAB_ICONS: Record<string, {focused: string; unfocused: string}> = {
|
const TAB_ICONS: Record<string, {focused: string; unfocused: string}> = {
|
||||||
Dashboard: {focused: 'view-dashboard', unfocused: 'view-dashboard-outline'},
|
Dashboard: {focused: 'view-dashboard', unfocused: 'view-dashboard-outline'},
|
||||||
Expenses: {focused: 'receipt', unfocused: 'receipt'},
|
Transactions: {focused: 'receipt', unfocused: 'receipt'},
|
||||||
NetWorth: {focused: 'chart-line', unfocused: 'chart-line'},
|
NetWorth: {focused: 'chart-line', unfocused: 'chart-line'},
|
||||||
Settings: {focused: 'cog', unfocused: 'cog-outline'},
|
Settings: {focused: 'cog', unfocused: 'cog-outline'},
|
||||||
};
|
};
|
||||||
@@ -71,7 +71,7 @@ const AppNavigator: React.FC = () => {
|
|||||||
options={{tabBarLabel: t('tabs.dashboard')}}
|
options={{tabBarLabel: t('tabs.dashboard')}}
|
||||||
/>
|
/>
|
||||||
<Tab.Screen
|
<Tab.Screen
|
||||||
name="Expenses"
|
name="Transactions"
|
||||||
component={ExpensesScreen}
|
component={ExpensesScreen}
|
||||||
options={{tabBarLabel: t('tabs.expenses')}}
|
options={{tabBarLabel: t('tabs.expenses')}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, {useCallback, useEffect} from 'react';
|
import React, {useCallback} from 'react';
|
||||||
import {
|
import {
|
||||||
View,
|
View,
|
||||||
Text,
|
Text,
|
||||||
@@ -15,7 +15,7 @@ import {BarChart, PieChart} from 'react-native-gifted-charts';
|
|||||||
|
|
||||||
import {SummaryCard, SectionHeader, TransactionItem, EmptyState} from '../components';
|
import {SummaryCard, SectionHeader, TransactionItem, EmptyState} from '../components';
|
||||||
import {useSettingsStore, useNetWorthStore, useExpenseStore} from '../store';
|
import {useSettingsStore, useNetWorthStore, useExpenseStore} from '../store';
|
||||||
import {formatCurrency, formatCompact, percentageChange} from '../utils';
|
import {formatCurrency, formatCompact} from '../utils';
|
||||||
import {COLORS} from '../constants';
|
import {COLORS} from '../constants';
|
||||||
import {useThemeColors, useIsDarkTheme} from '../hooks';
|
import {useThemeColors, useIsDarkTheme} from '../hooks';
|
||||||
|
|
||||||
@@ -280,7 +280,9 @@ const styles = StyleSheet.create({
|
|||||||
backgroundColor: COLORS.primary + '15',
|
backgroundColor: COLORS.primary + '15',
|
||||||
paddingHorizontal: 12,
|
paddingHorizontal: 12,
|
||||||
paddingVertical: 6,
|
paddingVertical: 6,
|
||||||
borderRadius: 20,
|
borderRadius: 0,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: COLORS.primary + '30',
|
||||||
},
|
},
|
||||||
currencyText: {
|
currencyText: {
|
||||||
fontSize: 13,
|
fontSize: 13,
|
||||||
@@ -297,7 +299,9 @@ const styles = StyleSheet.create({
|
|||||||
backgroundColor: COLORS.surface,
|
backgroundColor: COLORS.surface,
|
||||||
margin: 20,
|
margin: 20,
|
||||||
marginTop: 12,
|
marginTop: 12,
|
||||||
borderRadius: 20,
|
borderRadius: 4,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: COLORS.border,
|
||||||
padding: 24,
|
padding: 24,
|
||||||
shadowColor: '#000',
|
shadowColor: '#000',
|
||||||
shadowOffset: {width: 0, height: 4},
|
shadowOffset: {width: 0, height: 4},
|
||||||
@@ -359,7 +363,9 @@ const styles = StyleSheet.create({
|
|||||||
chartCard: {
|
chartCard: {
|
||||||
backgroundColor: COLORS.surface,
|
backgroundColor: COLORS.surface,
|
||||||
marginHorizontal: 20,
|
marginHorizontal: 20,
|
||||||
borderRadius: 16,
|
borderRadius: 4,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: COLORS.border,
|
||||||
padding: 20,
|
padding: 20,
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
shadowColor: '#000',
|
shadowColor: '#000',
|
||||||
@@ -396,7 +402,7 @@ const styles = StyleSheet.create({
|
|||||||
legendDot: {
|
legendDot: {
|
||||||
width: 10,
|
width: 10,
|
||||||
height: 10,
|
height: 10,
|
||||||
borderRadius: 5,
|
borderRadius: 2,
|
||||||
marginRight: 8,
|
marginRight: 8,
|
||||||
},
|
},
|
||||||
legendText: {
|
legendText: {
|
||||||
@@ -414,7 +420,9 @@ const styles = StyleSheet.create({
|
|||||||
transactionsList: {
|
transactionsList: {
|
||||||
backgroundColor: COLORS.surface,
|
backgroundColor: COLORS.surface,
|
||||||
marginHorizontal: 20,
|
marginHorizontal: 20,
|
||||||
borderRadius: 16,
|
borderRadius: 4,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: COLORS.border,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
shadowColor: '#000',
|
shadowColor: '#000',
|
||||||
shadowOffset: {width: 0, height: 2},
|
shadowOffset: {width: 0, height: 2},
|
||||||
|
|||||||
@@ -222,26 +222,29 @@ const ExpensesScreen: React.FC = () => {
|
|||||||
<Text style={s.headerTitle}>{t('expenses.title')}</Text>
|
<Text style={s.headerTitle}>{t('expenses.title')}</Text>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
|
|
||||||
<FlatList
|
{renderHeader()}
|
||||||
data={transactions}
|
|
||||||
keyExtractor={item => item.id}
|
<View style={s.listContainer}>
|
||||||
renderItem={({item}) => (
|
<FlatList
|
||||||
<TransactionItem transaction={item} onPress={handleDelete} />
|
data={transactions}
|
||||||
)}
|
keyExtractor={item => item.id}
|
||||||
ListHeaderComponent={renderHeader}
|
renderItem={({item}) => (
|
||||||
ListEmptyComponent={
|
<TransactionItem transaction={item} onPress={handleDelete} />
|
||||||
<EmptyState
|
)}
|
||||||
icon="receipt"
|
ListEmptyComponent={
|
||||||
title={t('expenses.noTransactions')}
|
<EmptyState
|
||||||
subtitle={t('expenses.startTracking')}
|
icon="receipt"
|
||||||
/>
|
title={t('expenses.noTransactions')}
|
||||||
}
|
subtitle={t('expenses.startTracking')}
|
||||||
ItemSeparatorComponent={() => (
|
/>
|
||||||
<View style={[s.separator, {backgroundColor: colors.outlineVariant + '30'}]} />
|
}
|
||||||
)}
|
ItemSeparatorComponent={() => (
|
||||||
contentContainerStyle={{paddingBottom: 80 + insets.bottom}}
|
<View style={[s.separator, {backgroundColor: colors.outlineVariant + '30'}]} />
|
||||||
showsVerticalScrollIndicator={false}
|
)}
|
||||||
/>
|
contentContainerStyle={{paddingBottom: 80 + insets.bottom}}
|
||||||
|
showsVerticalScrollIndicator={false}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
|
||||||
{/* FAB */}
|
{/* FAB */}
|
||||||
<Pressable
|
<Pressable
|
||||||
@@ -482,6 +485,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
summaryItem: {
|
summaryItem: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
borderRadius: shape.large,
|
borderRadius: shape.large,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
padding: spacing.lg,
|
padding: spacing.lg,
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
},
|
},
|
||||||
@@ -495,6 +500,17 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
fontWeight: '700',
|
fontWeight: '700',
|
||||||
marginTop: 2,
|
marginTop: 2,
|
||||||
},
|
},
|
||||||
|
listContainer: {
|
||||||
|
flex: 1,
|
||||||
|
backgroundColor: colors.surface,
|
||||||
|
marginHorizontal: spacing.xl,
|
||||||
|
marginTop: spacing.md,
|
||||||
|
borderRadius: shape.large,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
|
overflow: 'hidden',
|
||||||
|
...elevation.level1,
|
||||||
|
},
|
||||||
separator: {height: 1, marginLeft: 72},
|
separator: {height: 1, marginLeft: 72},
|
||||||
fab: {
|
fab: {
|
||||||
position: 'absolute',
|
position: 'absolute',
|
||||||
@@ -511,6 +527,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
borderRadius: shape.medium,
|
borderRadius: shape.medium,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
padding: 4,
|
padding: 4,
|
||||||
marginBottom: spacing.xl,
|
marginBottom: spacing.xl,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ const ModernDashboard: React.FC = () => {
|
|||||||
<RecentActivityList
|
<RecentActivityList
|
||||||
transactions={transactions}
|
transactions={transactions}
|
||||||
currency={baseCurrency}
|
currency={baseCurrency}
|
||||||
onViewAll={() => navigation.navigate('Expenses')}
|
onViewAll={() => navigation.navigate('Transactions')}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<View style={s.bottomSpacer} />
|
<View style={s.bottomSpacer} />
|
||||||
@@ -196,7 +196,9 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
backgroundColor: colors.primaryContainer,
|
backgroundColor: colors.primaryContainer,
|
||||||
paddingHorizontal: spacing.md,
|
paddingHorizontal: spacing.md,
|
||||||
paddingVertical: spacing.sm,
|
paddingVertical: spacing.sm,
|
||||||
borderRadius: 20,
|
borderRadius: 4,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outline,
|
||||||
},
|
},
|
||||||
currencyText: {
|
currencyText: {
|
||||||
...typography.labelMedium,
|
...typography.labelMedium,
|
||||||
|
|||||||
@@ -545,6 +545,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
marginHorizontal: spacing.xl,
|
marginHorizontal: spacing.xl,
|
||||||
marginTop: spacing.md,
|
marginTop: spacing.md,
|
||||||
borderRadius: shape.extraLarge,
|
borderRadius: shape.extraLarge,
|
||||||
|
borderWidth: 1.5,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
padding: spacing.xl,
|
padding: spacing.xl,
|
||||||
...elevation.level2,
|
...elevation.level2,
|
||||||
},
|
},
|
||||||
@@ -586,6 +588,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
marginHorizontal: spacing.xl,
|
marginHorizontal: spacing.xl,
|
||||||
borderRadius: shape.large,
|
borderRadius: shape.large,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
padding: spacing.xl,
|
padding: spacing.xl,
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
...elevation.level1,
|
...elevation.level1,
|
||||||
@@ -594,6 +598,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
marginHorizontal: spacing.xl,
|
marginHorizontal: spacing.xl,
|
||||||
borderRadius: shape.large,
|
borderRadius: shape.large,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
...elevation.level1,
|
...elevation.level1,
|
||||||
},
|
},
|
||||||
@@ -610,7 +616,7 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
listIcon: {
|
listIcon: {
|
||||||
width: 42,
|
width: 42,
|
||||||
height: 42,
|
height: 42,
|
||||||
borderRadius: 21,
|
borderRadius: 4,
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ const SettingsScreen: React.FC = () => {
|
|||||||
icon="information"
|
icon="information"
|
||||||
iconColor="#7E57C2"
|
iconColor="#7E57C2"
|
||||||
label={t('settings.version')}
|
label={t('settings.version')}
|
||||||
value="0.1.0 Alpha"
|
value="0.1.1-alpha"
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
@@ -346,6 +346,8 @@ function makeStyles(theme: MD3Theme) {
|
|||||||
sectionCard: {
|
sectionCard: {
|
||||||
backgroundColor: colors.surfaceContainerLow,
|
backgroundColor: colors.surfaceContainerLow,
|
||||||
borderRadius: shape.large,
|
borderRadius: shape.large,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderColor: colors.outlineVariant,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
...elevation.level1,
|
...elevation.level1,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -167,67 +167,70 @@ export const MD3DarkColors: typeof MD3LightColors = {
|
|||||||
|
|
||||||
// ─── MD3 Typography Scale ────────────────────────────────────────────
|
// ─── MD3 Typography Scale ────────────────────────────────────────────
|
||||||
|
|
||||||
const fontFamily = 'System'; // Falls back to Roboto on Android, SF Pro on iOS
|
const fontFamily = 'JetBrainsMono-Regular';
|
||||||
|
const fontFamilyMedium = 'JetBrainsMono-Medium';
|
||||||
|
const fontFamilySemiBold = 'JetBrainsMono-SemiBold';
|
||||||
|
const fontFamilyBold = 'JetBrainsMono-Bold';
|
||||||
|
|
||||||
export const MD3Typography = {
|
export const MD3Typography = {
|
||||||
displayLarge: {
|
displayLarge: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyBold,
|
||||||
fontSize: 57,
|
fontSize: 57,
|
||||||
fontWeight: '400' as const,
|
fontWeight: '400' as const,
|
||||||
lineHeight: 64,
|
lineHeight: 64,
|
||||||
letterSpacing: -0.25,
|
letterSpacing: -0.25,
|
||||||
},
|
},
|
||||||
displayMedium: {
|
displayMedium: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyBold,
|
||||||
fontSize: 45,
|
fontSize: 45,
|
||||||
fontWeight: '400' as const,
|
fontWeight: '400' as const,
|
||||||
lineHeight: 52,
|
lineHeight: 52,
|
||||||
letterSpacing: 0,
|
letterSpacing: 0,
|
||||||
},
|
},
|
||||||
displaySmall: {
|
displaySmall: {
|
||||||
fontFamily,
|
fontFamily: fontFamilySemiBold,
|
||||||
fontSize: 36,
|
fontSize: 36,
|
||||||
fontWeight: '400' as const,
|
fontWeight: '400' as const,
|
||||||
lineHeight: 44,
|
lineHeight: 44,
|
||||||
letterSpacing: 0,
|
letterSpacing: 0,
|
||||||
},
|
},
|
||||||
headlineLarge: {
|
headlineLarge: {
|
||||||
fontFamily,
|
fontFamily: fontFamilySemiBold,
|
||||||
fontSize: 32,
|
fontSize: 32,
|
||||||
fontWeight: '400' as const,
|
fontWeight: '400' as const,
|
||||||
lineHeight: 40,
|
lineHeight: 40,
|
||||||
letterSpacing: 0,
|
letterSpacing: 0,
|
||||||
},
|
},
|
||||||
headlineMedium: {
|
headlineMedium: {
|
||||||
fontFamily,
|
fontFamily: fontFamilySemiBold,
|
||||||
fontSize: 28,
|
fontSize: 28,
|
||||||
fontWeight: '400' as const,
|
fontWeight: '400' as const,
|
||||||
lineHeight: 36,
|
lineHeight: 36,
|
||||||
letterSpacing: 0,
|
letterSpacing: 0,
|
||||||
},
|
},
|
||||||
headlineSmall: {
|
headlineSmall: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyMedium,
|
||||||
fontSize: 24,
|
fontSize: 24,
|
||||||
fontWeight: '400' as const,
|
fontWeight: '400' as const,
|
||||||
lineHeight: 32,
|
lineHeight: 32,
|
||||||
letterSpacing: 0,
|
letterSpacing: 0,
|
||||||
},
|
},
|
||||||
titleLarge: {
|
titleLarge: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyMedium,
|
||||||
fontSize: 22,
|
fontSize: 22,
|
||||||
fontWeight: '500' as const,
|
fontWeight: '500' as const,
|
||||||
lineHeight: 28,
|
lineHeight: 28,
|
||||||
letterSpacing: 0,
|
letterSpacing: 0,
|
||||||
},
|
},
|
||||||
titleMedium: {
|
titleMedium: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyMedium,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
fontWeight: '500' as const,
|
fontWeight: '500' as const,
|
||||||
lineHeight: 24,
|
lineHeight: 24,
|
||||||
letterSpacing: 0.15,
|
letterSpacing: 0.15,
|
||||||
},
|
},
|
||||||
titleSmall: {
|
titleSmall: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyMedium,
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
fontWeight: '500' as const,
|
fontWeight: '500' as const,
|
||||||
lineHeight: 20,
|
lineHeight: 20,
|
||||||
@@ -255,21 +258,21 @@ export const MD3Typography = {
|
|||||||
letterSpacing: 0.4,
|
letterSpacing: 0.4,
|
||||||
},
|
},
|
||||||
labelLarge: {
|
labelLarge: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyMedium,
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
fontWeight: '500' as const,
|
fontWeight: '500' as const,
|
||||||
lineHeight: 20,
|
lineHeight: 20,
|
||||||
letterSpacing: 0.1,
|
letterSpacing: 0.1,
|
||||||
},
|
},
|
||||||
labelMedium: {
|
labelMedium: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyMedium,
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: '500' as const,
|
fontWeight: '500' as const,
|
||||||
lineHeight: 16,
|
lineHeight: 16,
|
||||||
letterSpacing: 0.5,
|
letterSpacing: 0.5,
|
||||||
},
|
},
|
||||||
labelSmall: {
|
labelSmall: {
|
||||||
fontFamily,
|
fontFamily: fontFamilyMedium,
|
||||||
fontSize: 11,
|
fontSize: 11,
|
||||||
fontWeight: '500' as const,
|
fontWeight: '500' as const,
|
||||||
lineHeight: 16,
|
lineHeight: 16,
|
||||||
@@ -328,11 +331,11 @@ export const MD3Elevation = {
|
|||||||
|
|
||||||
export const MD3Shape = {
|
export const MD3Shape = {
|
||||||
none: 0,
|
none: 0,
|
||||||
extraSmall: 4,
|
extraSmall: 2,
|
||||||
small: 8,
|
small: 2,
|
||||||
medium: 12,
|
medium: 4,
|
||||||
large: 16,
|
large: 4,
|
||||||
extraLarge: 28,
|
extraLarge: 6,
|
||||||
full: 9999,
|
full: 9999,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
4
version.config.json
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"version": "0.1.2",
|
||||||
|
"buildNumber": 1
|
||||||
|
}
|
||||||