diff --git a/LaunchScreen.storyboard b/LaunchScreen.storyboard index 433eca4..79d078e 100644 --- a/LaunchScreen.storyboard +++ b/LaunchScreen.storyboard @@ -21,8 +21,8 @@ - - + + @@ -30,11 +30,11 @@ - + - + - + diff --git a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon 1.png b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon 1.png index aea7c44..b67b509 100644 Binary files a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon 1.png 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 index aea7c44..b67b509 100644 Binary files a/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon.png and b/Werkout_ios/Assets.xcassets/AppIcon.appiconset/icon.png differ diff --git a/Werkout_ios/Assets.xcassets/icon.imageset/Contents.json b/Werkout_ios/Assets.xcassets/icon.imageset/Contents.json new file mode 100644 index 0000000..37f4c53 --- /dev/null +++ b/Werkout_ios/Assets.xcassets/icon.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "icon.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/Werkout_ios/Assets.xcassets/icon.imageset/icon.pdf b/Werkout_ios/Assets.xcassets/icon.imageset/icon.pdf new file mode 100644 index 0000000..067e988 Binary files /dev/null and b/Werkout_ios/Assets.xcassets/icon.imageset/icon.pdf differ diff --git a/Werkout_ios/Assets.xcassets/launch_icon.imageset/Contents.json b/Werkout_ios/Assets.xcassets/launch_icon.imageset/Contents.json deleted file mode 100644 index 429d23b..0000000 --- a/Werkout_ios/Assets.xcassets/launch_icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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 deleted file mode 100644 index aea7c44..0000000 Binary files a/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 1.png and /dev/null 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 deleted file mode 100644 index aea7c44..0000000 Binary files a/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon 2.png and /dev/null differ diff --git a/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon.png b/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon.png deleted file mode 100644 index aea7c44..0000000 Binary files a/Werkout_ios/Assets.xcassets/launch_icon.imageset/icon.png and /dev/null differ diff --git a/Werkout_ios/Views/ExternalWorkoutDetailView.swift b/Werkout_ios/Views/ExternalWorkoutDetailView.swift index 9e187dd..a8db01b 100644 --- a/Werkout_ios/Views/ExternalWorkoutDetailView.swift +++ b/Werkout_ios/Views/ExternalWorkoutDetailView.swift @@ -47,21 +47,10 @@ struct ExternalWorkoutDetailView: View { } } } else { - GeometryReader { metrics in - VStack { - Spacer() - HStack { - Spacer() - - Image(uiImage: Bundle.main.icon ?? UIImage()) - .resizable() - .scaledToFit() - .frame(width: metrics.size.width/2, height: metrics.size.height/2) - Spacer() - } - Spacer() - } - } + Image("icon") + .resizable() + .scaledToFill() + .ignoresSafeArea() } } .onChange(of: bridgeModule.currentExercise, perform: { newValue in @@ -216,7 +205,7 @@ struct ExternalWorkoutDetailView_Previews: PreviewProvider { static var previews: some View { ExternalWorkoutDetailView().environmentObject({ () -> BridgeModule in let envObj = BridgeModule.shared - envObj.currentWorkout = PreviewData.workout() + envObj.currentWorkout = nil //PreviewData.workout() bridge.currentExercise = PreviewData.workout().exercisesSortedByCreated_at.first! return envObj }() )