From 3d142f3ca5e64b5b89b3a5f53792ee4c8a4dabf7 Mon Sep 17 00:00:00 2001
From: SBiOSoftWhare <steveb@matrix.org>
Date: Thu, 24 Jun 2021 15:49:38 +0200
Subject: [PATCH] DesignKit: Update ElementFonts with new Fonts protocol.

---
 .../Extensions}/UIFont.swift                  |  2 +-
 DesignKit/Variants/Fonts/ElementFonts.swift   | 53 +++++++++++++++++--
 2 files changed, 49 insertions(+), 6 deletions(-)
 rename {Riot/Categories => DesignKit/Extensions}/UIFont.swift (98%)

diff --git a/Riot/Categories/UIFont.swift b/DesignKit/Extensions/UIFont.swift
similarity index 98%
rename from Riot/Categories/UIFont.swift
rename to DesignKit/Extensions/UIFont.swift
index c7a10ad49..7804c8066 100644
--- a/Riot/Categories/UIFont.swift
+++ b/DesignKit/Extensions/UIFont.swift
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-import Foundation
+import UIKit
 
 public extension UIFont {
     
diff --git a/DesignKit/Variants/Fonts/ElementFonts.swift b/DesignKit/Variants/Fonts/ElementFonts.swift
index 5465df819..6612d3dc1 100644
--- a/DesignKit/Variants/Fonts/ElementFonts.swift
+++ b/DesignKit/Variants/Fonts/ElementFonts.swift
@@ -18,38 +18,57 @@ import UIKit
 
 /// Fonts at  https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1362%3A0
 @objcMembers
-public class ElementFonts: Fonts {
+public class ElementFonts {
     
     // MARK: - Setup
     
     public init() {
     }
     
-    // MARK: - Public
+    // MARK: - Private
     
     /// Returns an instance of the font associated with the text style and scaled appropriately for the content size category defined in the trait collection.
-    public func font(forTextStyle textStyle: UIFont.TextStyle, compatibleWith traitCollection: UITraitCollection?) -> UIFont {
+    /// Keep this method private method at the moment and create a DesignKit.Fonts.TextStyle if needed.
+    fileprivate func font(forTextStyle textStyle: UIFont.TextStyle, compatibleWith traitCollection: UITraitCollection? = nil) -> UIFont {
         return UIFont.preferredFont(forTextStyle: textStyle, compatibleWith: traitCollection)
     }
-    
-    // MARK: TextStyle shortcuts
+}
+
+// MARK: - Fonts protocol
+extension ElementFonts: Fonts {    
     
     public var largeTitle: UIFont {
         return self.font(forTextStyle: .largeTitle)
     }
+    
+    public var largeTitleB: UIFont {
+        return self.largeTitle.vc_bold
+    }
             
     public var title1: UIFont {
         return self.font(forTextStyle: .title1)
     }
     
+    public var title1B: UIFont {
+        return self.title1.vc_bold
+    }
+    
     public var title2: UIFont {
         return self.font(forTextStyle: .title2)
     }
     
+    public var title2B: UIFont {
+        return self.title2.vc_bold
+    }
+    
     public var title3: UIFont {
         return self.font(forTextStyle: .title3)
     }
     
+    public var title3SB: UIFont {
+        return self.title3.vc_semiBold
+    }
+    
     public var headline: UIFont {
         return self.font(forTextStyle: .headline)
     }
@@ -62,15 +81,39 @@ public class ElementFonts: Fonts {
         return self.font(forTextStyle: .body)
     }
     
+    public var bodySB: UIFont {
+        return self.body.vc_semiBold
+    }
+    
     public var callout: UIFont {
         return self.font(forTextStyle: .callout)
     }
     
+    public var calloutSB: UIFont {
+        return self.callout.vc_semiBold
+    }
+    
+    public var footnote: UIFont {
+        return self.font(forTextStyle: .footnote)
+    }
+    
+    public var footnoteSB: UIFont {
+        return self.footnote.vc_semiBold
+    }
+    
     public var caption1: UIFont {
         return self.font(forTextStyle: .caption1)
     }
     
+    public var caption1SB: UIFont {
+        return self.caption1.vc_semiBold
+    }
+    
     public var caption2: UIFont {
         return self.font(forTextStyle: .caption2)
     }
+    
+    public var caption2SB: UIFont {
+        return self.caption2.vc_semiBold
+    }
 }