diff --git a/SLAComponents b/SLAComponents index 2a1bf9bc5..693dcb810 160000 --- a/SLAComponents +++ b/SLAComponents @@ -1 +1 @@ -Subproject commit 2a1bf9bc5f455e545f1a4488c2310bf90658dab0 +Subproject commit 693dcb810b7a53071472cd48e8c57a677607f4c9 diff --git a/ScribbleLab.xcodeproj/project.pbxproj b/ScribbleLab.xcodeproj/project.pbxproj index 4c432a323..8207d0c34 100644 --- a/ScribbleLab.xcodeproj/project.pbxproj +++ b/ScribbleLab.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 56; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ + 22C38C8D2B2CC33500FE4C73 /* SLAComponents in Frameworks */ = {isa = PBXBuildFile; productRef = 22C38C8C2B2CC33500FE4C73 /* SLAComponents */; }; 38066B4F2AFE9F0E001A88D5 /* SLUpdateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38066B4E2AFE9F0E001A88D5 /* SLUpdateViewModel.swift */; }; 38066B522AFEA235001A88D5 /* WaitSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38066B512AFEA235001A88D5 /* WaitSheetView.swift */; }; 380BC6392B26029600DCF442 /* Stripe in Frameworks */ = {isa = PBXBuildFile; productRef = 380BC6382B26029600DCF442 /* Stripe */; }; @@ -345,6 +346,7 @@ 38E5BBB42AE41F2900FFFE7C /* Updates in Frameworks */, 380BC63D2B26029600DCF442 /* StripeIdentity in Frameworks */, 383588462AFEDC6F00EEA1C3 /* FirebasePerformance in Frameworks */, + 22C38C8D2B2CC33500FE4C73 /* SLAComponents in Frameworks */, 380D93932AE4280900277D2D /* Kingfisher in Frameworks */, 380D93952AE4289500277D2D /* FirebaseFirestoreSwift in Frameworks */, 380BC6412B26029600DCF442 /* StripePayments in Frameworks */, @@ -1355,6 +1357,7 @@ 380BC63E2B26029600DCF442 /* StripePaymentSheet */, 380BC6402B26029600DCF442 /* StripePayments */, 380BC6422B26029600DCF442 /* StripePaymentsUI */, + 22C38C8C2B2CC33500FE4C73 /* SLAComponents */, ); productName = ScribbleLab; productReference = 38AE9C982AD0750F00B761E8 /* ScribbleLab.app */; @@ -1451,6 +1454,7 @@ 381792632AFFC017002A4551 /* XCRemoteSwiftPackageReference "AlertToast" */, 38A5E9C02B03F0140037C668 /* XCRemoteSwiftPackageReference "iPhoneNumberField" */, 380BC6372B26029600DCF442 /* XCRemoteSwiftPackageReference "stripe-ios-spm" */, + 22C38C8B2B2CC33500FE4C73 /* XCLocalSwiftPackageReference "SLAComponents" */, ); productRefGroup = 38AE9C992AD0750F00B761E8 /* Products */; projectDirPath = ""; @@ -2688,6 +2692,13 @@ }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 22C38C8B2B2CC33500FE4C73 /* XCLocalSwiftPackageReference "SLAComponents" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = SLAComponents; + }; +/* End XCLocalSwiftPackageReference section */ + /* Begin XCRemoteSwiftPackageReference section */ 380BC6372B26029600DCF442 /* XCRemoteSwiftPackageReference "stripe-ios-spm" */ = { isa = XCRemoteSwiftPackageReference; @@ -2756,6 +2767,10 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 22C38C8C2B2CC33500FE4C73 /* SLAComponents */ = { + isa = XCSwiftPackageProductDependency; + productName = SLAComponents; + }; 380BC6382B26029600DCF442 /* Stripe */ = { isa = XCSwiftPackageProductDependency; package = 380BC6372B26029600DCF442 /* XCRemoteSwiftPackageReference "stripe-ios-spm" */; diff --git a/ScribbleLab.xcworkspace/contents.xcworkspacedata b/ScribbleLab.xcworkspace/contents.xcworkspacedata index 7120f8100..6a005baa9 100644 --- a/ScribbleLab.xcworkspace/contents.xcworkspacedata +++ b/ScribbleLab.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/ScribbleLab.xcworkspace/xcuserdata/mcrich.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ScribbleLab.xcworkspace/xcuserdata/mcrich.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 000000000..bb86731d5 --- /dev/null +++ b/ScribbleLab.xcworkspace/xcuserdata/mcrich.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,6 @@ + + + diff --git a/ScribbleLab/Core/Auth/View/CompleteRegistartionView.swift b/ScribbleLab/Core/Auth/View/CompleteRegistartionView.swift index 3cc4fbc7c..aef9cb0cb 100644 --- a/ScribbleLab/Core/Auth/View/CompleteRegistartionView.swift +++ b/ScribbleLab/Core/Auth/View/CompleteRegistartionView.swift @@ -49,8 +49,10 @@ struct CompleteRegistartionView: View { .padding(.horizontal, 24) SLButton(text: "Register", font: .subheadline, backgroundColor: .orange, textColor: .black, cornerRadius: 10) { - Task { try await viewModel.createUser() } - Task { try await vm.signIn() } + Task { + try await viewModel.createUser() + try await vm.signIn() + } // Task { // do { // try await viewModel.createUser() diff --git a/ScribbleLab/Core/Root/ContentView.swift b/ScribbleLab/Core/Root/ContentView.swift index a799bbfdd..a297b79fb 100644 --- a/ScribbleLab/Core/Root/ContentView.swift +++ b/ScribbleLab/Core/Root/ContentView.swift @@ -12,7 +12,7 @@ struct ContentView: View { var body: some View { Group { - if $viewModel.userSession == nil { + if viewModel.userSession == nil { SignUpView() } else if let currentUser = viewModel.currentUser { // viewModel.currentUser != nil SLSideBarView() diff --git a/ScribbleLab/Ressources/Localizable.xcstrings b/ScribbleLab/Ressources/Localizable.xcstrings index adeded790..0d38f2fa5 100644 --- a/ScribbleLab/Ressources/Localizable.xcstrings +++ b/ScribbleLab/Ressources/Localizable.xcstrings @@ -253,9 +253,6 @@ }, "Accessibility" : { - }, - "Add Item" : { - }, "Add New Timer" : { @@ -787,6 +784,7 @@ }, "Item at %@" : { + "extractionState" : "stale", "localizations" : { "de" : { "stringUnit" : { @@ -1095,9 +1093,6 @@ }, "Security mode" : { - }, - "Select an item" : { - }, "Set up 2FA" : {