diff options
-rw-r--r-- | iOSClient/Color/NCColorPicker.storyboard | 42 | ||||
-rw-r--r-- | iOSClient/Color/NCColorPicker.swift | 4 | ||||
-rw-r--r-- | iOSClient/Main/NCFunctionCenter.swift | 2 | ||||
-rw-r--r-- | iOSClient/Menu/NCCollectionViewCommon+Menu.swift | 2 | ||||
-rw-r--r-- | iOSClient/NCGlobal.swift | 2 | ||||
-rw-r--r-- | iOSClient/Networking/NCNetworkingE2EE.swift | 2 | ||||
-rw-r--r-- | iOSClient/Share/NCSharePaging.swift | 2 | ||||
-rw-r--r-- | iOSClient/Supporting Files/en.lproj/Localizable.strings | 1 | ||||
-rw-r--r-- | iOSClient/Utility/NCUtilityFileSystem.swift | 6 | ||||
-rw-r--r-- | iOSClient/Viewer/NCViewerMedia/NCPlayer/NCKTVHTTPCache.swift | 2 |
10 files changed, 39 insertions, 26 deletions
diff --git a/iOSClient/Color/NCColorPicker.storyboard b/iOSClient/Color/NCColorPicker.storyboard index ccf64cd0e..73148a5d1 100644 --- a/iOSClient/Color/NCColorPicker.storyboard +++ b/iOSClient/Color/NCColorPicker.storyboard @@ -28,8 +28,14 @@ <action selector="closeAction:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="nq5-sT-FEb"/> </connections> </button> + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8DH-gC-coa"> + <rect key="frame" x="22" y="8.5" width="157" height="18"/> + <fontDescription key="fontDescription" type="system" pointSize="15"/> + <nil key="textColor"/> + <nil key="highlightedColor"/> + </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JUR-Vj-yBU"> - <rect key="frame" x="15" y="40" width="40" height="40"/> + <rect key="frame" x="15" y="45" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="width" constant="40" id="LDf-aO-ruY"/> @@ -41,7 +47,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zr2-rF-YUt"> - <rect key="frame" x="15" y="95" width="40" height="40"/> + <rect key="frame" x="15" y="100" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="krX-Ql-hLX"/> @@ -53,7 +59,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dOn-SY-wnl"> - <rect key="frame" x="15" y="150" width="40" height="40"/> + <rect key="frame" x="15" y="155" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="BI1-aU-56D"/> @@ -65,7 +71,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C2a-jB-FVB"> - <rect key="frame" x="15" y="205" width="40" height="40"/> + <rect key="frame" x="15" y="210" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="Sfk-IP-7JV"/> @@ -77,7 +83,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8xv-8Y-A50"> - <rect key="frame" x="15" y="260" width="40" height="40"/> + <rect key="frame" x="15" y="265" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="Jgq-IJ-7jj"/> @@ -89,7 +95,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OlH-Ak-sRA"> - <rect key="frame" x="80" y="40" width="40" height="40"/> + <rect key="frame" x="80" y="45" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="3kj-5z-0de"/> @@ -101,7 +107,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FU6-q8-9Iw"> - <rect key="frame" x="80" y="95" width="40" height="40"/> + <rect key="frame" x="80" y="100" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="width" constant="40" id="NGk-p2-vQ4"/> @@ -113,7 +119,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LwF-26-oss"> - <rect key="frame" x="80" y="150" width="40" height="40"/> + <rect key="frame" x="80" y="155" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="Pqo-uv-KrN"/> @@ -125,7 +131,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I9w-cx-QlY"> - <rect key="frame" x="80" y="205" width="40" height="40"/> + <rect key="frame" x="80" y="210" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="Vgv-il-6Vw"/> @@ -137,7 +143,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uaq-hC-U4a"> - <rect key="frame" x="145" y="260" width="40" height="40"/> + <rect key="frame" x="145" y="265" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="DqE-d1-FMQ"/> @@ -149,7 +155,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tt7-sI-TfL"> - <rect key="frame" x="145" y="40" width="40" height="40"/> + <rect key="frame" x="145" y="45" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="width" constant="40" id="b6h-GE-ftL"/> @@ -161,7 +167,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="12u-cu-XGu"> - <rect key="frame" x="80" y="260" width="40" height="40"/> + <rect key="frame" x="80" y="265" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="width" constant="40" id="8vW-vR-kNP"/> @@ -173,7 +179,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Arw-up-GyD"> - <rect key="frame" x="145" y="95" width="40" height="40"/> + <rect key="frame" x="145" y="100" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="width" constant="40" id="A9m-mr-Ec3"/> @@ -185,7 +191,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I7I-Ed-32n"> - <rect key="frame" x="145" y="150" width="40" height="40"/> + <rect key="frame" x="145" y="155" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="height" constant="40" id="Gd6-bt-nR7"/> @@ -197,7 +203,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iB2-gu-3IO"> - <rect key="frame" x="145" y="205" width="40" height="40"/> + <rect key="frame" x="145" y="210" width="40" height="40"/> <color key="backgroundColor" systemColor="labelColor"/> <constraints> <constraint firstAttribute="width" constant="40" id="62A-PY-UZr"/> @@ -217,6 +223,7 @@ <constraint firstItem="FU6-q8-9Iw" firstAttribute="centerY" secondItem="Zr2-rF-YUt" secondAttribute="centerY" id="4Ul-fS-EGZ"/> <constraint firstItem="iB2-gu-3IO" firstAttribute="centerY" secondItem="I9w-cx-QlY" secondAttribute="centerY" id="9Pw-x0-2Oc"/> <constraint firstItem="I9w-cx-QlY" firstAttribute="centerY" secondItem="C2a-jB-FVB" secondAttribute="centerY" id="Adb-Hg-6jK"/> + <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="8DH-gC-coa" secondAttribute="trailing" constant="21" id="EXV-D4-maX"/> <constraint firstItem="I7I-Ed-32n" firstAttribute="centerY" secondItem="LwF-26-oss" secondAttribute="centerY" id="HyJ-T6-sBi"/> <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="iB2-gu-3IO" secondAttribute="trailing" constant="15" id="Ig3-DV-ieD"/> <constraint firstItem="Arw-up-GyD" firstAttribute="centerY" secondItem="FU6-q8-9Iw" secondAttribute="centerY" id="K5S-f9-g07"/> @@ -225,9 +232,11 @@ <constraint firstItem="I9w-cx-QlY" firstAttribute="centerX" secondItem="vDu-zF-Fre" secondAttribute="centerX" id="Vzf-ZI-4Y7"/> <constraint firstItem="Uaq-hC-U4a" firstAttribute="centerY" secondItem="8xv-8Y-A50" secondAttribute="centerY" id="WX1-7F-LZs"/> <constraint firstItem="JUR-Vj-yBU" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="15" id="ZH3-0g-M1x"/> + <constraint firstItem="8DH-gC-coa" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="22" id="bAT-qS-Fr3"/> <constraint firstItem="C2a-jB-FVB" firstAttribute="top" secondItem="dOn-SY-wnl" secondAttribute="bottom" constant="15" id="byc-af-adU"/> <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="Arw-up-GyD" secondAttribute="trailing" constant="15" id="cyP-IZ-1wa"/> <constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="tt7-sI-TfL" secondAttribute="trailing" constant="15" id="dOh-Zh-y8X"/> + <constraint firstItem="8DH-gC-coa" firstAttribute="centerY" secondItem="kwJ-4R-6nM" secondAttribute="centerY" id="dkq-zI-tcR"/> <constraint firstItem="LwF-26-oss" firstAttribute="centerX" secondItem="vDu-zF-Fre" secondAttribute="centerX" id="eli-R1-TLW"/> <constraint firstItem="dOn-SY-wnl" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="15" id="gfe-aq-7nk"/> <constraint firstItem="kwJ-4R-6nM" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="10" id="hAt-TC-6LC"/> @@ -243,7 +252,7 @@ <constraint firstItem="FU6-q8-9Iw" firstAttribute="centerX" secondItem="vDu-zF-Fre" secondAttribute="centerX" id="vzc-ef-AhZ"/> <constraint firstItem="Zr2-rF-YUt" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="15" id="zBA-2T-5J8"/> <constraint firstItem="8xv-8Y-A50" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="15" id="zJA-Gg-OZr"/> - <constraint firstItem="JUR-Vj-yBU" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="40" id="zbI-KC-mx0"/> + <constraint firstItem="JUR-Vj-yBU" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="45" id="zbI-KC-mx0"/> </constraints> </view> <size key="freeformSize" width="200" height="320"/> @@ -263,6 +272,7 @@ <outlet property="systemMintButton" destination="Arw-up-GyD" id="gqG-tN-WiJ"/> <outlet property="systemPinkButton" destination="I7I-Ed-32n" id="YzP-1f-nkJ"/> <outlet property="systemTealButton" destination="iB2-gu-3IO" id="S2F-rL-O44"/> + <outlet property="titleLabel" destination="8DH-gC-coa" id="k2U-jx-f6R"/> <outlet property="yellowButton" destination="FU6-q8-9Iw" id="oAa-NT-Qhd"/> </connections> </viewController> diff --git a/iOSClient/Color/NCColorPicker.swift b/iOSClient/Color/NCColorPicker.swift index e8d23972d..eba3e9ee0 100644 --- a/iOSClient/Color/NCColorPicker.swift +++ b/iOSClient/Color/NCColorPicker.swift @@ -12,6 +12,7 @@ import UIKit class NCColorPicker: UIViewController { @IBOutlet weak var closeButton: UIButton! + @IBOutlet weak var titleLabel: UILabel! @IBOutlet weak var orangeButton: UIButton! @IBOutlet weak var redButton: UIButton! @@ -42,6 +43,7 @@ class NCColorPicker: UIViewController { view.backgroundColor = NCBrandColor.shared.secondarySystemBackground closeButton.setImage(NCUtility.shared.loadImage(named: "xmark", color: NCBrandColor.shared.label), for: .normal) + titleLabel.text = NSLocalizedString("_select_color_", comment: "") orangeButton.backgroundColor = .orange orangeButton.layer.cornerRadius = 5 @@ -102,8 +104,6 @@ class NCColorPicker: UIViewController { defaultButton.backgroundColor = NCBrandColor.shared.brandElement defaultButton.layer.cornerRadius = 5 defaultButton.layer.masksToBounds = true - defaultButton.layer.borderColor = NCBrandColor.shared.label.cgColor - defaultButton.layer.borderWidth = 2 } // MARK: - Action diff --git a/iOSClient/Main/NCFunctionCenter.swift b/iOSClient/Main/NCFunctionCenter.swift index fd98eee90..bf67cdda1 100644 --- a/iOSClient/Main/NCFunctionCenter.swift +++ b/iOSClient/Main/NCFunctionCenter.swift @@ -194,7 +194,7 @@ import Photos if CCUtility.fileProviderStorageExists(metadata) { - NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDownloadedFile, userInfo: ["ocId": metadata.ocId, "selector": selector, "errorCode": 0, "errorDescription": "" ]) + NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDownloadedFile, userInfo: ["ocId": metadata.ocId, "selector": selector, "errorCode": 0, "errorDescription": "", "account": metadata.account]) } else { diff --git a/iOSClient/Menu/NCCollectionViewCommon+Menu.swift b/iOSClient/Menu/NCCollectionViewCommon+Menu.swift index 347df8cdb..6410c3888 100644 --- a/iOSClient/Menu/NCCollectionViewCommon+Menu.swift +++ b/iOSClient/Menu/NCCollectionViewCommon+Menu.swift @@ -297,7 +297,7 @@ extension NCCollectionViewCommon { // // COLOR FOLDER // - if metadata.directory { + if self is NCFiles, metadata.directory { actions.append( NCMenuAction( title: NSLocalizedString("_change_color_", comment: ""), diff --git a/iOSClient/NCGlobal.swift b/iOSClient/NCGlobal.swift index 4567b53e6..1aae7d4fb 100644 --- a/iOSClient/NCGlobal.swift +++ b/iOSClient/NCGlobal.swift @@ -329,7 +329,7 @@ class NCGlobal: NSObject { let notificationCenterUpdateBadgeNumber = "updateBadgeNumber" let notificationCenterReloadAvatar = "reloadAvatar" - @objc let notificationCenterReloadDataSource = "reloadDataSource" // userInfo: ocId?, serverUrl? + @objc let notificationCenterReloadDataSource = "reloadDataSource" // userInfo: serverUrl? let notificationCenterReloadDataSourceNetworkForced = "reloadDataSourceNetworkForced" // userInfo: serverUrl? let notificationCenterChangeStatusFolderE2EE = "changeStatusFolderE2EE" // userInfo: serverUrl diff --git a/iOSClient/Networking/NCNetworkingE2EE.swift b/iOSClient/Networking/NCNetworkingE2EE.swift index 886459433..b8e86351b 100644 --- a/iOSClient/Networking/NCNetworkingE2EE.swift +++ b/iOSClient/Networking/NCNetworkingE2EE.swift @@ -255,7 +255,7 @@ import Alamofire return completion(NCGlobal.shared.errorInternalError, "_e2e_error_create_encrypted_") } - NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl]) + NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource, userInfo: ["serverUrl": metadata.serverUrl]) NCContentPresenter.shared.noteTop(text: NSLocalizedString("_upload_e2ee_", comment: ""), image: nil, type: NCContentPresenter.messageType.info, delay: NCGlobal.shared.dismissAfterSecond, priority: .max) NCNetworkingE2EE.shared.sendE2EMetadata(account: metadata.account, serverUrl: serverUrl, fileNameRename: nil, fileNameNewRename: nil, deleteE2eEncryption: nil, urlBase: metadata.urlBase, upload: true) { e2eToken, errorCode, errorDescription in diff --git a/iOSClient/Share/NCSharePaging.swift b/iOSClient/Share/NCSharePaging.swift index 1c1eb3033..5e21aba65 100644 --- a/iOSClient/Share/NCSharePaging.swift +++ b/iOSClient/Share/NCSharePaging.swift @@ -142,7 +142,7 @@ class NCSharePaging: UIViewController { override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) - NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl]) + NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource, userInfo: ["serverUrl": metadata.serverUrl]) } deinit { diff --git a/iOSClient/Supporting Files/en.lproj/Localizable.strings b/iOSClient/Supporting Files/en.lproj/Localizable.strings index c18e29dea..96e4aea8c 100644 --- a/iOSClient/Supporting Files/en.lproj/Localizable.strings +++ b/iOSClient/Supporting Files/en.lproj/Localizable.strings @@ -876,6 +876,7 @@ "_reachable_wifi_" = "network reachable via Wi-Fi or cable"; "_ITMS-90076_" = "Due to a change in the Nextcloud application identifier, the settings and password for accessing your cloud are reset, so please re-enter your account data and check your Settings. We are sorry about that."; "_copy_passphrase_" = "Copy passphrase"; +"_select_color_" = "Select the color"; "_change_color_" = "Change color"; // Video diff --git a/iOSClient/Utility/NCUtilityFileSystem.swift b/iOSClient/Utility/NCUtilityFileSystem.swift index 955ec6f33..9dedc0951 100644 --- a/iOSClient/Utility/NCUtilityFileSystem.swift +++ b/iOSClient/Utility/NCUtilityFileSystem.swift @@ -174,8 +174,10 @@ class NCUtilityFileSystem: NSObject { @objc func deletingLastPathComponent(account: String, serverUrl: String) -> String { - guard getHomeServer(account: account) != serverUrl, let url = URL(string: serverUrl) else { return serverUrl } - return String(url.deletingLastPathComponent().absoluteString.dropLast()) + if getHomeServer(account: account) == serverUrl { return serverUrl } + let fileName = (serverUrl as NSString).lastPathComponent + let serverUrl = serverUrl.replacingOccurrences(of: "/" + fileName, with: "", options: String.CompareOptions.backwards, range: nil) + return serverUrl } @objc func createFileName(_ fileName: String, serverUrl: String, account: String) -> String { diff --git a/iOSClient/Viewer/NCViewerMedia/NCPlayer/NCKTVHTTPCache.swift b/iOSClient/Viewer/NCViewerMedia/NCPlayer/NCKTVHTTPCache.swift index 27ca0708e..e54762e11 100644 --- a/iOSClient/Viewer/NCViewerMedia/NCPlayer/NCKTVHTTPCache.swift +++ b/iOSClient/Viewer/NCViewerMedia/NCPlayer/NCKTVHTTPCache.swift @@ -110,7 +110,7 @@ class NCKTVHTTPCache: NSObject { NCManageDatabase.shared.addLocalFile(metadata: metadata) KTVHTTPCache.cacheDelete(with: videoURL) - NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl]) + NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterReloadDataSource, userInfo: ["serverUrl": metadata.serverUrl]) } } |