minor fixes

SynthesOne · May 2, 2024 · 408afb6 · 408afb6
1 parent 9ae1f87
commit 408afb6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/MediaPickerExpample/MediaPickerExpample/ViewController.swift b/MediaPickerExpample/MediaPickerExpample/ViewController.swift
@@ -59,7 +59,9 @@ final class ViewController: UIViewController {
         mp?.showMediaPicker(
             configuration: { [weak self] (config) in
                 guard let strongSelf = self else { return MPConfigurationMaker.default }
-                return MPConfigurationMaker(uiConfig: strongSelf.uiConfig, generalConfig: strongSelf.generalConfig)
+                return config
+                    .setUIConfiguration(strongSelf.uiConfig)
+                    .setGeneralConfiguration(strongSelf.generalConfig)
                 //---- or ----
                 //return config
                 //    .setShowCameraCell(false)

diff --git a/Sources/Extensions/MPConfigurationMaker+MPGeneralConfiguration.swift b/Sources/Extensions/MPConfigurationMaker+MPGeneralConfiguration.swift
@@ -72,4 +72,10 @@ extension MPConfigurationMaker {
         generalConfig.stringCatalogType = value
         return self
     }
+
+    @discardableResult
+    public func setGeneralConfiguration(_ value: MPGeneralConfiguration) -> MPConfigurationMakerExtendable {
+        generalConfig = value
+        return self
+    }
 }
diff --git a/Sources/Extensions/MPConfigurationMaker+MPUIConfiguration.swift b/Sources/Extensions/MPConfigurationMaker+MPUIConfiguration.swift
@@ -60,4 +60,10 @@ extension MPConfigurationMaker {
         uiConfig.showCameraCell = value
         return self
     }
+
+    @discardableResult
+    public func setUIConfiguration(_ value: MPUIConfiguration) -> MPConfigurationMakerExtendable {
+        uiConfig = value
+        return self
+    }
 }
diff --git a/Sources/General/MPConfigurationMaker.swift b/Sources/General/MPConfigurationMaker.swift
@@ -31,6 +31,7 @@ public protocol MPUIConfigMakerExtendable: NSObjectProtocol {
     func setNavigationAppearance(_ value: MPNavigationAppearance) -> MPConfigurationMakerExtendable
     func setPrimaryBackgroundColor(_ value: UIColor) -> MPConfigurationMakerExtendable
     func setShowCameraCell(_ value: Bool) -> MPConfigurationMakerExtendable
+    func setUIConfiguration(_ value: MPUIConfiguration) -> MPConfigurationMakerExtendable
 }
 
 public protocol MPGeneralConfigMakerExtendable: NSObjectProtocol {
@@ -42,13 +43,13 @@ public protocol MPGeneralConfigMakerExtendable: NSObjectProtocol {
     func setBundleLangsDeploy(_ value: Bundle) -> MPConfigurationMakerExtendable
     func setKeysLangsDeploy(_ value: [String: String]) -> MPConfigurationMakerExtendable
     func setStringCatalogType(_ value: MPGeneralConfiguration.StringCatalogType) -> MPConfigurationMakerExtendable
+    func setGeneralConfiguration(_ value: MPGeneralConfiguration) -> MPConfigurationMakerExtendable
 }
 
 public protocol MPConfigurationMakerExtendable: MPUIConfigMakerExtendable, MPGeneralConfigMakerExtendable {
     var uiConfig: MPUIConfiguration { get }
     var generalConfig: MPGeneralConfiguration { get }
     static var `default`: MPConfigurationMakerExtendable { get }
-    init(uiConfig: MPUIConfiguration, generalConfig: MPGeneralConfiguration)
 }
 
 public final class MPConfigurationMaker: NSObject, MPConfigurationMakerExtendable {
@@ -62,10 +63,4 @@ public final class MPConfigurationMaker: NSObject, MPConfigurationMakerExtendabl
     override init() {
         super.init()
     }
-
-    public convenience init(uiConfig: MPUIConfiguration, generalConfig: MPGeneralConfiguration) {
-        self.init()
-        self.uiConfig = uiConfig
-        self.generalConfig = generalConfig
-    }
 }