marinofaggiana 3 years ago
parent
commit
38c8c5b94f

+ 7 - 7
iOSClient/BackgroundImageColor/NCBackgroundImageColor.swift

@@ -133,10 +133,10 @@ class NCBackgroundImageColor: UIViewController {
         // Color for all folders
         if let activeAccount = NCManageDatabase.shared.getActiveAccount() {
             if darkColor == "" {
-                darkColor = activeAccount.darkColorFiles
+                darkColor = activeAccount.darkColorBackground
             }
             if lightColor == "" {
-                lightColor = activeAccount.lightColorFiles
+                lightColor = activeAccount.lightColorBackground
             }
         }
        
@@ -211,8 +211,8 @@ class NCBackgroundImageColor: UIViewController {
                     darkColor = ""
                     changeColor(.black)
                 } else {
-                    if let color = UIColor.init(hex: activeAccount.darkColorFiles) {
-                        darkColor = activeAccount.darkColorFiles
+                    if let color = UIColor.init(hex: activeAccount.darkColorBackground) {
+                        darkColor = activeAccount.darkColorBackground
                         changeColor(color)
                     } else {
                         darkColor = ""
@@ -224,8 +224,8 @@ class NCBackgroundImageColor: UIViewController {
                     lightColor = "#FFFFFF"
                     changeColor(.white)
                 } else {
-                    if let color = UIColor.init(hex:  activeAccount.lightColorFiles) {
-                        lightColor = activeAccount.lightColorFiles
+                    if let color = UIColor.init(hex:  activeAccount.lightColorBackground) {
+                        lightColor = activeAccount.lightColorBackground
                         changeColor(color)
                     } else {
                         lightColor = "#FFFFFF"
@@ -251,7 +251,7 @@ class NCBackgroundImageColor: UIViewController {
 
         if let collectionViewCommon = collectionViewCommon {
             if useForAllSwitch.isOn {
-                NCManageDatabase.shared.setAccountColorFiles(lightColorFiles: lightColor, darkColorFiles: darkColor)
+                NCManageDatabase.shared.setAccountColorFiles(lightColorBackground: lightColor, darkColorBackground: darkColor)
                 NCUtility.shared.setBackgroundColorForView(key: collectionViewCommon.layoutKey, serverUrl: collectionViewCommon.serverUrl, lightColorBackground: "", darkColorBackground: "")
             } else {
                 NCUtility.shared.setBackgroundColorForView(key: collectionViewCommon.layoutKey, serverUrl: collectionViewCommon.serverUrl, lightColorBackground: lightColor, darkColorBackground: darkColor)

+ 2 - 2
iOSClient/Data/NCDatabase.swift

@@ -81,8 +81,8 @@ class tableAccount: Object {
     @objc dynamic var zip = ""
     
     // COLOR Files
-    @objc dynamic var darkColorFiles = ""
-    @objc dynamic var lightColorFiles = ""
+    @objc dynamic var darkColorBackground = ""
+    @objc dynamic var lightColorBackground = ""
 
     // HC
     @objc dynamic var hcIsTrial: Bool = false

+ 3 - 3
iOSClient/Data/NCManageDatabase.swift

@@ -723,15 +723,15 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func setAccountColorFiles(lightColorFiles: String, darkColorFiles: String) {
+    @objc func setAccountColorFiles(lightColorBackground: String, darkColorBackground: String) {
         
         let realm = try! Realm()
 
         do {
             try realm.safeWrite {
                 if let result = realm.objects(tableAccount.self).filter("active == true").first {
-                    result.lightColorFiles = lightColorFiles
-                    result.darkColorFiles = darkColorFiles
+                    result.lightColorBackground = lightColorBackground
+                    result.darkColorBackground = darkColorBackground
                 }
             }
         } catch let error {

+ 4 - 4
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -630,16 +630,16 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         if traitCollection.userInterfaceStyle == .dark {
             if layoutForView?.darkColorBackground != "" {
                 collectionView.backgroundColor = UIColor.init(hex: layoutForView?.darkColorBackground ?? "")
-            } else if activeAccount?.darkColorFiles != "" {
-                collectionView.backgroundColor = UIColor.init(hex: activeAccount?.darkColorFiles ?? "")
+            } else if activeAccount?.darkColorBackground != "" {
+                collectionView.backgroundColor = UIColor.init(hex: activeAccount?.darkColorBackground ?? "")
             } else {
                 collectionView.backgroundColor = defaultBackgroundColor
             }
         } else {
             if layoutForView?.lightColorBackground != "" {
                 collectionView.backgroundColor = UIColor.init(hex: layoutForView?.lightColorBackground ?? "")
-            } else if activeAccount?.lightColorFiles != "" {
-                collectionView.backgroundColor = UIColor.init(hex: activeAccount?.lightColorFiles ?? "")
+            } else if activeAccount?.lightColorBackground != "" {
+                collectionView.backgroundColor = UIColor.init(hex: activeAccount?.lightColorBackground ?? "")
             } else {
                 collectionView.backgroundColor = defaultBackgroundColor
             }

+ 1 - 1
iOSClient/NCGlobal.swift

@@ -81,7 +81,7 @@ class NCGlobal: NSObject {
     // Database Realm
     //
     let databaseDefault                             = "nextcloud.realm"
-    let databaseSchemaVersion: UInt64               = 176
+    let databaseSchemaVersion: UInt64               = 177
     
     // Intro selector
     //