diff --git a/LaunchScreen.storyboard b/LaunchScreen.storyboard new file mode 100644 index 0000000..433eca4 --- /dev/null +++ b/LaunchScreen.storyboard @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Werkout-ios-Info.plist b/Werkout-ios-Info.plist index 9d20ca2..f6cad2b 100644 --- a/Werkout-ios-Info.plist +++ b/Werkout-ios-Info.plist @@ -11,12 +11,5 @@ audio - UILaunchScreen - - UIColorName - launchBackgroundColor - UIImageName - AppIcon - diff --git a/Werkout_ios.xcodeproj/project.pbxproj b/Werkout_ios.xcodeproj/project.pbxproj index eaa41c4..f74a93f 100644 --- a/Werkout_ios.xcodeproj/project.pbxproj +++ b/Werkout_ios.xcodeproj/project.pbxproj @@ -32,6 +32,7 @@ 1CD0C6632A5AF62900970E52 /* WorkoutOverviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD0C6622A5AF62900970E52 /* WorkoutOverviewView.swift */; }; 1CD0C6672A5CA19600970E52 /* BaseURLs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD0C6662A5CA19600970E52 /* BaseURLs.swift */; }; 1CD0C6682A5CA1A200970E52 /* BaseURLs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD0C6662A5CA19600970E52 /* BaseURLs.swift */; }; + 1CD0C66C2A5E4EA100970E52 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1CD0C66B2A5E4EA100970E52 /* LaunchScreen.storyboard */; }; 1CF65A262A3972840042FFBD /* Werkout_iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A252A3972840042FFBD /* Werkout_iosApp.swift */; }; 1CF65A282A3972840042FFBD /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A272A3972840042FFBD /* Persistence.swift */; }; 1CF65A2B2A3972840042FFBD /* Werkout_ios.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 1CF65A292A3972840042FFBD /* Werkout_ios.xcdatamodeld */; }; @@ -144,6 +145,7 @@ 1CAF4D942A52180600B00E50 /* PlanWorkoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanWorkoutView.swift; sourceTree = ""; }; 1CD0C6622A5AF62900970E52 /* WorkoutOverviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutOverviewView.swift; sourceTree = ""; }; 1CD0C6662A5CA19600970E52 /* BaseURLs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseURLs.swift; sourceTree = ""; }; + 1CD0C66B2A5E4EA100970E52 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; 1CF65A222A3972840042FFBD /* Werkout_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Werkout_ios.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1CF65A252A3972840042FFBD /* Werkout_iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Werkout_iosApp.swift; sourceTree = ""; }; 1CF65A272A3972840042FFBD /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = ""; }; @@ -235,6 +237,7 @@ 1CF65A192A3972840042FFBD = { isa = PBXGroup; children = ( + 1CD0C66B2A5E4EA100970E52 /* LaunchScreen.storyboard */, 1CF65A242A3972840042FFBD /* Werkout_ios */, 1CF65A942A452D270042FFBD /* Werkout_watch Watch App */, 1CF65A232A3972840042FFBD /* Products */, @@ -520,6 +523,7 @@ 1CF65A5F2A3BF5A60042FFBD /* Equipment.json in Resources */, 1C485C832A489B9C00A6F896 /* CompletedWorkouts.json in Resources */, 1C31C8852A53AE3E00350540 /* long_beep.m4a in Resources */, + 1CD0C66C2A5E4EA100970E52 /* LaunchScreen.storyboard in Resources */, 1CF65A4A2A39FBB10042FFBD /* WorkoutDetail.json in Resources */, 1CF65A652A3BF6BE0042FFBD /* AllWorkouts.json in Resources */, 1CF65A332A3972850042FFBD /* Preview Assets.xcassets in Resources */, @@ -753,6 +757,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = Werkout_ios/Werkout_ios.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -770,6 +775,7 @@ "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; @@ -795,6 +801,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CODE_SIGN_ENTITLEMENTS = Werkout_ios/Werkout_ios.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -812,6 +819,7 @@ "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; diff --git a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/Contents.json index df757d1..00708dd 100644 --- a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,13 +1,13 @@ { "images" : [ { - "filename" : "logo_2.png", + "filename" : "icon.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" }, { - "filename" : "logo_2 1.png", + "filename" : "icon 1.png", "idiom" : "universal", "platform" : "watchos", "size" : "1024x1024" diff --git a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon 1.png b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon 1.png new file mode 100644 index 0000000..aea7c44 Binary files /dev/null and b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon 1.png differ diff --git a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon.png b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon.png new file mode 100644 index 0000000..aea7c44 Binary files /dev/null and b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon.png differ diff --git a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/logo_2 1.png b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/logo_2 1.png deleted file mode 100644 index 276e1f4..0000000 Binary files a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/logo_2 1.png and /dev/null differ diff --git a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/logo_2.png b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/logo_2.png deleted file mode 100644 index 276e1f4..0000000 Binary files a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/logo_2.png and /dev/null differ diff --git a/Werkout_ios/Assets.xcassets/launch_icon.imageset/Contents.json b/Werkout_ios/Assets.xcassets/launch_icon.imageset/Contents.json new file mode 100644 index 0000000..429d23b --- /dev/null +++ b/Werkout_ios/Assets.xcassets/launch_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "icon 2.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon 1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "icon.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 1.png b/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 1.png new file mode 100644 index 0000000..aea7c44 Binary files /dev/null and b/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 1.png differ diff --git a/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 2.png b/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 2.png new file mode 100644 index 0000000..aea7c44 Binary files /dev/null and b/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 2.png differ diff --git a/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon.png b/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon.png new file mode 100644 index 0000000..aea7c44 Binary files /dev/null and b/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon.png differ diff --git a/Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift b/Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift index 955211b..7195170 100644 --- a/Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift +++ b/Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift @@ -94,12 +94,13 @@ struct AllWorkoutsView: View { let viewModel = WorkoutDetailViewModel(workout: item) WorkoutDetailView(viewModel: viewModel, showAddToCalendar: false) } -// .sheet(isPresented: $showLoginView) { -// LoginView(completion: { -// self.needsUpdating = true -// maybeUpdateShit() -// }) -// } + .sheet(isPresented: $showLoginView) { + LoginView(completion: { + self.needsUpdating = true + maybeUpdateShit() + }) + .interactiveDismissDisabled() + } .onReceive(pub) { (output) in self.needsUpdating = true maybeUpdateShit()