Mid commit for AppTheme changes

Author: nikunj-MindInventory

Sources/PassioNutritionUIModule/NutritionUIModule/Nutrition.xcassets/Images/Tabs/plus.imageset/Contents.json

@@ -5,18 +5,21 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Shape=Circle, Color=primary, Size=Large@2x.png",
+      "filename" : "plus@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Shape=Circle, Color=primary, Size=Large@3x.png",
+      "filename" : "plus@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }

Sources/PassioNutritionUIModule/NutritionUIModule/Nutrition.xcassets/Images/Tabs/plus.imageset/Shape=Circle, Color=primary, [email protected]

@@ -17,11 +17,14 @@ extension UINavigationController: UIGestureRecognizerDelegate {
         interactivePopGestureRecognizer?.delegate = self
     }
 
-    func updateStatusBarColor(color: UIColor) {
+    func updateStatusBarColor(color: UIColor = .white) {
         if let statusBar = self.view.viewWithTag(-1) {
             statusBar.backgroundColor = color
         } else {
-            let statusBar = UIView(frame: (UIApplication.shared.windows.filter {$0.isKeyWindow}.first?.windowScene?.statusBarManager?.statusBarFrame)!)
+            let frame = (UIApplication.shared.windows.filter {
+                $0.isKeyWindow
+            }.first?.windowScene?.statusBarManager?.statusBarFrame)!
+            let statusBar = UIView(frame: frame)
             statusBar.tag = -1
             statusBar.backgroundColor = color
             view.addSubview(statusBar)

Sources/PassioNutritionUIModule/NutritionUIModule/Nutrition.xcassets/Images/Tabs/plus.imageset/Shape=Circle, Color=primary, [email protected]

@@ -164,74 +164,28 @@ public extension UIView {
     }
 
     func applyBorder(width: CGFloat, color: UIColor) {
-
         layer.borderColor = color.cgColor
         layer.borderWidth = width
     }
 
-    func dropShadow() {
-
-        layer.shadowRadius = 2
-        layer.shadowOpacity = 0.125
-        layer.shadowColor = UIColor.black.cgColor
-        layer.shadowOffset = .init(width: 1, height: 1)
-        layer.shouldRasterize = true
-        layer.rasterizationScale = UIScreen.main.scale
-        layer.masksToBounds = false
-    }
-
-    func dropShadow(radius: CGFloat) {
-
-        layer.cornerRadius = radius
-        layer.shadowRadius = 2
-        layer.shadowOpacity = 0.125
-        layer.shadowColor = UIColor.black.cgColor
-        layer.shadowOffset = .init(width: 1, height: 1)
-        layer.shouldRasterize = true
-        layer.rasterizationScale = UIScreen.main.scale
-    }
-
-    /// Use this function to draw shadow. Using this function you can avoid shadow performance issue and related warnings in view debugger.
+    /// Use this function to draw shadow
     /// - Parameters:
     ///   - radius: View's cornerRadius
     ///   - offset: Shadow's offset
     ///   - color: Shadow's color
     ///   - shadowRadius: Shadow's radius (blur)
     ///   - shadowOpacity: Shadow's opacity
-    ///   - useShadowPath: Set to true to avoid performance issue
-    ///   - shadowPath: Shadow's path
     func dropShadow(radius: CGFloat,
                     offset: CGSize,
                     color: UIColor,
                     shadowRadius: CGFloat,
-                    shadowOpacity: Float,
-                    useShadowPath: Bool = false,
-                    shadowPath: CGPath? = nil) {
+                    shadowOpacity: Float) {
 
         layer.cornerRadius = radius
         layer.shadowRadius = shadowRadius
         layer.shadowOpacity = shadowOpacity
         layer.shadowColor = color.cgColor
         layer.shadowOffset = offset
-        if useShadowPath {
-            layer.shadowPath = shadowPath ?? UIBezierPath(roundedRect: bounds,
-                                                          cornerRadius: layer.cornerRadius).cgPath
-        }
-        layer.masksToBounds = false
-        layer.shouldRasterize = true
-        layer.rasterizationScale = UIScreen.main.scale
-    }
-
-    func addShadowAndCornerRadius(shadowColor: UIColor = .black,
-                                  shadowOffset: CGSize = CGSize(width: 1, height: 1),
-                                  shadowOpacity: Float = 0.125,
-                                  shadowRadius: CGFloat = 2,
-                                  cornerRadius: CGFloat = 8) {
-        layer.shadowColor = shadowColor.cgColor
-        layer.shadowOffset = shadowOffset
-        layer.shadowOpacity = shadowOpacity
-        layer.shadowRadius = shadowRadius
-        layer.cornerRadius = cornerRadius
         layer.masksToBounds = false
         layer.shouldRasterize = true
         layer.rasterizationScale = UIScreen.main.scale

Sources/PassioNutritionUIModule/NutritionUIModule/Nutrition.xcassets/Images/Tabs/plus.imageset/[email protected]

@@ -34,34 +34,6 @@ public extension UIViewController {
         self.navigationController?.popViewController(animated: true)
     }
 
-//    open override func awakeAfter(using coder: NSCoder) -> Any? {
-//        navigationItem.backButtonDisplayMode = .minimal // This will help us to remove text from back button
-//        return super.awakeAfter(using: coder)
-//    }
-
-    /// Customize Navigation bar
-//    func customizeNavigationBar(tintColor: UIColor = .gray400,
-//                                titleColor: UIColor = .gray900,
-//                                withBackButton: Bool = true) {
-//
-//        guard let navBar = self.navigationController?.navigationBar else { return }
-//        navBar.setBackgroundImage(nil, for: .default)
-//        navBar.shadowImage = UIImage()
-//        navBar.tintColor = tintColor
-//
-//        let appearance = UINavigationBarAppearance()
-//        appearance.configureWithTransparentBackground()
-//        appearance.titleTextAttributes = [.font: UIFont.inter(type: .bold, size: 23),
-//                                          .foregroundColor: titleColor]
-//        navBar.standardAppearance = appearance
-//        navBar.scrollEdgeAppearance = appearance
-//        navBar.tintColor = tintColor
-//        addEmptyleftButon()
-//        if !withBackButton {
-//            navigationItem.hidesBackButton = true
-//        }
-//    }
-
     var topBarHeight: CGFloat {
         return (view.window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0.0) +
         (self.navigationController?.navigationBar.frame.height ?? 0.0)
@@ -309,20 +281,3 @@ public extension UIViewController {
         ]
     }
 }
-
-//public protocol InteractivePopGestureRecognizerDelegate: UIGestureRecognizerDelegate {
-//    func setupInteractivePopGestureRecognizer()
-//}
-//
-//extension InteractivePopGestureRecognizerDelegate where Self: UIViewController {
-//    public func setupInteractivePopGestureRecognizer() {
-//        navigationController?.interactivePopGestureRecognizer?.delegate = self
-//    }
-//}
-//
-//extension UIViewController: InteractivePopGestureRecognizerDelegate {
-//    // Ensure the gesture recognizer works alongside the custom back button
-//    public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-//        return navigationController?.viewControllers.count ?? 0 > 1
-//    }
-//}

Sources/PassioNutritionUIModule/NutritionUIModule/Nutrition.xcassets/Images/Tabs/plus.imageset/[email protected]

@@ -0,0 +1,60 @@
+//
+//  PassioThemeManager.swift
+//
+//
+//  Created by Nikunj Prajapati on 02/07/24.
+//
+
+import UIKit
+
+/// PassioTheme struct to modify PassioNutrition UI's theme
+/// - Parameters:
+///   - primaryColor: Main tint color
+///   - secondaryTabColor: secondary tab color for unselected Tab
+///   - navigationColor: Navigation bar color
+public struct PassioTheme {
+
+    public var primaryColor: String
+    public var secondaryTabColor: String
+    public var navigationColor: String
+    public var statusBarColor: String
+
+    public init(primaryColor: String, 
+                secondaryTabColor: String,
+                navigationColor: String,
+                statusBarColor: String) {
+        self.primaryColor = primaryColor
+        self.secondaryTabColor = secondaryTabColor
+        self.navigationColor = navigationColor
+        self.statusBarColor = statusBarColor
+    }
+}
+
+public protocol PassioThemeable: AnyObject {
+     func setAppTheme(theme: PassioTheme)
+}
+
+public class PassioThemeManager: PassioThemeable {
+
+    private struct Static {
+        fileprivate static var instance: PassioThemeManager?
+    }
+
+    // MARK: Shared Object
+    public class var shared: PassioThemeManager {
+        if Static.instance == nil {
+            Static.instance = PassioThemeManager()
+        }
+        return Static.instance!
+    }
+    private init() {}
+
+    public var passioAppTheme: PassioTheme = PassioTheme(primaryColor: "#4F46E5",
+                                                         secondaryTabColor: "#D1D5DB",
+                                                         navigationColor: "#FFFFFF",
+                                                         statusBarColor: "#FFFFFF")
+
+    public func setAppTheme(theme: PassioTheme) {
+        passioAppTheme = theme
+    }
+}

Sources/PassioNutritionUIModule/NutritionUIModule/NutritionUI/Extensions/UINavigationController+Extension.swift

@@ -11,16 +11,30 @@ import UIKit
 public struct Custom {
     public static let insetBackgroundRadius: CGFloat = 16.0
     public static let buttonCornerRadius: CGFloat = 8.0
-    public static let engineeringViews = false
-    public static let useFirebase = false
-    public static let useNutritionBrowser = false
-    public static let oneLineAlternative = false
-    public static let oneSizeAlternative = true
+//    public static let useFirebase = false
 }
 
 // MARK: - UIColor
 public extension UIColor { // customized colors
 
+    static let passioAppTheme = PassioThemeManager.shared.passioAppTheme
+
+    static var primaryColor: UIColor {
+        UIColor(hex: passioAppTheme.primaryColor) ?? .indigo600
+    }
+
+    static var secondaryTabColor: UIColor {
+        UIColor(hex: passioAppTheme.secondaryTabColor) ?? .gray300
+    }
+
+    static var navigationColor: UIColor {
+        UIColor(hex: passioAppTheme.navigationColor) ?? .white
+    }
+
+    static var statusBarColor: UIColor {
+        UIColor(hex: passioAppTheme.statusBarColor) ?? .white
+    }
+
     static var gray50: UIColor {
         colorFromBundle(named: "gray-50") ?? .blue
     }