Эх сурвалжийг харах

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 жил өмнө
parent
commit
3de3f5ac55

+ 1 - 1
iOSClient/Color/NCColorPicker.swift

@@ -89,6 +89,6 @@ class NCColorPicker: UIViewController, NCColorPickerDelegate {
         defaultButton.backgroundColor = NCBrandColor.shared.brandElement
         defaultButton.layer.cornerRadius = 5
         defaultButton.layer.masksToBounds = true
-        defaultLabel.text = NSLocalizedString("_gray_", comment: "")
+        defaultLabel.text = NSLocalizedString("_default_", comment: "")
     }
 }

+ 0 - 12
iOSClient/Images.xcassets/removepalette.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "removepalette.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 2
iOSClient/Images.xcassets/removepalette.imageset/removepalette.svg


+ 0 - 1
iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1920,7 +1920,6 @@ extension NCCollectionViewCommon: EasyTipViewDelegate {
     }
 }
 
-//@available(iOS 15.0, *)
 extension NCCollectionViewCommon: NCColorPickerDelegate {
 
     /*

+ 1 - 1
iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -316,7 +316,7 @@ extension NCCollectionViewCommon {
                             }
                             picker.defaultColor = NCBrandColor.shared.brandElement
 
-                            let popup = NCPopupViewController(contentController: picker, popupWidth: 300, popupHeight: 500)
+                            let popup = NCPopupViewController(contentController: picker, popupWidth: 300, popupHeight: 450)
                             popup.backgroundAlpha = 0
 
                             self.present(popup, animated: true)

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно