Skip to content

Commit 3117e04

Browse files
sameersydsameersyd
committed
Merge branch 'dev'
2 parents 538ba2c + 083a334 commit 3117e04

Some content is hidden

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

46 files changed

+245
-72
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎Expenso.xcodeproj/project.pbxproj‎

Lines changed: 55 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
73998C5525DA5578007D735B /* AttachmentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73998C5425DA5578007D735B /* AttachmentHandler.swift */; };
4747
739DFF7B25DC1E3C005BD5C8 /* AuthenticateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739DFF7A25DC1E3C005BD5C8 /* AuthenticateView.swift */; };
4848
73E688DA25FF32790000462A /* ChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73E688D925FF32790000462A /* ChartView.swift */; };
49+
753CBDD325F36864005762B8 /* BiometricAuthUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753CBDD225F36864005762B8 /* BiometricAuthUtility.swift */; };
50+
75C6B48025F37FD20079BCFC /* AuthenticationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75C6B47F25F37FD20079BCFC /* AuthenticationViewModel.swift */; };
4951
FF29C9FFAF86E0452686C5D0 /* Pods_Expenso.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B0E373FB89DD0864398FEE7 /* Pods_Expenso.framework */; };
5052
/* End PBXBuildFile section */
5153

@@ -93,6 +95,8 @@
9395
73998C5425DA5578007D735B /* AttachmentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentHandler.swift; sourceTree = "<group>"; };
9496
739DFF7A25DC1E3C005BD5C8 /* AuthenticateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticateView.swift; sourceTree = "<group>"; };
9597
73E688D925FF32790000462A /* ChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartView.swift; sourceTree = "<group>"; };
98+
753CBDD225F36864005762B8 /* BiometricAuthUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BiometricAuthUtility.swift; sourceTree = "<group>"; };
99+
75C6B47F25F37FD20079BCFC /* AuthenticationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationViewModel.swift; sourceTree = "<group>"; };
96100
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>"; };
97101
/* End PBXFileReference section */
98102

@@ -108,6 +112,39 @@
108112
/* End PBXFrameworksBuildPhase section */
109113

