App Themes

Packages/DomainModels/Sources/DomainModels/AppTheme.swift

@@ -0,0 +1,13 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 09/03/23.
+//
+
+import Foundation
+
+public enum AppTheme: Equatable {
+    case free
+    case pro
+}

Packages/Feature/Sources/Feature/CountryDetails/Components/CountryDetailsContent.swift

@@ -9,6 +9,7 @@ import Foundation
 import SwiftUI
 import DomainModels
 import Utils
+import UIComponents
 
 /// Content is a component of a page. Content accepts bindings or simple primitive types.
 public struct CountryDetailsContent: View {
@@ -34,5 +35,6 @@ public struct CountryDetailsContent: View {
 struct CountryDetailsContent_Previews: PreviewProvider {
     static var previews: some View {
         CountryDetailsContent(countryName: "United States", detailsText: "Now is the time for all good men to come to the aid of their country.")
+            .theme(ProTheme())
     }
 }

Packages/Feature/Sources/Feature/CountryDetails/Components/CountryNotFoundErrorView.swift

@@ -48,5 +48,6 @@ public struct CountryNotFoundErrorView: View {
 struct CountryNotFoundErrorView_Previews: PreviewProvider {
     static var previews: some View {
         CountryNotFoundErrorView(viewModelState: .error(error: .countryNotFound))
+            .theme(ProTheme())
     }
 }

Packages/Feature/Sources/Feature/DI/Container+Features.swift

@@ -10,10 +10,13 @@ import Swinject
 import Interfaces
 import SwinjectAutoregistration
 import Repositories
+import UIComponents
 
 public extension Container {
     func injectBusinessLogicLocalApis() -> Container {
         self.autoregister(AppSchedulerProviding.self, initializer: AppSchedulerProvider.init).inObjectScope(.container)
+        self.autoregister(Stylesheet.self, initializer: Stylesheet.init).inObjectScope(.container)
+        self.autoregister(ThemeMediator.self, initializer: ThemeMediator.init).inObjectScope(.container)
 
         return self
     }

Packages/Feature/Sources/Feature/Theme modifier/InjectThemeModifier.swift

@@ -0,0 +1,33 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 13/04/23.
+//
+
+import Foundation
+import SwiftUI
+import Utils
+import UIComponents
+
+/// Injects the theme into the view environment
+///
+/// The use of this modifier is intended for view adapters to avoid
+///  using DI on previews
+public struct InjectThemeModifier: ViewModifier {
+    @InjectStateObject var styleSheet: Stylesheet
+
+    var theme: ThemeImplementing {
+        styleSheet.currentTheme
+    }
+
+    public func body(content: Content) -> some View {
+        content.theme(theme)
+    }
+}
+
+public extension View {
+    func themeInjected() -> some View {
+        self.modifier(InjectThemeModifier())
+    }
+}

Packages/Feature/Sources/Feature/Theme modifier/ThemeMediator.swift

@@ -0,0 +1,42 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 10/03/23.
+//
+
+import Foundation
+import Logic
+import UIComponents
+import DomainModels
+import Utils
+import Combine
+
+public class ThemeMediator {
+
+    @Inject private var stylesheet: Stylesheet
+    @Inject private var themeLogic: AppThemeLogic
+
+    var cancellables = Set<AnyCancellable>()
+
+    public init() {
+        stylesheet.currentTheme = ThemeFactory.build(theme: themeLogic.currentTheme)
+
+        themeLogic
+            .$currentTheme
+            .dropFirst()
+            .map { ThemeFactory.build(theme: $0) }
+            .assign(to: &stylesheet.$currentTheme)
+    }
+}
+
+public struct ThemeFactory {
+    public static func build(theme: AppTheme) -> ThemeImplementing {
+        switch theme {
+        case .free:
+            return FreeTheme()
+        case .pro:
+            return ProTheme()
+        }
+    }
+}

Packages/Logic/Sources/Logic/AppThemeLogic.swift

@@ -0,0 +1,29 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 09/03/23.
+//
+
+import Foundation
+import DomainModels
+import Combine
+import Repositories
+
+public class AppThemeLogic {
+
+    @Published public private(set) var currentTheme: AppTheme
+
+    private let appThemeRepository: AppThemeRepository
+
+    public init(appThemeRepository: AppThemeRepository) {
+        self.appThemeRepository = appThemeRepository
+
+        currentTheme = appThemeRepository.currentTheme
+        appThemeRepository.$currentTheme.dropFirst().assign(to: &$currentTheme)
+    }
+
+    public func changeAppTheme(to theme: AppTheme) {
+        return appThemeRepository.setTheme(theme)
+    }
+}

Packages/Logic/Sources/Logic/DI/Container+BusinessLogic.swift

@@ -13,6 +13,7 @@ import Repositories
 
 public extension Container {
     func injectBusinessLogicLogic() -> Container {
+        self.autoregister(AppThemeLogic.self, initializer: AppThemeLogic.init).inObjectScope(.transient)
         self.autoregister(CountryListLogic.self, initializer: CountryListLogic.init).inObjectScope(.transient)
         self.autoregister(CountryDetailsLogic.self, initializer: CountryDetailsLogic.init).inObjectScope(.transient)
         self.autoregister(ServerStatusLogic.self, initializer: ServerStatusLogic.init).inObjectScope(.transient)
@@ -21,6 +22,7 @@ public extension Container {
     }
 
     func injectBusinessLogicRepositories() -> Container {
+        self.autoregister(AppThemeRepository.self, initializer: AppThemeRepository.init).inObjectScope(.container)
         self.autoregister(CountryListRepository.self, initializer: CountryListRepository.init).inObjectScope(.container)
         self.autoregister(CountryDetailsRepository.self, initializer: CountryDetailsRepository.init).inObjectScope(.container)
         self.autoregister(ServerStatusPushBasedRepository.self, initializer: ServerStatusPushBasedRepository.init).inObjectScope(.container)

Packages/Repositories/Sources/Repositories/AppThemeRepository.swift

@@ -0,0 +1,19 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 09/03/23.
+//
+
+import Foundation
+import DomainModels
+
+public class AppThemeRepository {
+    @Published public private(set) var currentTheme = AppTheme.free
+
+    public init() {}
+
+    public func setTheme(_ appTheme: AppTheme) {
+        currentTheme = appTheme
+    }
+}

Packages/Repositories/Sources/Repositories/DI/Container+Repositories.swift

@@ -12,6 +12,7 @@ import SwinjectAutoregistration
 
 public extension Container {
     func injectBusinessLogicRepositories() -> Container {
+        self.autoregister(AppThemeRepository.self, initializer: AppThemeRepository.init).inObjectScope(.container)
         self.autoregister(CountryListRepository.self, initializer: CountryListRepository.init).inObjectScope(.container)
         self.autoregister(CountryDetailsRepository.self, initializer: CountryDetailsRepository.init).inObjectScope(.container)
         self.autoregister(ServerStatusPushBasedRepository.self, initializer: ServerStatusPushBasedRepository.init).inObjectScope(.container)

Packages/UIComponents/Sources/UIComponents/Stylesheet/ColorPalette.swift

@@ -0,0 +1,36 @@
+//
+//  SwiftUIView.swift
+//  
+//
+//  Created by Oscar Gonzalez on 08/03/23.
+//
+
+import SwiftUI
+
+struct ColorPalette {
+
+    struct malachite {
+        static let brightness500 = Color(hex: 0x06D16F)
+        static let brightness700 = Color(hex: 0x00A756)
+    }
+
+    struct bearHoney {
+        static let brightness500 = Color(hex: 0xE9A142)
+        static let brightness700 = Color(hex: 0xDA7C00)
+    }
+
+    struct orange {
+        static let brightness500 = Color(hex: 0xEC7C3C)
+        static let brightness700 = Color(hex: 0xBB4C0C)
+    }
+
+    static let blastoise = Color(hex: 0x007AFF)
+    static let charizard = Color(hex: 0xFA0002)
+    static let latexPurple = Color(hex: 0x7708E7)
+    static let darkGray = Color(hex: 0x1E1E1E)
+    static let lightGray = Color(hex: 0xD2D2D2)
+    static let midgray = Color(hex: 0x4D4D4D)
+    static let white = Color.white
+    static let black = Color.black
+    static let green = Color(hex: 0x00FF00)
+}

Packages/UIComponents/Sources/UIComponents/Stylesheet/EnvironmentValues+Theme.swift

@@ -0,0 +1,21 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 09/03/23.
+//
+
+import Foundation
+import SwiftUI
+import Utils
+
+public struct ThemeKey: EnvironmentKey {
+    public static var defaultValue: ThemeImplementing = FreeTheme()
+}
+
+public extension EnvironmentValues {
+    var theme: ThemeImplementing {
+        get { self[ThemeKey.self] }
+        set { self[ThemeKey.self] = newValue }
+    }
+}

Packages/UIComponents/Sources/UIComponents/Stylesheet/ThemeModifier.swift

@@ -0,0 +1,28 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 24/03/23.
+//
+
+import Foundation
+import SwiftUI
+import Utils
+
+public struct ThemeModifier: ViewModifier {
+    var theme: ThemeImplementing
+
+    public func body(content: Content) -> some View {
+        content
+            .accentColor(theme.color.accent)
+            .foregroundColor(theme.color.content)
+            .preferredColorScheme(theme.color.scheme)
+            .environment(\.theme, theme)
+    }
+}
+
+public extension View {
+    func theme(_ theme: ThemeImplementing) -> some View {
+        self.modifier(ThemeModifier(theme: theme))
+    }
+}

Packages/UIComponents/Sources/UIComponents/Stylesheet/Themes/FreeTheme.swift

@@ -0,0 +1,21 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 08/03/23.
+//
+
+import Foundation
+import SwiftUI
+
+public struct FreeTheme: ThemeImplementing {
+    public struct Color: ThemeColor {
+        public let accent = ColorPalette.blastoise
+        public let content = ColorPalette.black
+        public let scheme: ColorScheme = .light
+    }
+
+    public let color: ThemeColor = FreeTheme.Color()
+
+    public init() {}
+}

Packages/UIComponents/Sources/UIComponents/Stylesheet/Themes/ProTheme.swift

@@ -0,0 +1,21 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 08/03/23.
+//
+
+import Foundation
+import SwiftUI
+
+public struct ProTheme: ThemeImplementing {
+    public struct Color: ThemeColor {
+        public let accent = ColorPalette.charizard
+        public let content = ColorPalette.white
+        public let scheme: ColorScheme = .dark
+    }
+
+    public let color: ThemeColor = ProTheme.Color()
+
+    public init() {}
+}

Packages/UIComponents/Sources/UIComponents/Stylesheet/Themes/Stylesheet.swift

@@ -0,0 +1,14 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 10/03/23.
+//
+
+import Foundation
+
+public class Stylesheet: ObservableObject {
+    @Published public var currentTheme: ThemeImplementing = FreeTheme()
+
+    public init() {}
+}

Packages/UIComponents/Sources/UIComponents/Stylesheet/Themes/ThemeImplementing.swift

@@ -0,0 +1,19 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 08/03/23.
+//
+
+import Foundation
+import SwiftUI
+
+public protocol ThemeImplementing {
+    var color: ThemeColor { get }
+}
+
+public protocol ThemeColor {
+    var accent: Color { get }
+    var content: Color { get }
+    var scheme: ColorScheme { get }
+}

Packages/UIComponents/Sources/UIComponents/Utils/Color+Hex.swift

@@ -0,0 +1,21 @@
+//
+//  File.swift
+//  
+//
+//  Created by Oscar Gonzalez on 08/03/23.
+//
+
+import Foundation
+import SwiftUI
+
+extension Color {
+    init(hex: UInt, alpha: Double = 1) {
+        self.init(
+            .sRGB,
+            red: Double((hex >> 16) & 0xff) / 255,
+            green: Double((hex >> 08) & 0xff) / 255,
+            blue: Double((hex >> 00) & 0xff) / 255,
+            opacity: alpha
+        )
+    }
+}