diff --git a/MarvelUI/Persistence.swift b/MarvelUI/Persistence.swift deleted file mode 100644 index 8f6c36a..0000000 --- a/MarvelUI/Persistence.swift +++ /dev/null @@ -1,56 +0,0 @@ -// -// Persistence.swift -// MarvelUI -// -// Created by Lucas Hubert on 17/05/23. -// - -import CoreData - -struct PersistenceController { - static let shared = PersistenceController() - - static var preview: PersistenceController = { - let result = PersistenceController(inMemory: true) - let viewContext = result.container.viewContext - for _ in 0..<10 { - let newItem = Item(context: viewContext) - newItem.timestamp = Date() - } - do { - try viewContext.save() - } catch { - // Replace this implementation with code to handle the error appropriately. - // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. - let nsError = error as NSError - fatalError("Unresolved error \(nsError), \(nsError.userInfo)") - } - return result - }() - - let container: NSPersistentCloudKitContainer - - init(inMemory: Bool = false) { - container = NSPersistentCloudKitContainer(name: "MarvelUI") - if inMemory { - container.persistentStoreDescriptions.first!.url = URL(fileURLWithPath: "/dev/null") - } - container.loadPersistentStores(completionHandler: { (storeDescription, error) in - if let error = error as NSError? { - // Replace this implementation with code to handle the error appropriately. - // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. - - /* - Typical reasons for an error here include: - * The parent directory does not exist, cannot be created, or disallows writing. - * The persistent store is not accessible, due to permissions or data protection when the device is locked. - * The device is out of space. - * The store could not be migrated to the current model version. - Check the error message to determine what the actual problem was. - */ - fatalError("Unresolved error \(error), \(error.userInfo)") - } - }) - container.viewContext.automaticallyMergesChangesFromParent = true - } -} diff --git a/MarvelUI.xcodeproj/project.pbxproj b/eUberUI.xcodeproj/project.pbxproj similarity index 82% rename from MarvelUI.xcodeproj/project.pbxproj rename to eUberUI.xcodeproj/project.pbxproj index 91acc85..38047a6 100644 --- a/MarvelUI.xcodeproj/project.pbxproj +++ b/eUberUI.xcodeproj/project.pbxproj @@ -7,14 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - C9CFFE442A15179E00708A15 /* MarvelUIApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE432A15179E00708A15 /* MarvelUIApp.swift */; }; + C9CFFE442A15179E00708A15 /* eUberUIApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE432A15179E00708A15 /* eUberUIApp.swift */; }; C9CFFE482A1517A200708A15 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C9CFFE472A1517A200708A15 /* Assets.xcassets */; }; C9CFFE4B2A1517A200708A15 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C9CFFE4A2A1517A200708A15 /* Preview Assets.xcassets */; }; - C9CFFE4D2A1517A200708A15 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE4C2A1517A200708A15 /* Persistence.swift */; }; - C9CFFE502A1517A200708A15 /* MarvelUI.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE4E2A1517A200708A15 /* MarvelUI.xcdatamodeld */; }; - C9CFFE5B2A1517A200708A15 /* MarvelUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE5A2A1517A200708A15 /* MarvelUITests.swift */; }; - C9CFFE652A1517A300708A15 /* MarvelUIUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE642A1517A300708A15 /* MarvelUIUITests.swift */; }; - C9CFFE672A1517A300708A15 /* MarvelUIUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE662A1517A300708A15 /* MarvelUIUITestsLaunchTests.swift */; }; + C9CFFE502A1517A200708A15 /* eUberUI.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE4E2A1517A200708A15 /* eUberUI.xcdatamodeld */; }; + C9CFFE5B2A1517A200708A15 /* eUberUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE5A2A1517A200708A15 /* eUberUITests.swift */; }; + C9CFFE652A1517A300708A15 /* eUberUIUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE642A1517A300708A15 /* eUberUIUITests.swift */; }; + C9CFFE672A1517A300708A15 /* eUberUIUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE662A1517A300708A15 /* eUberUIUITestsLaunchTests.swift */; }; C9CFFE7D2A151D2400708A15 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE7C2A151D2400708A15 /* HomeView.swift */; }; C9CFFE7F2A151D9000708A15 /* UberMapViewRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE7E2A151D9000708A15 /* UberMapViewRepresentable.swift */; }; C9CFFE812A151F7400708A15 /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9CFFE802A151F7400708A15 /* LocationManager.swift */; }; @@ -43,18 +42,17 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - C9CFFE402A15179E00708A15 /* MarvelUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarvelUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; - C9CFFE432A15179E00708A15 /* MarvelUIApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarvelUIApp.swift; sourceTree = ""; }; + C9CFFE402A15179E00708A15 /* eUberUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = eUberUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; + C9CFFE432A15179E00708A15 /* eUberUIApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = eUberUIApp.swift; sourceTree = ""; }; C9CFFE472A1517A200708A15 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; C9CFFE4A2A1517A200708A15 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - C9CFFE4C2A1517A200708A15 /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = ""; }; C9CFFE4F2A1517A200708A15 /* MarvelUI.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MarvelUI.xcdatamodel; sourceTree = ""; }; C9CFFE512A1517A200708A15 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C9CFFE562A1517A200708A15 /* MarvelUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MarvelUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - C9CFFE5A2A1517A200708A15 /* MarvelUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarvelUITests.swift; sourceTree = ""; }; - C9CFFE602A1517A300708A15 /* MarvelUIUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MarvelUIUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - C9CFFE642A1517A300708A15 /* MarvelUIUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarvelUIUITests.swift; sourceTree = ""; }; - C9CFFE662A1517A300708A15 /* MarvelUIUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarvelUIUITestsLaunchTests.swift; sourceTree = ""; }; + C9CFFE562A1517A200708A15 /* eUberUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = eUberUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C9CFFE5A2A1517A200708A15 /* eUberUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = eUberUITests.swift; sourceTree = ""; }; + C9CFFE602A1517A300708A15 /* eUberUIUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = eUberUIUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C9CFFE642A1517A300708A15 /* eUberUIUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = eUberUIUITests.swift; sourceTree = ""; }; + C9CFFE662A1517A300708A15 /* eUberUIUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = eUberUIUITestsLaunchTests.swift; sourceTree = ""; }; C9CFFE7C2A151D2400708A15 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; C9CFFE7E2A151D9000708A15 /* UberMapViewRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UberMapViewRepresentable.swift; sourceTree = ""; }; C9CFFE802A151F7400708A15 /* LocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationManager.swift; sourceTree = ""; }; @@ -93,9 +91,9 @@ C9CFFE372A15179E00708A15 = { isa = PBXGroup; children = ( - C9CFFE422A15179E00708A15 /* MarvelUI */, - C9CFFE592A1517A200708A15 /* MarvelUITests */, - C9CFFE632A1517A300708A15 /* MarvelUIUITests */, + C9CFFE422A15179E00708A15 /* eUberUI */, + C9CFFE592A1517A200708A15 /* eUberUITests */, + C9CFFE632A1517A300708A15 /* eUberUIUITests */, C9CFFE412A15179E00708A15 /* Products */, ); sourceTree = ""; @@ -103,14 +101,14 @@ C9CFFE412A15179E00708A15 /* Products */ = { isa = PBXGroup; children = ( - C9CFFE402A15179E00708A15 /* MarvelUI.app */, - C9CFFE562A1517A200708A15 /* MarvelUITests.xctest */, - C9CFFE602A1517A300708A15 /* MarvelUIUITests.xctest */, + C9CFFE402A15179E00708A15 /* eUberUI.app */, + C9CFFE562A1517A200708A15 /* eUberUITests.xctest */, + C9CFFE602A1517A300708A15 /* eUberUIUITests.xctest */, ); name = Products; sourceTree = ""; }; - C9CFFE422A15179E00708A15 /* MarvelUI */ = { + C9CFFE422A15179E00708A15 /* eUberUI */ = { isa = PBXGroup; children = ( C9CFFE792A151CB800708A15 /* App */, @@ -119,12 +117,11 @@ C9CFFE742A151CAC00708A15 /* Models */, C9CFFE732A151C9500708A15 /* Managers */, C9CFFE472A1517A200708A15 /* Assets.xcassets */, - C9CFFE4C2A1517A200708A15 /* Persistence.swift */, C9CFFE512A1517A200708A15 /* Info.plist */, - C9CFFE4E2A1517A200708A15 /* MarvelUI.xcdatamodeld */, + C9CFFE4E2A1517A200708A15 /* eUberUI.xcdatamodeld */, C9CFFE492A1517A200708A15 /* Preview Content */, ); - path = MarvelUI; + path = eUberUI; sourceTree = ""; }; C9CFFE492A1517A200708A15 /* Preview Content */ = { @@ -135,21 +132,21 @@ path = "Preview Content"; sourceTree = ""; }; - C9CFFE592A1517A200708A15 /* MarvelUITests */ = { + C9CFFE592A1517A200708A15 /* eUberUITests */ = { isa = PBXGroup; children = ( - C9CFFE5A2A1517A200708A15 /* MarvelUITests.swift */, + C9CFFE5A2A1517A200708A15 /* eUberUITests.swift */, ); - path = MarvelUITests; + path = eUberUITests; sourceTree = ""; }; - C9CFFE632A1517A300708A15 /* MarvelUIUITests */ = { + C9CFFE632A1517A300708A15 /* eUberUIUITests */ = { isa = PBXGroup; children = ( - C9CFFE642A1517A300708A15 /* MarvelUIUITests.swift */, - C9CFFE662A1517A300708A15 /* MarvelUIUITestsLaunchTests.swift */, + C9CFFE642A1517A300708A15 /* eUberUIUITests.swift */, + C9CFFE662A1517A300708A15 /* eUberUIUITestsLaunchTests.swift */, ); - path = MarvelUIUITests; + path = eUberUIUITests; sourceTree = ""; }; C9CFFE732A151C9500708A15 /* Managers */ = { @@ -186,7 +183,7 @@ C9CFFE792A151CB800708A15 /* App */ = { isa = PBXGroup; children = ( - C9CFFE432A15179E00708A15 /* MarvelUIApp.swift */, + C9CFFE432A15179E00708A15 /* eUberUIApp.swift */, ); path = App; sourceTree = ""; @@ -247,9 +244,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - C9CFFE3F2A15179E00708A15 /* MarvelUI */ = { + C9CFFE3F2A15179E00708A15 /* eUberUI */ = { isa = PBXNativeTarget; - buildConfigurationList = C9CFFE6A2A1517A300708A15 /* Build configuration list for PBXNativeTarget "MarvelUI" */; + buildConfigurationList = C9CFFE6A2A1517A300708A15 /* Build configuration list for PBXNativeTarget "eUberUI" */; buildPhases = ( C9CFFE3C2A15179E00708A15 /* Sources */, C9CFFE3D2A15179E00708A15 /* Frameworks */, @@ -259,14 +256,14 @@ ); dependencies = ( ); - name = MarvelUI; + name = eUberUI; productName = MarvelUI; - productReference = C9CFFE402A15179E00708A15 /* MarvelUI.app */; + productReference = C9CFFE402A15179E00708A15 /* eUberUI.app */; productType = "com.apple.product-type.application"; }; - C9CFFE552A1517A200708A15 /* MarvelUITests */ = { + C9CFFE552A1517A200708A15 /* eUberUITests */ = { isa = PBXNativeTarget; - buildConfigurationList = C9CFFE6D2A1517A300708A15 /* Build configuration list for PBXNativeTarget "MarvelUITests" */; + buildConfigurationList = C9CFFE6D2A1517A300708A15 /* Build configuration list for PBXNativeTarget "eUberUITests" */; buildPhases = ( C9CFFE522A1517A200708A15 /* Sources */, C9CFFE532A1517A200708A15 /* Frameworks */, @@ -277,14 +274,14 @@ dependencies = ( C9CFFE582A1517A200708A15 /* PBXTargetDependency */, ); - name = MarvelUITests; + name = eUberUITests; productName = MarvelUITests; - productReference = C9CFFE562A1517A200708A15 /* MarvelUITests.xctest */; + productReference = C9CFFE562A1517A200708A15 /* eUberUITests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - C9CFFE5F2A1517A300708A15 /* MarvelUIUITests */ = { + C9CFFE5F2A1517A300708A15 /* eUberUIUITests */ = { isa = PBXNativeTarget; - buildConfigurationList = C9CFFE702A1517A300708A15 /* Build configuration list for PBXNativeTarget "MarvelUIUITests" */; + buildConfigurationList = C9CFFE702A1517A300708A15 /* Build configuration list for PBXNativeTarget "eUberUIUITests" */; buildPhases = ( C9CFFE5C2A1517A300708A15 /* Sources */, C9CFFE5D2A1517A300708A15 /* Frameworks */, @@ -295,9 +292,9 @@ dependencies = ( C9CFFE622A1517A300708A15 /* PBXTargetDependency */, ); - name = MarvelUIUITests; + name = eUberUIUITests; productName = MarvelUIUITests; - productReference = C9CFFE602A1517A300708A15 /* MarvelUIUITests.xctest */; + productReference = C9CFFE602A1517A300708A15 /* eUberUIUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ @@ -323,7 +320,7 @@ }; }; }; - buildConfigurationList = C9CFFE3B2A15179E00708A15 /* Build configuration list for PBXProject "MarvelUI" */; + buildConfigurationList = C9CFFE3B2A15179E00708A15 /* Build configuration list for PBXProject "eUberUI" */; compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -336,9 +333,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - C9CFFE3F2A15179E00708A15 /* MarvelUI */, - C9CFFE552A1517A200708A15 /* MarvelUITests */, - C9CFFE5F2A1517A300708A15 /* MarvelUIUITests */, + C9CFFE3F2A15179E00708A15 /* eUberUI */, + C9CFFE552A1517A200708A15 /* eUberUITests */, + C9CFFE5F2A1517A300708A15 /* eUberUIUITests */, ); }; /* End PBXProject section */ @@ -375,13 +372,12 @@ buildActionMask = 2147483647; files = ( C9CFFE8B2A15410900708A15 /* LocationSearchView.swift in Sources */, - C9CFFE4D2A1517A200708A15 /* Persistence.swift in Sources */, C9CFFE7D2A151D2400708A15 /* HomeView.swift in Sources */, C9CFFE812A151F7400708A15 /* LocationManager.swift in Sources */, - C9CFFE502A1517A200708A15 /* MarvelUI.xcdatamodeld in Sources */, + C9CFFE502A1517A200708A15 /* eUberUI.xcdatamodeld in Sources */, C9CFFE8F2A154F1900708A15 /* LocationSearchViewModel.swift in Sources */, C9CFFE8D2A15447800708A15 /* LocationSearchResultCell.swift in Sources */, - C9CFFE442A15179E00708A15 /* MarvelUIApp.swift in Sources */, + C9CFFE442A15179E00708A15 /* eUberUIApp.swift in Sources */, C9CFFE7F2A151D9000708A15 /* UberMapViewRepresentable.swift in Sources */, C9CFFE872A153D7500708A15 /* LocationSearchActivationView.swift in Sources */, C9CFFE892A153FA800708A15 /* MapViewActionButton.swift in Sources */, @@ -392,7 +388,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C9CFFE5B2A1517A200708A15 /* MarvelUITests.swift in Sources */, + C9CFFE5B2A1517A200708A15 /* eUberUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -400,8 +396,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C9CFFE672A1517A300708A15 /* MarvelUIUITestsLaunchTests.swift in Sources */, - C9CFFE652A1517A300708A15 /* MarvelUIUITests.swift in Sources */, + C9CFFE672A1517A300708A15 /* eUberUIUITestsLaunchTests.swift in Sources */, + C9CFFE652A1517A300708A15 /* eUberUIUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -410,12 +406,12 @@ /* Begin PBXTargetDependency section */ C9CFFE582A1517A200708A15 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C9CFFE3F2A15179E00708A15 /* MarvelUI */; + target = C9CFFE3F2A15179E00708A15 /* eUberUI */; targetProxy = C9CFFE572A1517A200708A15 /* PBXContainerItemProxy */; }; C9CFFE622A1517A300708A15 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = C9CFFE3F2A15179E00708A15 /* MarvelUI */; + target = C9CFFE3F2A15179E00708A15 /* eUberUI */; targetProxy = C9CFFE612A1517A300708A15 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -542,23 +538,25 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"MarvelUI/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "\"eUberUI/Preview Content\""; DEVELOPMENT_TEAM = 76WUJ9PUX7; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = MarvelUI/Info.plist; + INFOPLIST_FILE = eUberUI/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = eUberUI; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Please, we need your permission o provide our services"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = samples.projects.swiftUI.MarvelUI; + PRODUCT_BUNDLE_IDENTIFIER = samples.projects.swiftUI.eUberUI; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -573,23 +571,25 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"MarvelUI/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "\"eUberUI/Preview Content\""; DEVELOPMENT_TEAM = 76WUJ9PUX7; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = MarvelUI/Info.plist; + INFOPLIST_FILE = eUberUI/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = eUberUI; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Please, we need your permission o provide our services"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = samples.projects.swiftUI.MarvelUI; + PRODUCT_BUNDLE_IDENTIFIER = samples.projects.swiftUI.eUberUI; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -613,7 +613,7 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarvelUI.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/MarvelUI"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/eUberUI.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/eUberUI"; }; name = Debug; }; @@ -633,7 +633,7 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarvelUI.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/MarvelUI"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/eUberUI.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/eUberUI"; }; name = Release; }; @@ -676,7 +676,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - C9CFFE3B2A15179E00708A15 /* Build configuration list for PBXProject "MarvelUI" */ = { + C9CFFE3B2A15179E00708A15 /* Build configuration list for PBXProject "eUberUI" */ = { isa = XCConfigurationList; buildConfigurations = ( C9CFFE682A1517A300708A15 /* Debug */, @@ -685,7 +685,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C9CFFE6A2A1517A300708A15 /* Build configuration list for PBXNativeTarget "MarvelUI" */ = { + C9CFFE6A2A1517A300708A15 /* Build configuration list for PBXNativeTarget "eUberUI" */ = { isa = XCConfigurationList; buildConfigurations = ( C9CFFE6B2A1517A300708A15 /* Debug */, @@ -694,7 +694,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C9CFFE6D2A1517A300708A15 /* Build configuration list for PBXNativeTarget "MarvelUITests" */ = { + C9CFFE6D2A1517A300708A15 /* Build configuration list for PBXNativeTarget "eUberUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( C9CFFE6E2A1517A300708A15 /* Debug */, @@ -703,7 +703,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C9CFFE702A1517A300708A15 /* Build configuration list for PBXNativeTarget "MarvelUIUITests" */ = { + C9CFFE702A1517A300708A15 /* Build configuration list for PBXNativeTarget "eUberUIUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( C9CFFE712A1517A300708A15 /* Debug */, @@ -715,13 +715,13 @@ /* End XCConfigurationList section */ /* Begin XCVersionGroup section */ - C9CFFE4E2A1517A200708A15 /* MarvelUI.xcdatamodeld */ = { + C9CFFE4E2A1517A200708A15 /* eUberUI.xcdatamodeld */ = { isa = XCVersionGroup; children = ( C9CFFE4F2A1517A200708A15 /* MarvelUI.xcdatamodel */, ); currentVersion = C9CFFE4F2A1517A200708A15 /* MarvelUI.xcdatamodel */; - path = MarvelUI.xcdatamodeld; + path = eUberUI.xcdatamodeld; sourceTree = ""; versionGroupType = wrapper.xcdatamodel; }; diff --git a/MarvelUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/eUberUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 52% rename from MarvelUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to eUberUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 919434a..ce3d3b2 100644 --- a/MarvelUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/eUberUI.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:/Volumes/lucashubertssd/Testes/MarvelUI/SwiftUI-Uber-App/eUberUI.xcodeproj"> diff --git a/MarvelUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/eUberUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from MarvelUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to eUberUI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/MarvelUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/xcschememanagement.plist b/eUberUI.xcodeproj/project.xcworkspace/xcuserdata/lucashubert.xcuserdatad/IDEFindNavigatorScopes.plist similarity index 50% rename from MarvelUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/xcschememanagement.plist rename to eUberUI.xcodeproj/project.xcworkspace/xcuserdata/lucashubert.xcuserdatad/IDEFindNavigatorScopes.plist index 6d8412c..5dd5da8 100644 --- a/MarvelUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/eUberUI.xcodeproj/project.xcworkspace/xcuserdata/lucashubert.xcuserdatad/IDEFindNavigatorScopes.plist @@ -1,14 +1,5 @@ - - SchemeUserState - - MarvelUI.xcscheme_^#shared#^_ - - orderHint - 0 - - - + diff --git a/eUberUI.xcodeproj/project.xcworkspace/xcuserdata/lucashubert.xcuserdatad/UserInterfaceState.xcuserstate b/eUberUI.xcodeproj/project.xcworkspace/xcuserdata/lucashubert.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..576ec3a Binary files /dev/null and b/eUberUI.xcodeproj/project.xcworkspace/xcuserdata/lucashubert.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/eUberUI.xcodeproj/xcshareddata/xcschemes/eUberUI.xcscheme b/eUberUI.xcodeproj/xcshareddata/xcschemes/eUberUI.xcscheme new file mode 100644 index 0000000..00b4625 --- /dev/null +++ b/eUberUI.xcodeproj/xcshareddata/xcschemes/eUberUI.xcscheme @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eUberUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/MarvelUI.xcscheme b/eUberUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/MarvelUI.xcscheme new file mode 100644 index 0000000..00b4625 --- /dev/null +++ b/eUberUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/MarvelUI.xcscheme @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eUberUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/xcschememanagement.plist b/eUberUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..02ab2f2 --- /dev/null +++ b/eUberUI.xcodeproj/xcuserdata/lucashubert.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,39 @@ + + + + + SchemeUserState + + MarvelUI.xcscheme + + isShown + + orderHint + 0 + + eUberUI.xcscheme_^#shared#^_ + + orderHint + 1 + + + SuppressBuildableAutocreation + + C9CFFE3F2A15179E00708A15 + + primary + + + C9CFFE552A1517A200708A15 + + primary + + + C9CFFE5F2A1517A300708A15 + + primary + + + + + diff --git a/MarvelUI/App/MarvelUIApp.swift b/eUberUI/App/eUberUIApp.swift similarity index 82% rename from MarvelUI/App/MarvelUIApp.swift rename to eUberUI/App/eUberUIApp.swift index 47b5b3c..c6aff70 100644 --- a/MarvelUI/App/MarvelUIApp.swift +++ b/eUberUI/App/eUberUIApp.swift @@ -1,6 +1,6 @@ // -// MarvelUIApp.swift -// MarvelUI +// eUberUIApp.swift +// eUberUI // // Created by Lucas Hubert on 17/05/23. // @@ -8,7 +8,7 @@ import SwiftUI @main -struct MarvelUIApp: App { +struct eUberUIApp: App { @StateObject var locationViewModel = LocationSearchViewModel() var body: some Scene { diff --git a/MarvelUI/Assets.xcassets/AccentColor.colorset/Contents.json b/eUberUI/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from MarvelUI/Assets.xcassets/AccentColor.colorset/Contents.json rename to eUberUI/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/MarvelUI/Assets.xcassets/AppIcon.appiconset/Contents.json b/eUberUI/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 83% rename from MarvelUI/Assets.xcassets/AppIcon.appiconset/Contents.json rename to eUberUI/Assets.xcassets/AppIcon.appiconset/Contents.json index 13613e3..9d0bf18 100644 --- a/MarvelUI/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/eUberUI/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,6 +1,7 @@ { "images" : [ { + "filename" : "eUberLogo.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/eUberUI/Assets.xcassets/AppIcon.appiconset/eUberLogo.png b/eUberUI/Assets.xcassets/AppIcon.appiconset/eUberLogo.png new file mode 100644 index 0000000..903695f Binary files /dev/null and b/eUberUI/Assets.xcassets/AppIcon.appiconset/eUberLogo.png differ diff --git a/MarvelUI/Assets.xcassets/Contents.json b/eUberUI/Assets.xcassets/Contents.json similarity index 100% rename from MarvelUI/Assets.xcassets/Contents.json rename to eUberUI/Assets.xcassets/Contents.json diff --git a/MarvelUI/Core/Home/View/HomeView.swift b/eUberUI/Core/Home/View/HomeView.swift similarity index 98% rename from MarvelUI/Core/Home/View/HomeView.swift rename to eUberUI/Core/Home/View/HomeView.swift index 93b798a..0315c9c 100644 --- a/MarvelUI/Core/Home/View/HomeView.swift +++ b/eUberUI/Core/Home/View/HomeView.swift @@ -1,6 +1,6 @@ // // HomeView.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Core/Home/View/MapViewActionButton.swift b/eUberUI/Core/Home/View/MapViewActionButton.swift similarity index 98% rename from MarvelUI/Core/Home/View/MapViewActionButton.swift rename to eUberUI/Core/Home/View/MapViewActionButton.swift index 30cbc4c..b7d9581 100644 --- a/MarvelUI/Core/Home/View/MapViewActionButton.swift +++ b/eUberUI/Core/Home/View/MapViewActionButton.swift @@ -1,6 +1,6 @@ // // MapViewActionButton.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Core/Home/View/UberMapViewRepresentable.swift b/eUberUI/Core/Home/View/UberMapViewRepresentable.swift similarity index 99% rename from MarvelUI/Core/Home/View/UberMapViewRepresentable.swift rename to eUberUI/Core/Home/View/UberMapViewRepresentable.swift index cebad5e..2ca1a0d 100644 --- a/MarvelUI/Core/Home/View/UberMapViewRepresentable.swift +++ b/eUberUI/Core/Home/View/UberMapViewRepresentable.swift @@ -1,6 +1,6 @@ // // UberMapViewRepresentable.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Core/LocationSearch/View/LocationSearchActivationView.swift b/eUberUI/Core/LocationSearch/View/LocationSearchActivationView.swift similarity index 98% rename from MarvelUI/Core/LocationSearch/View/LocationSearchActivationView.swift rename to eUberUI/Core/LocationSearch/View/LocationSearchActivationView.swift index b5f3d89..39ecc6e 100644 --- a/MarvelUI/Core/LocationSearch/View/LocationSearchActivationView.swift +++ b/eUberUI/Core/LocationSearch/View/LocationSearchActivationView.swift @@ -1,6 +1,6 @@ // // LocationSearchActivationView.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Core/LocationSearch/View/LocationSearchResultCell.swift b/eUberUI/Core/LocationSearch/View/LocationSearchResultCell.swift similarity index 98% rename from MarvelUI/Core/LocationSearch/View/LocationSearchResultCell.swift rename to eUberUI/Core/LocationSearch/View/LocationSearchResultCell.swift index 12cf586..9b2d2f8 100644 --- a/MarvelUI/Core/LocationSearch/View/LocationSearchResultCell.swift +++ b/eUberUI/Core/LocationSearch/View/LocationSearchResultCell.swift @@ -1,6 +1,6 @@ // // LocationSearchResultCell.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Core/LocationSearch/View/LocationSearchView.swift b/eUberUI/Core/LocationSearch/View/LocationSearchView.swift similarity index 99% rename from MarvelUI/Core/LocationSearch/View/LocationSearchView.swift rename to eUberUI/Core/LocationSearch/View/LocationSearchView.swift index a75d290..f0e4d8c 100644 --- a/MarvelUI/Core/LocationSearch/View/LocationSearchView.swift +++ b/eUberUI/Core/LocationSearch/View/LocationSearchView.swift @@ -1,6 +1,6 @@ // // LocationSeachView.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Core/LocationSearch/ViewModel/LocationSearchViewModel.swift b/eUberUI/Core/LocationSearch/ViewModel/LocationSearchViewModel.swift similarity index 99% rename from MarvelUI/Core/LocationSearch/ViewModel/LocationSearchViewModel.swift rename to eUberUI/Core/LocationSearch/ViewModel/LocationSearchViewModel.swift index 993954f..33aad5e 100644 --- a/MarvelUI/Core/LocationSearch/ViewModel/LocationSearchViewModel.swift +++ b/eUberUI/Core/LocationSearch/ViewModel/LocationSearchViewModel.swift @@ -1,6 +1,6 @@ // // LocationSearchViewModel.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Info.plist b/eUberUI/Info.plist similarity index 100% rename from MarvelUI/Info.plist rename to eUberUI/Info.plist diff --git a/MarvelUI/Managers/LocationManager.swift b/eUberUI/Managers/LocationManager.swift similarity index 98% rename from MarvelUI/Managers/LocationManager.swift rename to eUberUI/Managers/LocationManager.swift index 0db4ebf..a097f18 100644 --- a/MarvelUI/Managers/LocationManager.swift +++ b/eUberUI/Managers/LocationManager.swift @@ -1,6 +1,6 @@ // // LocationManager.swift -// MarvelUI +// eUberUI // // Created by Lucas Hubert on 17/05/23. // diff --git a/MarvelUI/Preview Content/Preview Assets.xcassets/Contents.json b/eUberUI/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from MarvelUI/Preview Content/Preview Assets.xcassets/Contents.json rename to eUberUI/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/MarvelUI/MarvelUI.xcdatamodeld/.xccurrentversion b/eUberUI/eUberUI.xcdatamodeld/.xccurrentversion similarity index 100% rename from MarvelUI/MarvelUI.xcdatamodeld/.xccurrentversion rename to eUberUI/eUberUI.xcdatamodeld/.xccurrentversion diff --git a/MarvelUI/MarvelUI.xcdatamodeld/MarvelUI.xcdatamodel/contents b/eUberUI/eUberUI.xcdatamodeld/MarvelUI.xcdatamodel/contents similarity index 100% rename from MarvelUI/MarvelUI.xcdatamodeld/MarvelUI.xcdatamodel/contents rename to eUberUI/eUberUI.xcdatamodeld/MarvelUI.xcdatamodel/contents diff --git a/MarvelUITests/MarvelUITests.swift b/eUberUITests/eUberUITests.swift similarity index 91% rename from MarvelUITests/MarvelUITests.swift rename to eUberUITests/eUberUITests.swift index 9c36fde..4c84fd7 100644 --- a/MarvelUITests/MarvelUITests.swift +++ b/eUberUITests/eUberUITests.swift @@ -1,14 +1,14 @@ // -// MarvelUITests.swift -// MarvelUITests +// eUberUITests.swift +// eUberUITests // // Created by Lucas Hubert on 17/05/23. // import XCTest -@testable import MarvelUI +@testable import eUberUI -final class MarvelUITests: XCTestCase { +final class eUberUITests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. diff --git a/MarvelUIUITests/MarvelUIUITests.swift b/eUberUIUITests/eUberUIUITests.swift similarity index 93% rename from MarvelUIUITests/MarvelUIUITests.swift rename to eUberUIUITests/eUberUIUITests.swift index 9aa742b..12fc684 100644 --- a/MarvelUIUITests/MarvelUIUITests.swift +++ b/eUberUIUITests/eUberUIUITests.swift @@ -1,13 +1,13 @@ // -// MarvelUIUITests.swift -// MarvelUIUITests +// eUberUIUITests.swift +// eUberUIUITests // // Created by Lucas Hubert on 17/05/23. // import XCTest -final class MarvelUIUITests: XCTestCase { +final class eUberUIUITests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. diff --git a/MarvelUIUITests/MarvelUIUITestsLaunchTests.swift b/eUberUIUITests/eUberUIUITestsLaunchTests.swift similarity index 86% rename from MarvelUIUITests/MarvelUIUITestsLaunchTests.swift rename to eUberUIUITests/eUberUIUITestsLaunchTests.swift index a7fa290..4495c05 100644 --- a/MarvelUIUITests/MarvelUIUITestsLaunchTests.swift +++ b/eUberUIUITests/eUberUIUITestsLaunchTests.swift @@ -1,13 +1,13 @@ // -// MarvelUIUITestsLaunchTests.swift -// MarvelUIUITests +// eUberUIUITestsLaunchTests.swift +// eUberUIUITests // // Created by Lucas Hubert on 17/05/23. // import XCTest -final class MarvelUIUITestsLaunchTests: XCTestCase { +final class eUberUIUITestsLaunchTests: XCTestCase { override class var runsForEachTargetApplicationUIConfiguration: Bool { true