110114
/* 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+
};
111148
736C720825CFD82900720DEA /* Animations */ = {
112149
isa = PBXGroup;
113150
children = (
@@ -137,17 +174,9 @@
137174
738B1C1625C65DFE0067407B /* Expenso */ = {
138175
isa = PBXGroup;
139176
children = (
140-
739DFF7925DC1E23005BD5C8 /* Authenticate */,
141-
736C720825CFD82900720DEA /* Animations */,
142-
738B1C8E25C680C50067407B /* About */,
143-
738B1C8925C67D790067407B /* ExpenseFilter */,
144-
738B1C7D25C675FA0067407B /* ExpenseDetailed */,
145-
738B1C7525C6750F0067407B /* AddExpense */,
146-
738B1C6A25C673EB0067407B /* ExpenseSettings */,
147-
738B1C5425C671680067407B /* Inter */,
148-
738B1C3A25C662060067407B /* Helpers */,
149-
738B1C3625C661580067407B /* Expense */,
150-
738B1C3125C660070067407B /* CoreData */,
177+
733763AA27120E0500AA983A /* Library */,
178+
733763A927120DF300AA983A /* Resources */,
179+
733763A827120DB600AA983A /* Screens */,
151180
738B1C1725C65DFE0067407B /* ExpensoApp.swift */,
152181
738B1C1B25C65E060067407B /* Assets.xcassets */,
153182
738B1C2525C65E060067407B /* Info.plist */,
@@ -265,10 +294,19 @@
265294
isa = PBXGroup;
266295
children = (
267296
739DFF7A25DC1E3C005BD5C8 /* AuthenticateView.swift */,
297+
75C6B47F25F37FD20079BCFC /* AuthenticationViewModel.swift */,
268298
);
269299
path = Authenticate;
270300
sourceTree = "<group>";
271301
};
302+
75C6B48225F37FF60079BCFC /* Utilities */ = {
303+
isa = PBXGroup;
304+
children = (
305+
753CBDD225F36864005762B8 /* BiometricAuthUtility.swift */,
306+
);
307+
path = Utilities;
308+
sourceTree = "<group>";
309+
};
272310
797DEE244C92A7FEC658698F /* Frameworks */ = {
273311
isa = PBXGroup;
274312
children = (
@@ -423,7 +461,9 @@
423461
738B1C4325C6629D0067407B /* ColorExtension.swift in Sources */,
424462
738B1C4025C662890067407B /* InterFontModifier.swift in Sources */,
425463
738B1C3C25C662580067407B /* Models.swift in Sources */,
464+
753CBDD325F36864005762B8 /* BiometricAuthUtility.swift in Sources */,
426465
738B1C7325C674320067407B /* ExpenseSettingsView.swift in Sources */,
466+
75C6B48025F37FD20079BCFC /* AuthenticationViewModel.swift in Sources */,
427467
738B1C4C25C663060067407B /* DismissKeyboard.swift in Sources */,
428468
738B1C4625C662D90067407B /* TextView.swift in Sources */,
429469
738B1C7B25C6752E0067407B /* AddExpenseViewModel.swift in Sources */,
@@ -566,7 +606,7 @@
566606
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
567607
CODE_SIGN_STYLE = Automatic;
568608
DEVELOPMENT_ASSET_PATHS = "\"Expenso/Preview Content\"";
569-
DEVELOPMENT_TEAM = GY8LXNR38D;
609+
DEVELOPMENT_TEAM = 7S7EBZGDA6;
570610
ENABLE_PREVIEWS = YES;
571611
INFOPLIST_FILE = Expenso/Info.plist;
572612
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -575,7 +615,7 @@
575615
"@executable_path/Frameworks",
576616
);
577617
MARKETING_VERSION = 1.0.1;
578-
PRODUCT_BUNDLE_IDENTIFIER = com.femargent.Expenso;
618+
PRODUCT_BUNDLE_IDENTIFIER = com.expenso.Expenso;
579619
PRODUCT_NAME = "$(TARGET_NAME)";
580620
SWIFT_VERSION = 5.0;
581621
TARGETED_DEVICE_FAMILY = "1,2";
@@ -590,7 +630,7 @@
590630
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
591631
CODE_SIGN_STYLE = Automatic;
592632
DEVELOPMENT_ASSET_PATHS = "\"Expenso/Preview Content\"";
593-
DEVELOPMENT_TEAM = GY8LXNR38D;
633+
DEVELOPMENT_TEAM = 7S7EBZGDA6;
594634
ENABLE_PREVIEWS = YES;
595635
INFOPLIST_FILE = Expenso/Info.plist;
596636
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -599,7 +639,7 @@
599639
"@executable_path/Frameworks",
600640
);
601641
MARKETING_VERSION = 1.0.1;
602-
PRODUCT_BUNDLE_IDENTIFIER = com.femargent.Expenso;
642+
PRODUCT_BUNDLE_IDENTIFIER = com.expenso.Expenso;
603643
PRODUCT_NAME = "$(TARGET_NAME)";
604644
SWIFT_VERSION = 5.0;
605645
TARGETED_DEVICE_FAMILY = "1,2";

‎Expenso.xcodeproj/xcuserdata/waseemakram.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>Expenso.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
</dict>
14+
</plist>

‎Expenso.xcworkspace/xcuserdata/sameernawaz.xcuserdatad/UserInterfaceState.xcuserstate‎

27.2 KB
Binary file not shown.

‎Expenso.xcworkspace/xcuserdata/waseemakram.xcuserdatad/UserInterfaceState.xcuserstate‎

31.9 KB
Binary file not shown.

‎Expenso/.DS_Store‎

6 KB
Binary file not shown.

‎Expenso/ExpensoApp.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct ExpensoApp: App {
2525
var body: some Scene {
2626
WindowGroup {
2727
if UserDefaults.standard.bool(forKey: UD_USE_BIOMETRIC) {
28-
AuthenticateView()
28+
AuthenticateView(viewModel: AuthenticationViewModel())
2929
.environment(\.managedObjectContext, persistentContainer.viewContext)
3030
} else {
3131
ExpenseView()

‎Expenso/Library/.DS_Store‎

6 KB
Binary file not shown.

‎Expenso/CoreData/ExpenseCD.swift‎ renamed to ‎Expenso/Library/CoreData/ExpenseCD.swift‎

File renamed without changes.

‎Expenso/Helpers/AttachmentHandler.swift‎ renamed to ‎Expenso/Library/Helpers/AttachmentHandler.swift‎

File renamed without changes.

0 commit comments

Comments
 (0)