diff --git a/enzevalos_iphone/OnboardingIntroInfoSection.swift b/enzevalos_iphone/OnboardingIntroInfoSection.swift index 824682057c120a413038f02f54529c943fb4e601..61ef9f0279af9723213cb0c85e6f988db1b14f1b 100644 --- a/enzevalos_iphone/OnboardingIntroInfoSection.swift +++ b/enzevalos_iphone/OnboardingIntroInfoSection.swift @@ -15,18 +15,18 @@ struct OnboardingIntroInfosection: View { headline:NSLocalizedString("OnboardingIntroSection.Confidential.headline", comment: ""), previewText:NSLocalizedString("OnboardingIntroSection.Confidential.preview", comment: ""), description:NSLocalizedString("OnboardingIntroSection.Confidential.description", comment: ""), - imageName: "secure"), + image: StudySettings.securityIndicator.imageOfSecureIndicatorSwiftUI(background: false, open: false, button: false)), OnboardingIntroInfoSubsection( headline:NSLocalizedString("OnboardingIntroSection.Detection.headline", comment: ""), previewText:NSLocalizedString("OnboardingIntroSection.Detection.preview", comment: ""), description:NSLocalizedString("OnboardingIntroSection.Detection.description", comment: ""), - imageName: "insecure"), + image: StudySettings.securityIndicator.imageOfInsecureIndicatorSwiftUI(background: false, button: false)) ] var body: some View { VStack(alignment: .leading){ ForEach(sections,id: \.id){section in - OnboardingIntroInfosubsection(image: section.imageName, headline: section.headline, previewText: section.previewText, description: section.description).padding(.vertical, 10) + OnboardingIntroInfosubsection(image: section.image, headline: section.headline, previewText: section.previewText, description: section.description).padding(.vertical, 10) } } .padding(.horizontal, 40) @@ -35,7 +35,7 @@ struct OnboardingIntroInfosection: View { struct OnboardingIntroInfosubsection: View { - var image:String + var image:Image var headline:String var previewText:String var description:String @@ -47,10 +47,10 @@ struct OnboardingIntroInfosubsection: View { self.pressed.toggle() }){ HStack(alignment: .top){ - Image(image) + image .renderingMode(Image.TemplateRenderingMode?.init(Image.TemplateRenderingMode.original)) .resizable() - .frame(width: 40, height:40) + .frame(width: 49, height:37) VStack(alignment: .leading){ Text(headline).font(.body).fontWeight(.bold) if(pressed){ @@ -70,17 +70,17 @@ struct OnboardingIntroInfosubsection: View { } class OnboardingIntroInfoSubsection{ - var imageName:String + var image:Image var headline:String var previewText:String var description:String var id:UUID - init(headline:String, previewText:String, description:String, imageName:String){ - self.id=UUID() - self.headline=headline - self.previewText=previewText - self.description=description - self.imageName=imageName + init(headline:String, previewText:String, description:String, image:Image){ + self.id = UUID() + self.headline = headline + self.previewText = previewText + self.description = description + self.image = image } } diff --git a/enzevalos_iphone/study parameters/SecurityIndicator.swift b/enzevalos_iphone/study parameters/SecurityIndicator.swift index 860a9a07a0debf653a599e21dfe280dd43773479..ab833176f8c81507068cd37aaa4cc49b34fb0c6c 100644 --- a/enzevalos_iphone/study parameters/SecurityIndicator.swift +++ b/enzevalos_iphone/study parameters/SecurityIndicator.swift @@ -7,6 +7,7 @@ // import Foundation +import SwiftUI @@ -59,9 +60,6 @@ enum SecurityIndicator: Int, StudyParameterProtocol { return } - - - func imageOfSecureIndicator(background: Bool = false, open: Bool = false, button: Bool = false) -> UIImage { switch self { case .letter: @@ -83,6 +81,9 @@ enum SecurityIndicator: Int, StudyParameterProtocol { } } + func imageOfSecureIndicatorSwiftUI(background: Bool = false, open: Bool = false, button: Bool = false) -> Image { + return Image(uiImage: imageOfSecureIndicator(background: background, open: open, button: button)) + } func imageOfCorruptedIndicator(background: Bool = false) -> UIImage { switch self { @@ -93,6 +94,10 @@ enum SecurityIndicator: Int, StudyParameterProtocol { } } + func imageOfCorruptedIndicatorSwiftUI(background: Bool = false) -> Image{ + return Image(uiImage: imageOfCorruptedIndicator(background: background)) + } + func imageOfInsecureIndicator(background: Bool = false, button: Bool = false) -> UIImage { switch self { case .letter: @@ -114,6 +119,11 @@ enum SecurityIndicator: Int, StudyParameterProtocol { } } + func imageOfInsecureIndicatorSwiftUI(background: Bool = false, button: Bool = false) -> Image { + return Image(uiImage: imageOfInsecureIndicator(background: background, button: button)) + } + + func drawOfSecureIndictor(frame: CGRect?, rezising: IconsStyleKit.ResizingBehavior = .aspectFit, color: UIColor = IconsStyleKit.strokeColor, fillbackground: Bool = false, open: Bool) { switch self { case .letter: