From 709367b3e90a2294e912fc44b23085916bad7230 Mon Sep 17 00:00:00 2001 From: Charles Xu Date: Thu, 1 Aug 2024 11:51:19 -0700 Subject: [PATCH 1/3] fix: IOSSDKBUG-282 -- JMC welcome screen legal disclaimer background color mismatch --- .../_FioriStyles/JouleWelcomeScreenStyle.fiori.swift | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift index 55ca97e4d..e29d75577 100644 --- a/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift +++ b/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift @@ -1,3 +1,8 @@ +🌱 Cloning SwiftFormat 0.53.4 +🌱 Resolving package +🌱 Building product swiftformat +🌱 Installed SwiftFormat 0.53.4 +🌱 Running swiftformat 0.53.4... import FioriThemeManager // Generated using Sourcery 2.1.7 — https://github.com/krzysztofzablocki/Sourcery @@ -38,6 +43,7 @@ public struct JouleWelcomeScreenBaseStyle: JouleWelcomeScreenStyle { Spacer() configuration.footnote } + .background(Color.preferredColor(.primaryBackground)) } } From 4dbae953fb2beca8b18a36e1222f2e579a7b4244 Mon Sep 17 00:00:00 2001 From: Charles Xu Date: Thu, 1 Aug 2024 13:40:17 -0700 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20build=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_FioriStyles/JouleWelcomeScreenStyle.fiori.swift | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift index e29d75577..d650de059 100644 --- a/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift +++ b/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift @@ -1,8 +1,3 @@ -🌱 Cloning SwiftFormat 0.53.4 -🌱 Resolving package -🌱 Building product swiftformat -🌱 Installed SwiftFormat 0.53.4 -🌱 Running swiftformat 0.53.4... import FioriThemeManager // Generated using Sourcery 2.1.7 — https://github.com/krzysztofzablocki/Sourcery From 9d281dd9fad46f5d551722174e6aca9e08e77bb7 Mon Sep 17 00:00:00 2001 From: Charles Xu Date: Thu, 1 Aug 2024 16:04:13 -0700 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=F0=9F=90=9B=20ios=20sdk=20bug=20282?= =?UTF-8?q?,=20welcome=20screen=20legal=20disclaimer=20bgcolor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_FioriStyles/JouleWelcomeScreenStyle.fiori.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift index d650de059..e9d488d8f 100644 --- a/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift +++ b/Sources/FioriSwiftUICore/_FioriStyles/JouleWelcomeScreenStyle.fiori.swift @@ -38,7 +38,6 @@ public struct JouleWelcomeScreenBaseStyle: JouleWelcomeScreenStyle { Spacer() configuration.footnote } - .background(Color.preferredColor(.primaryBackground)) } } @@ -47,7 +46,8 @@ extension JouleWelcomeScreenFioriStyle { struct ContentFioriStyle: JouleWelcomeScreenStyle { func makeBody(_ configuration: JouleWelcomeScreenConfiguration) -> some View { JouleWelcomeScreen(configuration) - // Add default style for its content + // Add default style for its content + .background(Color.preferredColor(.primaryBackground)) } }