Releasing 4.2.3

Author: Rover Release Bot 🤖

Sources/Experiences/Experiences/Extensions/Array+conversion.swift

@@ -0,0 +1,31 @@
+// Copyright (c) 2020-present, Rover Labs, Inc. All rights reserved.
+// You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
+// copy, modify, and distribute this software in source code or binary form for use
+// in connection with the web services and APIs provided by Rover.
+//
+// This copyright notice shall be included in all copies or substantial portions of
+// the software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import Foundation
+
+internal extension Array where Element == String {
+    func toStringDictionary() -> [String: String] {
+        var iterator = makeIterator()
+        var result: UserInfo = [:]
+        while var current = iterator.next() {
+            if let next = iterator.next() {
+                result[current] = next
+                current = next
+            }
+        }
+        
+        return result
+    }
+}

Sources/Experiences/Experiences/Extensions/Collection+items.swift

@@ -70,10 +70,9 @@ extension Collection {
             let startAt = max(limit.startAt - 1, 0)
             let lowerBound = min(startAt, result.indices.upperBound)
             let limitedRange = result.indices.clamped(to: lowerBound..<result.endIndex)
-            result = Array(result[limitedRange])
+            result = Array(result[limitedRange].prefix(limit.show))
         }
 
-        result = Array(result.prefix(limit?.show ?? 100))
         return result
     }
 }

Sources/Experiences/Experiences/Model/ExperienceModel.swift

@@ -117,10 +117,10 @@ final class ExperienceModel: Decodable {
         appearance = try container.decode(Appearance.self, forKey: .appearance)
 
         let parameterArray = try container.decode([String].self, forKey: .urlParameters)
-        self.urlParameters = parameterArray.toUserInfo()
+        self.urlParameters = parameterArray.toStringDictionary()
 
         let userArray = try container.decode([String].self, forKey: .userInfo)
-        self.userInfo = userArray.toUserInfo()
+        self.userInfo = userArray.toStringDictionary()
 
         authorizers = try container.decode([DocumentAuthorizer].self, forKey: .authorizers)
 
@@ -142,18 +142,3 @@ final class ExperienceModel: Decodable {
         try coordinator.resolveRelationships(nodes: nodes, documentColors: colors, documentGradients: gradients)
     }
 }
-
-fileprivate extension Array where Element == String {
-    func toUserInfo() -> UserInfo {
-        var iterator = makeIterator()
-        var result: UserInfo = [:]
-        while var current = iterator.next() {
-            if let next = iterator.next() {
-                result[current] = next
-                current = next
-            }
-        }
-        
-        return result
-    }
-}

Sources/Experiences/Experiences/Model/Value Types/DocumentFont.swift

@@ -63,3 +63,34 @@ public extension DocumentFont {
         self.sources.map { $0.assetUrl }
     }
 }
+
+extension DocumentFont {
+    func fontForStyle(_ textStyle: SwiftUI.Font.TextStyle) -> CustomFont {
+        switch textStyle {
+        case .largeTitle:
+            return self.largeTitle
+        case .title:
+            return self.title
+        case.title2:
+            return self.title2
+        case .title3:
+            return self.title3
+        case .headline:
+            return self.headline
+        case .body:
+            return self.body
+        case .callout:
+            return self.callout
+        case .subheadline:
+            return self.subheadline
+        case .footnote:
+            return self.footnote
+        case .caption:
+            return self.caption
+        case .caption2:
+            return self.caption2
+        default:
+            return self.body
+        }
+    }
+}

Sources/Experiences/Experiences/Model/Value Types/Metadata.swift

@@ -21,4 +21,18 @@ public struct Metadata: Codable, Hashable {
         self.properties = properties
         self.tags = tags
     }
+    
+    private enum CodingKeys: String, CodingKey {
+        case properties
+        case tags
+    }
+    
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        let propertiesArray: Array = try container.decode([String].self, forKey: .properties)
+        properties = propertiesArray.toStringDictionary()
+        
+        tags = try container.decode(Set<String>.self, forKey: .tags)
+    }
 }

Sources/Experiences/Experiences/UI/Model/Font+uikit.swift

