BUG: switch to translations coming from config and fix UI inconsistencies

KetchSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'KetchSDK'
-  s.version          = '2.0.2'
+  s.version          = '2.0.3'
   s.summary          = 'Integrated solution for user data usage consents management'
   s.homepage         = 'https://ketch.com'
   s.license          = { :type => 'Apache', :file => 'LICENSE' }

Sources/KetchSDK/Core/Ketch.swift

@@ -29,9 +29,6 @@ public final class Ketch: ObservableObject {
 
     /// Configuration updates stream
     @Published public var configuration: KetchSDK.Configuration?
-
-    /// Localize Strings updates stream
-    @Published public var localizedStrings: KetchSDK.LocalizedStrings?
 
     /// Consent updates stream
     @Published public var consent: KetchSDK.ConsentStatus?
@@ -45,7 +42,6 @@ public final class Ketch: ObservableObject {
     private var plugins = Set<PolicyPlugin>()
 
     private var configurationSubject = CurrentValueSubject<KetchSDK.Configuration?, KetchSDK.KetchError>(nil)
-    private var localizedStringsSubject = CurrentValueSubject<KetchSDK.LocalizedStrings?, KetchSDK.KetchError>(nil)
     private var consentSubject = CurrentValueSubject<KetchSDK.ConsentStatus?, KetchSDK.KetchError>(nil)
     private var subscriptions = Set<AnyCancellable>()
 
@@ -85,16 +81,6 @@ public final class Ketch: ObservableObject {
                 }
             }
             .store(in: &subscriptions)
-
-        localizedStringsSubject
-            .replaceError(with: nil)
-            .compactMap { $0 }
-            .sink { localizedStrings in
-                DispatchQueue.main.async {
-                    self.localizedStrings = localizedStrings
-                }
-            }
-            .store(in: &subscriptions)
 
         consentSubject
             .replaceError(with: nil)
@@ -122,16 +108,16 @@ public final class Ketch: ObservableObject {
                 self.configurationSubject.send(configuration)
             }
             .store(in: &subscriptions)
-        KetchApiRequest()
-            .fetchLocalizedStrings()
-            .sink { result in
-                if case .failure(let error) = result {
-                    self.localizedStringsSubject.send(completion: .failure(error))
-                }
-            } receiveValue: { localizedStrings in
-                self.localizedStringsSubject.send(localizedStrings)
-            }
-            .store(in: &subscriptions)
+        //KetchApiRequest()
+        //    .fetchLocalizedStrings()
+        //    .sink { result in
+        //        if case .failure(let error) = result {
+        //            self.localizedStringsSubject.send(completion: .failure(error))
+        //        }
+        //    } receiveValue: { localizedStrings in
+        //        self.localizedStringsSubject.send(localizedStrings)
+        //    }
+        //    .store(in: &subscriptions)
     }
 
     public func loadConfiguration(
@@ -154,16 +140,6 @@ public final class Ketch: ObservableObject {
                 self.configurationSubject.send(configuration)
             }
             .store(in: &subscriptions)
-        KetchApiRequest()
-            .fetchLocalizedStrings(languageCode:String(Locale.preferredLanguages[0].prefix(2)))
-            .sink { result in
-                if case .failure(let error) = result {
-                    self.localizedStringsSubject.send(completion: .failure(error))
-                }
-            } receiveValue: { localizedStrings in
-                self.localizedStringsSubject.send(localizedStrings)
-            }
-            .store(in: &subscriptions)
     }
 
     public func invokeRights(

Sources/KetchSDK/Core/KetchApiRequest.swift

@@ -15,24 +15,12 @@ class KetchApiRequest {
     typealias ConsentUpdate = KetchSDK.ConsentUpdate
     typealias InvokeRightConfig = KetchSDK.InvokeRightConfig
     typealias Vendors = KetchSDK.Vendors
-    typealias LocalizedStrings = KetchSDK.LocalizedStrings
 
     private let apiClient: ApiClient
 
     init(apiClient: ApiClient = DefaultApiClient()) {
         self.apiClient = apiClient
     }
-
-    func fetchLocalizedStrings(languageCode:String = String(Locale.preferredLanguages[0].prefix(2))) -> AnyPublisher<LocalizedStrings, KetchError> {
-        apiClient.execute(
-            request: ApiRequest(
-                endPoint: .localizedStrings(languageCode: languageCode)
-            )
-        )
-        .decode(type: LocalizedStrings.self, decoder: JSONDecoder())
-        .mapError(KetchError.init)
-        .eraseToAnyPublisher()
-    }
 
     func fetchConfig(organization: String, property: String) -> AnyPublisher<Configuration, KetchError> {
         apiClient.execute(

Sources/KetchSDK/UI/KetchUI.swift

@@ -17,7 +17,7 @@ public final class KetchUI: ObservableObject {
 
     /// Localized Strings updates stream
     /// Reflected from Ketch dependency
-    @Published public var localizedStrings: KetchSDK.LocalizedStrings?
+    @Published public var localizedStrings: KetchSDK.Configuration.Translations?
 
     /// Consent updates stream
     /// Reflected from Ketch dependency
@@ -41,12 +41,7 @@ public final class KetchUI: ObservableObject {
         ketch.$configuration
             .sink { configuration in
                 self.configuration = configuration
-            }
-            .store(in: &subscriptions)
-
-        ketch.$localizedStrings
-            .sink { localizedStrings in
-                self.localizedStrings = localizedStrings
+                self.localizedStrings = configuration?.translations
             }
             .store(in: &subscriptions)
 
@@ -86,7 +81,6 @@ extension KetchUI {
         guard
             let configuration,
             let consentStatus,
-            let localizedStrings,
             let banner = configuration.experiences?.consent?.banner
         else { return nil }
 
@@ -105,7 +99,6 @@ extension KetchUI {
         guard
             let configuration,
             let consentStatus,
-            let localizedStrings,
             let modal = configuration.experiences?.consent?.modal
         else { return nil }
 
@@ -124,7 +117,6 @@ extension KetchUI {
         guard
             let configuration,
             let consentStatus,
-            let localizedStrings,
             let jit = configuration.experiences?.consent?.jit
         else { return nil }
 
@@ -144,7 +136,6 @@ extension KetchUI {
         guard
             let configuration,
             let consentStatus,
-            let localizedStrings,
             let preference = configuration.experiences?.preference
         else { return nil }
 
@@ -298,11 +289,11 @@ extension KetchUI {
             switch defaultExperience {
             case .banner:
                 if shouldShowBanner { showBanner() }
-                else if shouldShowPreference { showPreference() }
+                //else if shouldShowPreference { showPreference() }
 
             case .modal:
                 if shouldShowModal { showModal() }
-                else if shouldShowPreference { showPreference() }
+                //else if shouldShowPreference { showPreference() }
             }
         }
     }

Sources/KetchSDK/UI/PresentationItem/PresentationItem+View.swift

@@ -63,7 +63,8 @@ extension KetchUI.PresentationItem {
             vendors: config.vendors,
             purposesConsent: consent.purposes,
             vendorsConsent: consent.vendors,
-            theme: theme.purposesListTheme
+            theme: theme.purposesListTheme,
+            purposeButtonsLookIdentical: theme.purposeButtonsLookIdentical ?? false
         )
 
         let buttonProps = Props.Button(
@@ -121,16 +122,20 @@ extension KetchUI.PresentationItem {
 
     private func preference(item: ItemType.PreferenceItem) -> some View {
         let theme = Props.Preference.Theme(with: config.theme)
+
+        let hideConsentTitle = item.config.consents.hideConsentTitle ?? false
 
         let purposesProps = Props.PurposesList(
             bodyTitle: item.config.consents.bodyTitle ?? String(),
             bodyDescription: item.config.consents.bodyDescription ?? String(),
-            consentTitle: "Purposes",
+            consentTitle: hideConsentTitle ? nil : (item.localizedStrings?.purposes ?? "Purposes"),
+            hideLegalBases: item.config.consents.hideLegalBases ?? false,
             purposes: config.purposes,
             vendors: config.vendors,
             purposesConsent: consent.purposes,
             vendorsConsent: consent.vendors,
-            theme: theme.purposesListTheme
+            theme: theme.purposesListTheme,
+            purposeButtonsLookIdentical: theme.purposeButtonsLookIdentical ?? false
         )
 
 

Sources/KetchSDK/UI/PresentationItem/PresentationItem.swift

@@ -11,7 +11,7 @@ extension KetchUI {
         let itemType: ItemType
         let config: KetchSDK.Configuration
         let consent: KetchSDK.ConsentStatus
-        let localizedStrings: KetchSDK.LocalizedStrings
+        let localizedStrings: KetchSDK.Configuration.Translations?
 
         public var id: String { String(describing: itemType) }
     }
@@ -31,7 +31,7 @@ extension KetchUI.PresentationItem.ItemType {
     /// Internal implementation of Banner PresentationItem that contains possible actions handler
     struct BannerItem {
         let config: KetchSDK.Configuration.Experience.ConsentExperience.Banner
-        let localizedStrings: KetchSDK.LocalizedStrings
+        let localizedStrings: KetchSDK.Configuration.Translations?
         let actionHandler: (Action) -> KetchUI.PresentationItem?
 
         enum Action {
@@ -45,7 +45,7 @@ extension KetchUI.PresentationItem.ItemType {
     /// Internal implementation of Modal PresentationItem that contains possible actions handler
     struct ModalItem {
         let config: KetchSDK.Configuration.Experience.ConsentExperience.Modal
-        let localizedStrings: KetchSDK.LocalizedStrings
+        let localizedStrings: KetchSDK.Configuration.Translations?
         let actionHandler: (Action) -> KetchUI.PresentationItem?
 
         enum Action {
@@ -58,7 +58,7 @@ extension KetchUI.PresentationItem.ItemType {
     /// Internal implementation of Just In Time PresentationItem that contains possible actions handler
     struct JitItem {
         let config: KetchSDK.Configuration.Experience.ConsentExperience.JIT
-        let localizedStrings: KetchSDK.LocalizedStrings
+        let localizedStrings: KetchSDK.Configuration.Translations?
         let purpose: KetchSDK.Configuration.Purpose
         let actionHandler: (Action) -> KetchUI.PresentationItem?
 
@@ -73,7 +73,7 @@ extension KetchUI.PresentationItem.ItemType {
     /// Internal implementation of Preference PresentationItem that contains possible actions handler
     struct PreferenceItem {
         let config: KetchSDK.Configuration.PreferenceExperience
-        let localizedStrings: KetchSDK.LocalizedStrings
+        let localizedStrings: KetchSDK.Configuration.Translations?
         let actionHandler: (Action) -> KetchUI.PresentationItem?
 
         enum Action {
@@ -97,7 +97,7 @@ extension KetchUI.PresentationItem {
     static func banner(
         bannerConfig: KetchSDK.Configuration.Experience.ConsentExperience.Banner,
         config: KetchSDK.Configuration,
-        localizedStrings: KetchSDK.LocalizedStrings,
+        localizedStrings: KetchSDK.Configuration.Translations?,
         consent: KetchSDK.ConsentStatus,
         actionHandler: @escaping (ItemType.BannerItem.Action) -> KetchUI.PresentationItem?
     ) -> Self {
@@ -125,7 +125,7 @@ extension KetchUI.PresentationItem {
     static func modal(
         modalConfig: KetchSDK.Configuration.Experience.ConsentExperience.Modal,
         config: KetchSDK.Configuration,
-        localizedStrings: KetchSDK.LocalizedStrings,
+        localizedStrings: KetchSDK.Configuration.Translations?,
         consent: KetchSDK.ConsentStatus,
         actionHandler: @escaping (ItemType.ModalItem.Action) -> KetchUI.PresentationItem?
     ) -> Self {
@@ -153,7 +153,7 @@ extension KetchUI.PresentationItem {
     static func preference(
         preferenceConfig: KetchSDK.Configuration.PreferenceExperience,
         config: KetchSDK.Configuration,
-        localizedStrings: KetchSDK.LocalizedStrings,
+        localizedStrings: KetchSDK.Configuration.Translations?,
         consent: KetchSDK.ConsentStatus,
         actionHandler: @escaping (ItemType.PreferenceItem.Action) -> KetchUI.PresentationItem?
     ) -> Self {
@@ -182,7 +182,7 @@ extension KetchUI.PresentationItem {
     static func jit(
         jitConfig: KetchSDK.Configuration.Experience.ConsentExperience.JIT,
         config: KetchSDK.Configuration,
-        localizedStrings: KetchSDK.LocalizedStrings,
+        localizedStrings: KetchSDK.Configuration.Translations?,
         purpose: KetchSDK.Configuration.Purpose,
         consent: KetchSDK.ConsentStatus,
         actionHandler: @escaping (ItemType.JitItem.Action) -> KetchUI.PresentationItem?

Sources/KetchSDK/UI/Views/Banner/BannerView.swift

@@ -34,7 +34,7 @@ struct BannerView: View {
                 }
                 .foregroundColor(props.theme.contentColor)
             }
-
+            
             TitleDescriptionSection(
                 props: props.titleDescriptionSectionProps
             ) { action in
@@ -43,24 +43,25 @@ struct BannerView: View {
                 }
             }
             .padding(.bottom, 12)
-
-
+            
+            
             if let primaryButton = props.primaryButton {
                 CustomButton(props: primaryButton) {
                     self.handle(action: .primary)
                 }
             }
-
+            
             if let secondaryButton = props.secondaryButton {
                 CustomButton(props: secondaryButton) {
                     self.handle(action: .secondary)
                 }
             }
-
-            HStack {
-                LogoSection(textContent: props.localizedStrings.poweredBy)
-                    .foregroundColor(props.theme.contentColor)
-                Spacer()
+            if (props.theme.showWatermark) {
+                HStack {
+                    LogoSection(textContent: props.localizedStrings?.poweredBy ?? "Powered By")
+                        .foregroundColor(props.theme.contentColor)
+                    Spacer()
+                }
             }
         }
         .padding(24)

Sources/KetchSDK/UI/Views/Banner/Props+Banner.swift

@@ -12,7 +12,7 @@ extension Props {
         let primaryButton: Button?
         let secondaryButton: Button?
         let theme: Theme
-        let localizedStrings: KetchSDK.LocalizedStrings
+        let localizedStrings: KetchSDK.Configuration.Translations?
 
         struct Theme {
             let titleFontSize: CGFloat = 20
@@ -26,6 +26,8 @@ extension Props {
             let buttonColor: Color
             let secondaryButtonColor: Color
             let secondaryButtonVariant: String
+
+            let showWatermark: Bool
         }
     }
 }

Sources/KetchSDK/UI/Views/JIT/JitView.swift

@@ -117,7 +117,7 @@ struct JitView: View {
                         }
 
                         HStack {
-                            LogoSection(textContent: props.localizedStrings.poweredBy)
+                            LogoSection(textContent: props.localizedStrings?.poweredBy ?? "Powered by")
                                 .foregroundColor(props.theme.headerTextColor)
                             Spacer()
                         }

Sources/KetchSDK/UI/Views/JIT/Props+Jit.swift

@@ -17,7 +17,7 @@ extension Props {
         let moreInfoText: String?
         let moreInfoDestinationEnabled: Bool
         let theme: Theme
-        let localizedStrings: KetchSDK.LocalizedStrings
+        let localizedStrings: KetchSDK.Configuration.Translations?
 
         struct Theme {
             let titleFontSize: CGFloat = 20

Sources/KetchSDK/UI/Views/Modal/ModalView.swift

@@ -87,11 +87,12 @@ struct ModalView: View {
                                     presentationMode.wrappedValue.dismiss()
                                 }
                             }
-
-                            HStack {
-                                LogoSection(textContent: props.localizedStrings.poweredBy)
-                                    .foregroundColor(props.theme.headerTextColor)
-                                Spacer()
+                            if (props.theme.showWatermark) {
+                                HStack {
+                                    LogoSection(textContent: props.localizedStrings?.poweredBy ?? "Powered by")
+                                        .foregroundColor(props.theme.headerTextColor)
+                                    Spacer()
+                                }
                             }
                         }
                         .padding(24)