Skip to content

Commit 083a334

Browse files
authored
Fix amount bug (#27)
* Update project structure * Fix negative amount * Fix infinite amount
1 parent eb4556f commit 083a334

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+51
-21
lines changed

.DS_Store

6 KB
Binary file not shown.

Expenso.xcodeproj/project.pbxproj

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@
4545
738B1C9025C680D20067407B /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738B1C8F25C680D20067407B /* AboutView.swift */; };
4646
73998C5525DA5578007D735B /* AttachmentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73998C5425DA5578007D735B /* AttachmentHandler.swift */; };
4747
739DFF7B25DC1E3C005BD5C8 /* AuthenticateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739DFF7A25DC1E3C005BD5C8 /* AuthenticateView.swift */; };
48-
73BD61BD25DEBC3F00E85F67 /* ExpenseFilterChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73BD61BC25DEBC3F00E85F67 /* ExpenseFilterChartView.swift */; };
48+
73E688DA25FF32790000462A /* ChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73E688D925FF32790000462A /* ChartView.swift */; };
4949
753CBDD325F36864005762B8 /* BiometricAuthUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753CBDD225F36864005762B8 /* BiometricAuthUtility.swift */; };
5050
75C6B48025F37FD20079BCFC /* AuthenticationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75C6B47F25F37FD20079BCFC /* AuthenticationViewModel.swift */; };
51-
73E688DA25FF32790000462A /* ChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73E688D925FF32790000462A /* ChartView.swift */; };
5251
FF29C9FFAF86E0452686C5D0 /* Pods_Expenso.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B0E373FB89DD0864398FEE7 /* Pods_Expenso.framework */; };
5352
/* End PBXBuildFile section */
5453

@@ -95,10 +94,9 @@
9594
738B1C8F25C680D20067407B /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
9695
73998C5425DA5578007D735B /* AttachmentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentHandler.swift; sourceTree = "<group>"; };
9796
739DFF7A25DC1E3C005BD5C8 /* AuthenticateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticateView.swift; sourceTree = "<group>"; };
98-
73BD61BC25DEBC3F00E85F67 /* ExpenseFilterChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpenseFilterChartView.swift; sourceTree = "<group>"; };
97+
73E688D925FF32790000462A /* ChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartView.swift; sourceTree = "<group>"; };
9998
753CBDD225F36864005762B8 /* BiometricAuthUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BiometricAuthUtility.swift; sourceTree = "<group>"; };
10099
75C6B47F25F37FD20079BCFC /* AuthenticationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationViewModel.swift; sourceTree = "<group>"; };
101-
73E688D925FF32790000462A /* ChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartView.swift; sourceTree = "<group>"; };
102100
B07E4D1AF457AB52E048A8B5 /* Pods-Expenso.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Expenso.release.xcconfig"; path = "Target Support Files/Pods-Expenso/Pods-Expenso.release.xcconfig"; sourceTree = "<group>"; };
103101
/* End PBXFileReference section */
104102

@@ -114,6 +112,39 @@
114112
/* End PBXFrameworksBuildPhase section */
115113

