coding

iOSClient/BackgroundImageColor/NCBackgroundImageColor.swift

@@ -39,15 +39,16 @@ class NCBackgroundImageColor: UIViewController {
     private let colorPicker = ChromaColorPicker()
     private let brightnessSlider = ChromaBrightnessSlider()
     private var colorHandle: ChromaColorHandle?
-    private var isDarkMode: Bool = false
     
     private let defaultColorPickerSize = CGSize(width: 200, height: 200)
     private let brightnessSliderWidthHeightRatio: CGFloat = 0.1
+    
     private var darkColorHexString = ""
     private var lightColorHexString = ""
     
     public var collectionViewCommon: NCCollectionViewCommon?
-    public var defaultColor: UIColor = NCBrandColor.shared.systemBackground
+    public var defaultDarkColor: UIColor = .black
+    public var defaultLightColor: UIColor = .white
 
     let width: CGFloat = 300
     let height: CGFloat = 500
@@ -81,22 +82,29 @@ class NCBackgroundImageColor: UIViewController {
         super.viewDidAppear(animated)
     }
     
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-    }
-    
     // MARK: - Action
     
     @IBAction func darkmodeAction(_ sender: UISwitch) {
-        isDarkMode = sender.isOn
+        
+        var colorHexString = ""
+        
+        if sender.isOn {
+            colorHexString = darkColorHexString
+        } else {
+            colorHexString = lightColorHexString
+        }
+        
+        if let color = UIColor.init(hex: colorHexString) {
+            changeColor(color)
+        } else {
+        }
     }
     
     @IBAction func defaultAction(_ sender: Any) {
         
-        colorHandle?.color = defaultColor
-        colorPicker.setNeedsLayout()
-        brightnessSlider.trackColor = defaultColor
-        collectionViewCommon?.collectionView.backgroundColor = defaultColor
+        //changeColor(defaultColor)
+        darkColorHexString = ""
+        lightColorHexString = ""
     }
     
     @IBAction func cancelAction(_ sender: Any) {
@@ -107,11 +115,7 @@ class NCBackgroundImageColor: UIViewController {
     @IBAction func okAction(_ sender: Any) {
         
         if let collectionViewCommon = collectionViewCommon {
-            if colorHandle?.color == defaultColor {
-                NCUtility.shared.setBackgroundColorForView(key: collectionViewCommon.layoutKey, serverUrl: collectionViewCommon.serverUrl, colorBackground: "", colorDarkBackground: "")
-            } else {
-                //NCUtility.shared.setBackgroundColorForView(key: collectionViewCommon.layoutKey, serverUrl: collectionViewCommon.serverUrl, colorBackground: colorHexString)
-            }
+            //NCUtility.shared.setBackgroundColorForView(key: collectionViewCommon.layoutKey, serverUrl: collectionViewCommon.serverUrl, colorBackground: "", colorDarkBackground: darkColorHexString)
         }
         collectionViewCommon?.setLayout()
         dismiss(animated: true)
@@ -152,9 +156,16 @@ class NCBackgroundImageColor: UIViewController {
     }
     
     private func setupColorPickerHandles() {
-      
         colorHandle = colorPicker.addHandle(at: collectionViewCommon?.collectionView.backgroundColor)
     }
+    
+    private func changeColor(_ color: UIColor) {
+        
+        colorHandle?.color = color
+        colorPicker.setNeedsLayout()
+        brightnessSlider.trackColor = color
+        collectionViewCommon?.collectionView.backgroundColor = color
+    }
 }
 
 extension NCBackgroundImageColor: ChromaColorPickerDelegate {

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -625,14 +625,14 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         // COLOR BACKGROUND
         if traitCollection.userInterfaceStyle == .dark {
-            if layoutForView?.colorDarkBackground != "" {
-                collectionView.backgroundColor = UIColor.init(hex: layoutForView?.colorDarkBackground ?? "")
+            if layoutForView?.darkColorBackground != "" {
+                collectionView.backgroundColor = UIColor.init(hex: layoutForView?.darkColorBackground ?? "")
             } else {
                 collectionView.backgroundColor = defaultBackgroundColor
             }
         } else {
-            if layoutForView?.colorBackground != "" {
-                collectionView.backgroundColor = UIColor.init(hex: layoutForView?.colorBackground ?? "")
+            if layoutForView?.lightColorBackground != "" {
+                collectionView.backgroundColor = UIColor.init(hex: layoutForView?.lightColorBackground ?? "")
             } else {
                 collectionView.backgroundColor = defaultBackgroundColor
             }
@@ -918,7 +918,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         if let vcBackgroundImageColor = UIStoryboard(name: "NCBackgroundImageColor", bundle: nil).instantiateInitialViewController() as? NCBackgroundImageColor {
             
             vcBackgroundImageColor.collectionViewCommon = self
-            vcBackgroundImageColor.defaultColor = defaultBackgroundColor
+            //vcBackgroundImageColor.defaultColor = defaultBackgroundColor
             
             let popup = NCPopupViewController(contentController: vcBackgroundImageColor, popupWidth: vcBackgroundImageColor.width, popupHeight: vcBackgroundImageColor.height)
                                         

iOSClient/NCGlobal.swift

@@ -49,8 +49,8 @@ class NCGlobal: NSObject {
         var itemForLine: Int
         var imageBackgroud: String
         var imageBackgroudContentMode: String
-        var colorBackground: String
-        var colorDarkBackground: String
+        var lightColorBackground: String
+        var darkColorBackground: String
     }
     
     // Directory on Group

iOSClient/Utility/NCUtility.swift

@@ -40,7 +40,7 @@ class NCUtility: NSObject {
 
     func setLayoutForView(key: String, serverUrl: String, layoutForView: NCGlobal.layoutForViewType) {
         
-        let string =  layoutForView.layout + "|" + layoutForView.sort + "|" + "\(layoutForView.ascending)" + "|" + layoutForView.groupBy + "|" + "\(layoutForView.directoryOnTop)" + "|" + layoutForView.titleButtonHeader + "|" + "\(layoutForView.itemForLine)" + "|" + layoutForView.imageBackgroud + "|" + layoutForView.imageBackgroudContentMode + "|" + layoutForView.colorBackground + "|" + layoutForView.colorDarkBackground
+        let string =  layoutForView.layout + "|" + layoutForView.sort + "|" + "\(layoutForView.ascending)" + "|" + layoutForView.groupBy + "|" + "\(layoutForView.directoryOnTop)" + "|" + layoutForView.titleButtonHeader + "|" + "\(layoutForView.itemForLine)" + "|" + layoutForView.imageBackgroud + "|" + layoutForView.imageBackgroudContentMode + "|" + layoutForView.lightColorBackground + "|" + layoutForView.darkColorBackground
         var keyStore = key
         
         if serverUrl != "" {
@@ -60,12 +60,12 @@ class NCUtility: NSObject {
         }
     }
     
-    func setBackgroundColorForView(key: String, serverUrl: String, colorBackground: String, colorDarkBackground: String) {
+    func setBackgroundColorForView(key: String, serverUrl: String, lightColorBackground: String, darkColorBackground: String) {
         
         var layoutForView: NCGlobal.layoutForViewType = NCUtility.shared.getLayoutForView(key: key, serverUrl: serverUrl)
         
-        layoutForView.colorBackground = colorBackground
-        layoutForView.colorDarkBackground = colorDarkBackground
+        layoutForView.lightColorBackground = lightColorBackground
+        layoutForView.darkColorBackground = darkColorBackground
         
         setLayoutForView(key: key, serverUrl: serverUrl, layoutForView: layoutForView)
     }
@@ -83,7 +83,7 @@ class NCUtility: NSObject {
     func getLayoutForView(key: String, serverUrl: String, sort: String = "fileName", ascending: Bool = true, titleButtonHeader: String = "_sorted_by_name_a_z_") -> (NCGlobal.layoutForViewType) {
         
         var keyStore = key
-        var layoutForView: NCGlobal.layoutForViewType = NCGlobal.layoutForViewType(layout: NCGlobal.shared.layoutList, sort: sort, ascending: ascending, groupBy: "none", directoryOnTop: true, titleButtonHeader: titleButtonHeader, itemForLine: 3, imageBackgroud: "", imageBackgroudContentMode: "", colorBackground: "", colorDarkBackground: "")
+        var layoutForView: NCGlobal.layoutForViewType = NCGlobal.layoutForViewType(layout: NCGlobal.shared.layoutList, sort: sort, ascending: ascending, groupBy: "none", directoryOnTop: true, titleButtonHeader: titleButtonHeader, itemForLine: 3, imageBackgroud: "", imageBackgroudContentMode: "", lightColorBackground: "", darkColorBackground: "")
         
         if serverUrl != "" {
             keyStore = serverUrl
@@ -108,8 +108,8 @@ class NCUtility: NSObject {
             if array.count > 8 {
                 layoutForView.imageBackgroud = array[7]
                 layoutForView.imageBackgroudContentMode = array[8]
-                layoutForView.colorBackground = array[9]
-                layoutForView.colorDarkBackground = array[10]
+                layoutForView.lightColorBackground = array[9]
+                layoutForView.darkColorBackground = array[10]
             }
         }