Skip to content

Commit

Permalink
Merge pull request #30 from victorbalssa/version/0.2.2
Browse files Browse the repository at this point in the history
Version/0.2.2
  • Loading branch information
victorbalssa authored Aug 12, 2022
2 parents 40a1975 + 52242ea commit f76c1ce
Show file tree
Hide file tree
Showing 38 changed files with 981 additions and 1,015 deletions.
9 changes: 0 additions & 9 deletions App.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div align="center">
<img src="documentation/img.png" height=100 />
<p></p>
<h1>Abacus: a FireflyIII iOS Client</h1>
<h1>🔥 Abacus: Firefly III iOS app 🔥</h1>
<div>
<a href="https://apps.apple.com/us/app/1627093491"><img src="documentation/apple.svg" /></a>
</div>
Expand Down
14 changes: 9 additions & 5 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"expo": {
"name": "Abacus",
"description": "Abacus: a FireflyIII iOS Client",
"description": "🔥 Abacus: Firefly III iOS app 🔥",
"slug": "abacus",
"privacy": "hidden",
"platforms": [
"ios"
],
"version": "0.2.1",
"version": "0.2.2",
"orientation": "portrait",
"icon": "./src/images/icon-abacus.png",
"splash": {
Expand All @@ -16,10 +16,11 @@
},
"updates": {
"enabled": true,
"checkAutomatically": "ON_ERROR_RECOVERY"
"checkAutomatically": "ON_ERROR_RECOVERY",
"url": "https://u.expo.dev/292ed6dc-804c-4444-95f5-fa5d76d9913b"
},
"ios": {
"buildNumber": "0.2.1",
"buildNumber": "0.2.2",
"bundleIdentifier": "abacus.ios.app",
"infoPlist": {
"NSFaceIDUsageDescription": "Abacus use Authentication with TouchId or FaceID"
Expand All @@ -29,6 +30,9 @@
}
},
"scheme": "abacusiosapp",
"githubUrl": "https://github.com/victorbalssa/abacus"
"githubUrl": "https://github.com/victorbalssa/abacus",
"runtimeVersion": {
"policy": "sdkVersion"
}
}
}
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { registerRootComponent } from 'expo';
import App from './App';
import App from './src';

registerRootComponent(App);
170 changes: 155 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "abacus",
"homepage": "https://github.com/victorbalssa/abacus",
"version": "0.2.1",
"version": "0.2.2",
"private": true,
"jest": {
"preset": "jest-expo",
Expand Down Expand Up @@ -50,7 +50,7 @@
"react": "18.0.0",
"react-dom": "18.0.0",
"react-helmet": "^5.2.1",
"react-native": "0.69.3",
"react-native": "0.69.4",
"react-native-animated-splash-screen": "^2.0.5",
"react-native-gesture-handler": "~2.5.0",
"react-native-modal": "^11.5.6",
Expand All @@ -66,7 +66,8 @@
"sharp-cli": "^1.14.1",
"slash": "^3.0.0",
"victory-native": "^36.3.1",
"expo-local-authentication": "~12.3.0"
"expo-local-authentication": "~12.3.0",
"expo-dev-client": "~1.1.1"
},
"devDependencies": {
"@babel/core": "^7.18.6",
Expand Down
17 changes: 2 additions & 15 deletions src/native/components/Chart.tsx → src/components/Chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,7 @@ import {
} from 'native-base';
import AssetsHistoryChart from './Charts/AssetsHistoryChart';
import RangeTitle from './UI/RangeTitle';
import colors from '../../constants/colors';
import { AssetAccountType } from '../../models/firefly';

type ChartType = {
accounts: AssetAccountType[],
loading: boolean,
fetchData: () => Promise<void>,
start: string,
end: string,
filterData: () => Promise<void>,
enableScroll: () => Promise<void>,
disableScroll: () => Promise<void>,
scrollEnabled: boolean,
}
import colors from '../constants/colors';

const Chart = ({
accounts,
Expand All @@ -31,7 +18,7 @@ const Chart = ({
enableScroll,
disableScroll,
scrollEnabled,
}: ChartType) => (
}) => (
<>
<RangeTitle />
<Box flex={1}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from 'victory-native';
import { maxBy, minBy } from 'lodash';
import { Line, Circle } from 'react-native-svg';
import colors from '../../../constants/colors';
import colors from '../../constants/colors';

const CursorPointer = ({
x,
Expand Down
Loading

0 comments on commit f76c1ce

Please sign in to comment.