116114
/* Begin PBXGroup section */
115+
733763A827120DB600AA983A /* Screens */ = {
116+
isa = PBXGroup;
117+
children = (
118+
739DFF7925DC1E23005BD5C8 /* Authenticate */,
119+
738B1C8E25C680C50067407B /* About */,
120+
738B1C8925C67D790067407B /* ExpenseFilter */,
121+
738B1C7D25C675FA0067407B /* ExpenseDetailed */,
122+
738B1C7525C6750F0067407B /* AddExpense */,
123+
738B1C6A25C673EB0067407B /* ExpenseSettings */,
124+
738B1C3625C661580067407B /* Expense */,
125+
);
126+
path = Screens;
127+
sourceTree = "<group>";
128+
};
129+
733763A927120DF300AA983A /* Resources */ = {
130+
isa = PBXGroup;
131+
children = (
132+
736C720825CFD82900720DEA /* Animations */,
133+
738B1C5425C671680067407B /* Inter */,
134+
);
135+
path = Resources;
136+
sourceTree = "<group>";
137+
};
138+
733763AA27120E0500AA983A /* Library */ = {
139+
isa = PBXGroup;
140+
children = (
141+
75C6B48225F37FF60079BCFC /* Utilities */,
142+
738B1C3A25C662060067407B /* Helpers */,
143+
738B1C3125C660070067407B /* CoreData */,
144+
);
145+
path = Library;
146+
sourceTree = "<group>";
147+
};
117148
736C720825CFD82900720DEA /* Animations */ = {
118149
isa = PBXGroup;
119150
children = (
@@ -143,18 +174,9 @@
143174
738B1C1625C65DFE0067407B /* Expenso */ = {
144175
isa = PBXGroup;
145176
children = (
146-
75C6B48225F37FF60079BCFC /* Utilities */,
147-
739DFF7925DC1E23005BD5C8 /* Authenticate */,
148-
736C720825CFD82900720DEA /* Animations */,
149-
738B1C8E25C680C50067407B /* About */,
150-
738B1C8925C67D790067407B /* ExpenseFilter */,
151-
738B1C7D25C675FA0067407B /* ExpenseDetailed */,
152-
738B1C7525C6750F0067407B /* AddExpense */,
153-
738B1C6A25C673EB0067407B /* ExpenseSettings */,
154-
738B1C5425C671680067407B /* Inter */,
155-
738B1C3A25C662060067407B /* Helpers */,
156-
738B1C3625C661580067407B /* Expense */,
157-
738B1C3125C660070067407B /* CoreData */,
177+
733763AA27120E0500AA983A /* Library */,
178+
733763A927120DF300AA983A /* Resources */,
179+
733763A827120DB600AA983A /* Screens */,
158180
738B1C1725C65DFE0067407B /* ExpensoApp.swift */,
159181
738B1C1B25C65E060067407B /* Assets.xcassets */,
160182
738B1C2525C65E060067407B /* Info.plist */,
@@ -584,7 +606,7 @@
584606
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
585607
CODE_SIGN_STYLE = Automatic;
586608
DEVELOPMENT_ASSET_PATHS = "\"Expenso/Preview Content\"";
587-
DEVELOPMENT_TEAM = GY8LXNR38D;
609+
DEVELOPMENT_TEAM = 7S7EBZGDA6;
588610
ENABLE_PREVIEWS = YES;
589611
INFOPLIST_FILE = Expenso/Info.plist;
590612
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -593,7 +615,7 @@
593615
"@executable_path/Frameworks",
594616
);
595617
MARKETING_VERSION = 1.0.1;
596-
PRODUCT_BUNDLE_IDENTIFIER = com.femargent.Expenso;
618+
PRODUCT_BUNDLE_IDENTIFIER = com.expenso.Expenso;
597619
PRODUCT_NAME = "$(TARGET_NAME)";
598620
SWIFT_VERSION = 5.0;
599621
TARGETED_DEVICE_FAMILY = "1,2";
@@ -608,7 +630,7 @@
608630
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
609631
CODE_SIGN_STYLE = Automatic;
610632
DEVELOPMENT_ASSET_PATHS = "\"Expenso/Preview Content\"";
611-
DEVELOPMENT_TEAM = GY8LXNR38D;
633+
DEVELOPMENT_TEAM = 7S7EBZGDA6;
612634
ENABLE_PREVIEWS = YES;
613635
INFOPLIST_FILE = Expenso/Info.plist;
614636
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -617,7 +639,7 @@
617639
"@executable_path/Frameworks",
618640
);
619641
MARKETING_VERSION = 1.0.1;
620-
PRODUCT_BUNDLE_IDENTIFIER = com.femargent.Expenso;
642+
PRODUCT_BUNDLE_IDENTIFIER = com.expenso.Expenso;
621643
PRODUCT_NAME = "$(TARGET_NAME)";
622644
SWIFT_VERSION = 5.0;
623645
TARGETED_DEVICE_FAMILY = "1,2";
Binary file not shown.

Expenso/.DS_Store

6 KB
Binary file not shown.

Expenso/Library/.DS_Store

6 KB
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)