diff --git a/Werkout_ios/Assets.xcassets/launchBackgroundColor.colorset/Contents.json b/Werkout_ios/Assets.xcassets/appColor.colorset/Contents.json similarity index 100% rename from Werkout_ios/Assets.xcassets/launchBackgroundColor.colorset/Contents.json rename to Werkout_ios/Assets.xcassets/appColor.colorset/Contents.json diff --git a/Werkout_ios/Views/ExternalWorkoutDetailView.swift b/Werkout_ios/Views/ExternalWorkoutDetailView.swift index a8db01b..11b3813 100644 --- a/Werkout_ios/Views/ExternalWorkoutDetailView.swift +++ b/Werkout_ios/Views/ExternalWorkoutDetailView.swift @@ -49,8 +49,8 @@ struct ExternalWorkoutDetailView: View { } else { Image("icon") .resizable() + .edgesIgnoringSafeArea(.all) .scaledToFill() - .ignoresSafeArea() } } .onChange(of: bridgeModule.currentExercise, perform: { newValue in diff --git a/Werkout_ios/Views/Login/LoginView.swift b/Werkout_ios/Views/Login/LoginView.swift index 13d5e05..171f85b 100644 --- a/Werkout_ios/Views/Login/LoginView.swift +++ b/Werkout_ios/Views/Login/LoginView.swift @@ -47,12 +47,15 @@ struct LoginView: View { .frame(maxWidth: .infinity) Spacer() - Image("launch_icon") - Spacer() + } .padding() - .background(Color(UIColor(red: 157/255, green: 138/255, blue: 255/255, alpha: 1))) - + .background( + Image("icon") + .resizable() + .edgesIgnoringSafeArea(.all) + .scaledToFill() + ) } func login() { diff --git a/Werkout_ios/Werkout_iosApp.swift b/Werkout_ios/Werkout_iosApp.swift index 88c640e..e48f9df 100644 --- a/Werkout_ios/Werkout_iosApp.swift +++ b/Werkout_ios/Werkout_iosApp.swift @@ -62,6 +62,7 @@ struct Werkout_iosApp: App { } .tag(3) } + .accentColor(Color("appColor")) .onAppear{ UIApplication.shared.isIdleTimerDisabled = true _ = try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, mode: .default, options: .mixWithOthers)