@@ -19,7 +19,7 @@ import UIKit
 import SwiftUI
 
 extension RoverExperiences.Font {
-    var uikitFont: UIFont? {
+    func uikitFont(with experience: ExperienceModel?) -> UIFont? {
         switch self {
         case .dynamic(let textStyle, let emphases):
             let font = UIFont.preferredFont(forTextStyle: textStyle.uiTextStyle)
@@ -37,12 +37,18 @@ extension RoverExperiences.Font {
             return UIFont.systemFont(ofSize: scaledSize, weight: weight.uiWeight)
 
         case .document(let fontFamily, let textStyle):
-            //TODO: how do I get the list of fonts from the document here?  fontFamily must be converted to font name.
             let font: UIFont?
-            
-            //TODO: the app takes the size of the custom font from the font style.  But in order to achieve this, the font family must first be converted to a font name.
-            let scaledSize = UIFontMetrics.default.scaledValue(for: 14)
-            font = UIFont(name: fontFamily, size: scaledSize)
+
+            if let experience = experience,
+               let documentFont = experience.fonts.first(where: { $0.fontFamily == fontFamily }) {
+                let customFont = documentFont.fontForStyle(textStyle)
+                let scaledSize = UIFontMetrics.default.scaledValue(for: customFont.size)
+                font = UIFont(name: customFont.fontName,
+                              size: scaledSize)
+            } else {
+                let scaledSize = UIFontMetrics.default.scaledValue(for: 14)
+                font = UIFont(name: fontFamily, size: scaledSize)
+            }
 
             if font == nil {
                 rover_log(.debug, "Missing font %@", fontFamily)

Sources/Experiences/Experiences/UI/Modifiers/FontModifier.swift

@@ -20,27 +20,34 @@ import UIKit
 
 struct FontModifier: ViewModifier {
     @Environment(\.sizeCategory) private var sizeCategory
+    @Environment(\.experience) private var experience
     @State private var uiFont: SwiftUI.Font
 
     var font: RoverExperiences.Font
 
-    init(font: RoverExperiences.Font) {
+    init(font: RoverExperiences.Font,
+         experience: ExperienceModel?) {
         self.font = font
-        self._uiFont = .init(initialValue: getUIFont(for: font))
+        self._uiFont =
+            .init(initialValue: getUIFont(
+                for: font,
+                experience: experience))
     }
 
     func body(content: Content) -> some View {
         content
             .font(uiFont)
             .onReceive(NotificationCenter.default.publisher(for: ExperienceManager.didRegisterCustomFontNotification)) { _ in
-                uiFont = getUIFont(for: font)
+                uiFont = getUIFont(for: font,
+                                   experience: experience)
             }
     }
 }
 
 
-private func getUIFont(for font: RoverExperiences.Font) -> SwiftUI.Font {
-    if let uifont = font.uikitFont {
+private func getUIFont(for font: RoverExperiences.Font,
+                       experience: ExperienceModel?) -> SwiftUI.Font {
+    if let uifont = font.uikitFont(with: experience) {        
         return SwiftUI.Font(uifont)
     }
 

Sources/Experiences/Experiences/UI/ScreenViewController.swift

@@ -141,7 +141,7 @@ class ScreenViewController: UIViewController, UIScrollViewDelegate {
         if let navBar = navBar {
             navigationItem.configure(
                 navBar: navBar,
-                stringTable: experience.localization,
+                experience: experience,
                 data: data,
                 urlParameters: urlParameters,
                 userInfo: userInfo,
@@ -223,7 +223,8 @@ class ScreenViewController: UIViewController, UIScrollViewDelegate {
             navigationItem.configureInlineAppearance(
                 navBar: navBar,
                 traits: traitCollection,
-                isScrolling: isScrolling
+                isScrolling: isScrolling,
+                experience: experience
             )
 
             navigationController?.navigationBar.adjustTintColor(

Sources/Experiences/Experiences/UI/UIKitExtensions.swift

@@ -83,26 +83,42 @@ extension UINavigationBar {
 
 
 extension UINavigationItem {
-    func configure(navBar: NavBar, stringTable: StringTable, data: Any?, urlParameters: [String: String], userInfo: [String: Any], traits: UITraitCollection, buttonHandler: @escaping (NavBarButton) -> Void) {
-
-        title = stringTable.resolve(key: navBar.title).evaluatingExpressions(data: data, urlParameters: urlParameters, userInfo: userInfo)
+    func configure(
+        navBar: NavBar,
+        experience: ExperienceModel,
+        data: Any?,
+        urlParameters: [String: String],
+        userInfo: [String: Any],
+        traits: UITraitCollection,
+        buttonHandler: @escaping (NavBarButton) -> Void
+    ) {
+        title = experience.localization.resolve(key: navBar.title)
+            .evaluatingExpressions(
+                data: data, urlParameters:
+                    urlParameters,
+                userInfo: userInfo
+            )
 
         hidesBackButton = navBar.hidesBackButton
 
         switch navBar.titleDisplayMode {
         case .large:
             largeTitleDisplayMode = .always
-            configureLargeAppearance(navBar: navBar, traits: traits)
+            configureLargeAppearance(navBar: navBar, traits: traits, experience: experience)
         case .inline:
             largeTitleDisplayMode = .never
-            configureInlineAppearance(navBar: navBar, traits: traits)
+            configureInlineAppearance(
+                navBar: navBar,
+                traits: traits,
+                experience: experience
+            )
         }
 
         leftBarButtonItems = navBar.children
             .compactMap { $0 as? NavBarButton }
             .filter { $0.placement == .leading }
             .map { navBarButton in
-                UIBarButtonItem(navBarButton: navBarButton, stringTable: stringTable, data: data, urlParameters: urlParameters, userInfo: userInfo) {
+                UIBarButtonItem(navBarButton: navBarButton, stringTable: experience.localization, data: data, urlParameters: urlParameters, userInfo: userInfo) {
                     buttonHandler(navBarButton)
                 }
             }
@@ -111,14 +127,19 @@ extension UINavigationItem {
             .compactMap { $0 as? NavBarButton }
             .filter { $0.placement == .trailing }
             .map { navBarButton in
-                UIBarButtonItem(navBarButton: navBarButton, stringTable: stringTable, data: data, urlParameters: urlParameters, userInfo: userInfo) {
+                UIBarButtonItem(navBarButton: navBarButton, stringTable: experience.localization, data: data, urlParameters: urlParameters, userInfo: userInfo) {
                     buttonHandler(navBarButton)
                 }
             }
             .reversed()
     }
 
-    func configureInlineAppearance(navBar: NavBar, traits: UITraitCollection, isScrolling: Bool = false) {
+    func configureInlineAppearance(
+        navBar: NavBar,
+        traits: UITraitCollection,
+        isScrolling: Bool = false,
+        experience: ExperienceModel
+    ) {
         guard navBar.titleDisplayMode == .inline else {
             return
         }
@@ -131,7 +152,7 @@ extension UINavigationItem {
         }
 
         let appearance = UINavigationBarAppearance()
-        appearance.configureFonts(navBar: navBar)
+        appearance.configureFonts(navBar: navBar, experience: experience)
         appearance.configureBackground(background: navBarAppearance.background, traits: traits)
         appearance.configureButtonColor(appearance: navBarAppearance, traits: traits)
         appearance.configureTitleColor(appearance: navBarAppearance, traits: traits)
@@ -144,13 +165,17 @@ extension UINavigationItem {
         }
     }
 
-    func configureLargeAppearance(navBar: NavBar, traits: UITraitCollection) {
+    func configureLargeAppearance(
+        navBar: NavBar,
+        traits: UITraitCollection,
+        experience: ExperienceModel
+    ) {
         guard navBar.titleDisplayMode == .large else {
             return
         }
 
         let largeAppearance = UINavigationBarAppearance()
-        largeAppearance.configureFonts(navBar: navBar)
+        largeAppearance.configureFonts(navBar: navBar, experience: experience)
 
         let navBarAppearance = navBar.appearance
         let navBarAlternateAppearance = navBar.alternateAppearance
@@ -163,7 +188,7 @@ extension UINavigationItem {
 
         if let alternateAppearance = navBarAlternateAppearance {
             let inlineAppearance = UINavigationBarAppearance()
-            inlineAppearance.configureFonts(navBar: navBar)
+            inlineAppearance.configureFonts(navBar: navBar, experience: experience)
             inlineAppearance.configureBackground(background: alternateAppearance.background, traits: traits)
             inlineAppearance.configureButtonColor(appearance: alternateAppearance, traits: traits)
             inlineAppearance.configureTitleColor(appearance: alternateAppearance, traits: traits)
@@ -180,10 +205,13 @@ extension UINavigationItem {
 
 
 private extension UINavigationBarAppearance {
-    func configureFonts(navBar: NavBar) {
-        titleTextAttributes[.font] = navBar.titleFont.uikitFont
-        largeTitleTextAttributes[.font] = navBar.largeTitleFont.uikitFont
-        buttonAppearance.normal.titleTextAttributes[.font] = navBar.buttonFont.uikitFont
+    func configureFonts(
+        navBar: NavBar,
+        experience: ExperienceModel
+    ) {
+        titleTextAttributes[.font] = navBar.titleFont.uikitFont(with: experience)
+        largeTitleTextAttributes[.font] = navBar.largeTitleFont.uikitFont(with: experience)
+        buttonAppearance.normal.titleTextAttributes[.font] = navBar.buttonFont.uikitFont(with: experience)
     }
 
     func configureBackground(background: NavBar.Background, traits: UITraitCollection) {

Sources/Experiences/Experiences/UI/Views/TextView.swift

@@ -22,6 +22,7 @@ struct TextView: View {
     @Environment(\.stringTable) private var stringTable
     @Environment(\.urlParameters) private var urlParameters
     @Environment(\.userInfo) private var userInfo
+    @Environment(\.experience) private var experience
 
     var text: RoverExperiences.Text
 
@@ -32,7 +33,8 @@ struct TextView: View {
             RealizeColor(self.text.textColor) { textColor in
                 SwiftUI.Text(transformed(textValue))
                     .modifier(
-                        FontModifier(font: self.text.font)
+                        FontModifier(font: self.text.font,
+                                     experience: experience)
                     )
                     .foregroundColor(textColor)
             }