diff options
author | Marino Faggiana <marino@marinofaggiana.com> | 2021-11-18 13:38:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-18 13:38:20 +0300 |
commit | bdad3868c354e808c51c16cab20e6f637caa04af (patch) | |
tree | 283497ec895e0c94595fce1017e2b757800edd72 /iOSClient | |
parent | 83f9eff92e5bf4c78d8c33bf91bdc5d6346586df (diff) | |
parent | ff18936ccbfa4cf7bcffa0c99f3a9c83eb939281 (diff) |
Merge pull request #1763 from nextcloud/fix/ui-consistency
Smaller UI fixes
Diffstat (limited to 'iOSClient')
-rw-r--r-- | iOSClient/Main/Collection Common/NCCollectionViewCommon.swift | 26 | ||||
-rw-r--r-- | iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift | 7 | ||||
-rw-r--r-- | iOSClient/Notification/NCNotification.storyboard | 23 | ||||
-rw-r--r-- | iOSClient/Notification/NCNotification.swift | 98 | ||||
-rw-r--r-- | iOSClient/Share/NCShareCommon.swift | 52 | ||||
-rw-r--r-- | iOSClient/Share/NCShareLinkFolderMenuView.xib | 40 | ||||
-rw-r--r-- | iOSClient/Share/NCShareLinkMenuView.swift | 12 | ||||
-rw-r--r-- | iOSClient/Share/NCShareLinkMenuView.xib | 36 | ||||
-rw-r--r-- | iOSClient/Share/NCShareUserFolderMenuView.xib | 38 | ||||
-rw-r--r-- | iOSClient/Share/NCShareUserMenuView.swift | 10 | ||||
-rw-r--r-- | iOSClient/Share/NCShareUserMenuView.xib | 32 |
11 files changed, 166 insertions, 208 deletions
diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift index 0060776f2..d4cde63aa 100644 --- a/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift +++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon.swift @@ -43,19 +43,19 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS internal var dataSource = NCDataSource() internal var richWorkspaceText: String? internal var header: UIView? - + internal var layoutForView: NCGlobal.layoutForViewType? private var autoUploadFileName = "" private var autoUploadDirectory = "" - + internal var listLayout: NCListLayout! internal var gridLayout: NCGridLayout! - + private let headerHeight: CGFloat = 50 private var headerRichWorkspaceHeight: CGFloat = 0 private let footerHeight: CGFloat = 100 - + private var timerInputSearch: Timer? internal var literalSearch: String? internal var isSearching: Bool = false @@ -350,12 +350,10 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS } @objc func changeStatusFolderE2EE(_ notification: NSNotification) { - reloadDataSource() } @objc func closeRichWorkspaceWebView() { - reloadDataSourceNetwork() } @@ -425,16 +423,6 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS if let userInfo = notification.userInfo as NSDictionary?, let ocId = userInfo["ocId"] as? String, let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) { if metadata.serverUrl == serverUrl && metadata.account == appDelegate.account { pushMetadata(metadata) - /* - if let row = dataSource.addMetadata(metadata) { - let indexPath = IndexPath(row: row, section: 0) - collectionView?.performBatchUpdates({ - collectionView?.insertItems(at: [indexPath]) - }, completion: { (_) in - self.collectionView?.reloadData() - }) - } - */ } } else { reloadDataSourceNetwork() @@ -1259,10 +1247,8 @@ extension NCCollectionViewCommon: UICollectionViewDelegate { } func collectionViewSelectAll() { - selectOcId.removeAll() - for metadata in metadatasSource { - selectOcId.append(metadata.ocId) - } + selectOcId = metadatasSource.map({ $0.ocId }) + navigationItem.title = NSLocalizedString("_selected_", comment: "") + " : \(selectOcId.count)" + " / \(dataSource.metadatas.count)" collectionView.reloadData() } diff --git a/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift b/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift index ec445c51a..83b86db4f 100644 --- a/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift +++ b/iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift @@ -106,7 +106,8 @@ extension NCCreateFormUploadConflictDelegate { buttonContinue.layer.masksToBounds = true buttonContinue.setTitle(NSLocalizedString("_continue_", comment: ""), for: .normal) buttonContinue.isEnabled = false - + buttonContinue.setTitleColor(NCBrandColor.shared.gray, for: .normal) + let blurEffect = UIBlurEffect(style: .light) blurView = UIVisualEffectView(effect: blurEffect) blurView.frame = view.bounds @@ -546,10 +547,10 @@ extension NCCreateFormUploadConflict: NCCreateFormUploadConflictCellDelegate { if result { buttonContinue.isEnabled = true - buttonContinue.setTitleColor(.black, for: .normal) + buttonContinue.setTitleColor(NCBrandColor.shared.label, for: .normal) } else { buttonContinue.isEnabled = false - buttonContinue.setTitleColor(.lightGray, for: .normal) + buttonContinue.setTitleColor(NCBrandColor.shared.gray, for: .normal) } } } diff --git a/iOSClient/Notification/NCNotification.storyboard b/iOSClient/Notification/NCNotification.storyboard index 040187dbb..c27fd1a8c 100644 --- a/iOSClient/Notification/NCNotification.storyboard +++ b/iOSClient/Notification/NCNotification.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="c26-Us-IIn"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="c26-Us-IIn"> <device id="retina4_7" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> @@ -17,7 +17,7 @@ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="187" id="R1c-h5-BOp" customClass="NCNotificationCell" customModule="Nextcloud" customModuleProvider="target"> - <rect key="frame" x="0.0" y="28" width="375" height="187"/> + <rect key="frame" x="0.0" y="44.5" width="375" height="187"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R1c-h5-BOp" id="9Bv-1W-yVV"> <rect key="frame" x="0.0" y="0.0" width="375" height="187"/> @@ -28,7 +28,7 @@ <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="23" id="HIf-ra-ApH"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="16"/> + <fontDescription key="fontDescription" type="system" pointSize="15"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> @@ -43,11 +43,11 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9fz-sr-8Gv" userLabel="message"> - <rect key="frame" x="50" y="73" width="315" height="73"/> + <rect key="frame" x="50" y="73" width="315" height="64"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="5" id="w3S-Mr-J41"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="16"/> + <fontDescription key="fontDescription" type="system" pointSize="15"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> </label> @@ -70,7 +70,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-G7-FLo"> - <rect key="frame" x="245" y="147" width="120" height="30"/> + <rect key="frame" x="245" y="142" width="120" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="n50-CF-ODl"/> <constraint firstAttribute="width" constant="120" id="tiI-55-Qu5"/> @@ -81,7 +81,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="obR-h7-TUC"> - <rect key="frame" x="115" y="147" width="120" height="30"/> + <rect key="frame" x="115" y="142" width="120" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="Vko-Ob-nuj"/> <constraint firstAttribute="width" constant="120" id="sVc-6c-vO4"/> @@ -104,22 +104,22 @@ <constraint firstItem="j3P-Mn-NRk" firstAttribute="leading" secondItem="9Bv-1W-yVV" secondAttribute="leading" constant="10" id="05B-JK-v6T"/> <constraint firstAttribute="trailing" secondItem="sMh-G7-FLo" secondAttribute="trailing" constant="10" id="4W9-Xm-fxY"/> <constraint firstItem="9mD-Qe-1wu" firstAttribute="centerY" secondItem="YM1-uH-2Cz" secondAttribute="centerY" id="6VB-EF-GQs"/> + <constraint firstItem="sMh-G7-FLo" firstAttribute="top" secondItem="9fz-sr-8Gv" secondAttribute="bottom" constant="5" id="EOH-W7-TBv"/> <constraint firstItem="pg1-7p-7Rz" firstAttribute="leading" secondItem="j3P-Mn-NRk" secondAttribute="trailing" constant="15" id="FHX-rf-Z0E"/> - <constraint firstAttribute="bottomMargin" secondItem="9fz-sr-8Gv" secondAttribute="bottom" constant="30" id="FnM-0E-rXs"/> <constraint firstAttribute="trailing" secondItem="9mD-Qe-1wu" secondAttribute="trailing" constant="10" id="L9w-kA-Ypv"/> <constraint firstItem="sMh-G7-FLo" firstAttribute="leading" secondItem="obR-h7-TUC" secondAttribute="trailing" constant="10" id="MZG-Fc-cbL"/> - <constraint firstAttribute="bottom" secondItem="sMh-G7-FLo" secondAttribute="bottom" constant="10" id="RKX-zp-kja"/> + <constraint firstAttribute="bottom" secondItem="sMh-G7-FLo" secondAttribute="bottom" constant="15" id="RKX-zp-kja"/> <constraint firstItem="9fz-sr-8Gv" firstAttribute="leading" secondItem="9Bv-1W-yVV" secondAttribute="leading" constant="50" id="ZxC-VD-ZtU"/> <constraint firstAttribute="trailing" secondItem="pg1-7p-7Rz" secondAttribute="trailing" constant="10" id="bwL-co-8gM"/> <constraint firstAttribute="trailing" secondItem="9fz-sr-8Gv" secondAttribute="trailing" constant="10" id="d8l-vA-BmP"/> <constraint firstItem="9mD-Qe-1wu" firstAttribute="leading" secondItem="YPu-No-c8x" secondAttribute="trailing" constant="12" id="goU-TU-7Jd"/> <constraint firstItem="9fz-sr-8Gv" firstAttribute="top" secondItem="pg1-7p-7Rz" secondAttribute="bottom" constant="10" id="heM-QX-U30"/> - <constraint firstAttribute="bottom" secondItem="obR-h7-TUC" secondAttribute="bottom" constant="10" id="keX-xE-b77"/> <constraint firstItem="pg1-7p-7Rz" firstAttribute="top" secondItem="9Bv-1W-yVV" secondAttribute="top" constant="40" id="pcJ-Jy-HwJ"/> <constraint firstItem="YM1-uH-2Cz" firstAttribute="top" secondItem="9Bv-1W-yVV" secondAttribute="top" constant="10" id="vBN-K9-5xe"/> <constraint firstItem="YM1-uH-2Cz" firstAttribute="leading" secondItem="9Bv-1W-yVV" secondAttribute="leading" constant="10" id="xEL-jv-PCm"/> <constraint firstItem="j3P-Mn-NRk" firstAttribute="top" secondItem="9Bv-1W-yVV" secondAttribute="top" constant="40" id="xoc-tf-dh9"/> <constraint firstItem="YPu-No-c8x" firstAttribute="centerY" secondItem="YM1-uH-2Cz" secondAttribute="centerY" id="z8s-et-n4J"/> + <constraint firstItem="obR-h7-TUC" firstAttribute="firstBaseline" secondItem="sMh-G7-FLo" secondAttribute="firstBaseline" id="zHR-cX-8yQ"/> </constraints> </tableViewCellContentView> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> @@ -130,7 +130,6 @@ <outlet property="date" destination="YPu-No-c8x" id="CfW-Pz-jdL"/> <outlet property="icon" destination="YM1-uH-2Cz" id="MPX-ZL-wVR"/> <outlet property="message" destination="9fz-sr-8Gv" id="3Zx-pz-gEK"/> - <outlet property="messageBottomMargin" destination="FnM-0E-rXs" id="Pf6-Au-H7E"/> <outlet property="primary" destination="sMh-G7-FLo" id="oyl-c8-sTP"/> <outlet property="primaryWidth" destination="tiI-55-Qu5" id="8H6-cf-vtP"/> <outlet property="remove" destination="9mD-Qe-1wu" id="r1h-mr-5U9"/> diff --git a/iOSClient/Notification/NCNotification.swift b/iOSClient/Notification/NCNotification.swift index 5f0321444..8aefe0547 100644 --- a/iOSClient/Notification/NCNotification.swift +++ b/iOSClient/Notification/NCNotification.swift @@ -6,6 +6,7 @@ // Copyright (c) 2017 Marino Faggiana. All rights reserved. // // Author Marino Faggiana <marino.faggiana@nextcloud.com> +// Henrik Storch <henrik.storch@nextcloud.com> // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -110,7 +111,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty } override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - + let cell = self.tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! NCNotificationCell cell.delegate = self @@ -163,20 +164,20 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty cell.subject.textColor = NCBrandColor.shared.label cell.message.text = notification.message.replacingOccurrences(of: "<br />", with: "\n") cell.message.textColor = .gray - + cell.remove.setImage(UIImage(named: "xmark")!.image(color: .gray, size: 20), for: .normal) - + cell.primary.isEnabled = false cell.primary.isHidden = true - cell.primary.titleLabel?.font = .systemFont(ofSize: 14) + cell.primary.titleLabel?.font = .systemFont(ofSize: 15) cell.primary.setTitleColor(.white, for: .normal) cell.primary.layer.cornerRadius = 15 cell.primary.layer.masksToBounds = true cell.primary.layer.backgroundColor = NCBrandColor.shared.brandElement.cgColor - + cell.secondary.isEnabled = false cell.secondary.isHidden = true - cell.secondary.titleLabel?.font = .systemFont(ofSize: 14) + cell.secondary.titleLabel?.font = .systemFont(ofSize: 15) cell.secondary.setTitleColor(.gray, for: .normal) cell.secondary.layer.cornerRadius = 15 cell.secondary.layer.masksToBounds = true @@ -184,52 +185,41 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty cell.secondary.layer.borderWidth = 0.3 cell.secondary.layer.borderColor = UIColor.gray.cgColor - cell.messageBottomMargin.constant = 10 - // Action - if let actions = notification.actions { - if let jsonActions = JSON(actions).array { - if jsonActions.count == 1 { - let action = jsonActions[0] - - cell.primary.isEnabled = true - cell.primary.isHidden = false - cell.primary.setTitle(action["label"].stringValue, for: .normal) - - } else if jsonActions.count == 2 { + if let actions = notification.actions, + let jsonActions = JSON(actions).array { + if jsonActions.count == 1 { + let action = jsonActions[0] + + cell.primary.isEnabled = true + cell.primary.isHidden = false + cell.primary.setTitle(action["label"].stringValue, for: .normal) + + } else if jsonActions.count == 2 { + + cell.primary.isEnabled = true + cell.primary.isHidden = false + + cell.secondary.isEnabled = true + cell.secondary.isHidden = false + + for action in jsonActions { - cell.primary.isEnabled = true - cell.primary.isHidden = false - - cell.secondary.isEnabled = true - cell.secondary.isHidden = false + let label = action["label"].stringValue + let primary = action["primary"].boolValue - for action in jsonActions { - - let label = action["label"].stringValue - let primary = action["primary"].boolValue - - if primary { - cell.primary.setTitle(label, for: .normal) - } else { - cell.secondary.setTitle(label, for: .normal) - } + if primary { + cell.primary.setTitle(label, for: .normal) + } else { + cell.secondary.setTitle(label, for: .normal) } } - - let widthPrimary = cell.primary.intrinsicContentSize.width + 30; - let widthSecondary = cell.secondary.intrinsicContentSize.width + 30; - - if widthPrimary > widthSecondary { - cell.primaryWidth.constant = widthPrimary - cell.secondaryWidth.constant = widthPrimary - } else { - cell.primaryWidth.constant = widthSecondary - cell.secondaryWidth.constant = widthSecondary - } - - cell.messageBottomMargin.constant = 40 } + + var buttonWidth = max(cell.primary.intrinsicContentSize.width, cell.secondary.intrinsicContentSize.width) + buttonWidth += 30 + cell.primaryWidth.constant = buttonWidth + cell.secondaryWidth.constant = buttonWidth } return cell @@ -241,8 +231,9 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty NCCommunication.shared.setNotification(serverUrl:nil, idNotification: notification!.idNotification , method: "DELETE") { (account, errorCode, errorDescription) in if errorCode == 0 && account == self.appDelegate.account { - - if let index = self.notifications.firstIndex(where: {$0.idNotification == notification!.idNotification}) { + + if let index = self.notifications + .firstIndex(where: { $0.idNotification == notification!.idNotification }) { self.notifications.remove(at: index) } @@ -264,17 +255,18 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty if action["label"].string == label { let serverUrl = action["link"].stringValue let method = action["type"].stringValue - + if method == "WEB", let url = action["link"].url { UIApplication.shared.open(url, options: [:], completionHandler: nil) return } - + NCCommunication.shared.setNotification(serverUrl: serverUrl, idNotification: 0, method: method) { (account, errorCode, errorDescription) in if errorCode == 0 && account == self.appDelegate.account { - - if let index = self.notifications.firstIndex(where: {$0.idNotification == notification!.idNotification}) { + + if let index = self.notifications + .firstIndex(where: { $0.idNotification == notification!.idNotification }) { self.notifications.remove(at: index) } @@ -333,7 +325,7 @@ class NCNotificationCell: UITableViewCell, NCCellProtocol { @IBOutlet weak var primary: UIButton! @IBOutlet weak var secondary: UIButton! @IBOutlet weak var avatarLeadingMargin: NSLayoutConstraint! - @IBOutlet weak var messageBottomMargin: NSLayoutConstraint! +// @IBOutlet weak var messageBottomMargin: NSLayoutConstraint! @IBOutlet weak var primaryWidth: NSLayoutConstraint! @IBOutlet weak var secondaryWidth: NSLayoutConstraint! diff --git a/iOSClient/Share/NCShareCommon.swift b/iOSClient/Share/NCShareCommon.swift index efa4ff551..fd05d0ff7 100644 --- a/iOSClient/Share/NCShareCommon.swift +++ b/iOSClient/Share/NCShareCommon.swift @@ -61,11 +61,7 @@ class NCShareCommon: NSObject { var shareLinkMenuView: NCShareLinkMenuView let window = UIApplication.shared.keyWindow! let viewWindow = UIView(frame: window.bounds) -// let globalPoint = shareViewController.view.superview?.convert(shareViewController.view.frame.origin, to: nil) -// let constantTrailingAnchor = window.bounds.width - shareViewController.view.bounds.width - globalPoint!.x + 40 -// var constantBottomAnchor: CGFloat = 10 -// constantBottomAnchor = constantBottomAnchor + UIApplication.shared.keyWindow!.safeAreaInsets.bottom - + window.addSubview(viewWindow) viewWindow.autoresizingMask = [.flexibleWidth, .flexibleHeight] @@ -77,9 +73,9 @@ class NCShareCommon: NSObject { shareLinkMenuView.width = 250 if metadata.directory { - shareLinkMenuView.height = 590 + shareLinkMenuView.height = 600 } else { - shareLinkMenuView.height = 490 + shareLinkMenuView.height = 500 } shareLinkMenuView.backgroundColor = NCBrandColor.shared.systemBackground @@ -105,11 +101,7 @@ class NCShareCommon: NSObject { var shareUserMenuView: NCShareUserMenuView let window = UIApplication.shared.keyWindow! let viewWindow = UIView(frame: window.bounds) -// let globalPoint = shareViewController.view.superview?.convert(shareViewController.view.frame.origin, to: nil) -// let constantTrailingAnchor = window.bounds.width - shareViewController.view.bounds.width - globalPoint!.x + 40 -// var constantBottomAnchor: CGFloat = 10 -// constantBottomAnchor = constantBottomAnchor + UIApplication.shared.keyWindow!.safeAreaInsets.bottom - + window.addSubview(viewWindow) viewWindow.autoresizingMask = [.flexibleWidth, .flexibleHeight] @@ -121,9 +113,9 @@ class NCShareCommon: NSObject { shareUserMenuView.width = 250 if metadata.directory { - shareUserMenuView.height = 410 + shareUserMenuView.height = 420 } else { - shareUserMenuView.height = 260 + shareUserMenuView.height = 270 } shareUserMenuView.backgroundColor = NCBrandColor.shared.systemBackground @@ -173,11 +165,11 @@ class NCShareCommon: NSObject { calendar.appearance.headerTitleFont = UIFont.systemFont(ofSize: 13) - calendar.appearance.weekdayTextColor = UIColor(red: 100/255, green: 100/255, blue: 100/255, alpha: 1) - calendar.appearance.weekdayFont = UIFont.systemFont(ofSize: 12) + calendar.appearance.weekdayTextColor = NCBrandColor.shared.gray + calendar.appearance.weekdayFont = UIFont.systemFont(ofSize: 13) calendar.appearance.todayColor = NCBrandColor.shared.brandElement - calendar.appearance.titleFont = UIFont.systemFont(ofSize: 12) + calendar.appearance.titleFont = UIFont.systemFont(ofSize: 13) viewWindow.addSubview(calendar) @@ -185,22 +177,18 @@ class NCShareCommon: NSObject { } func copyLink(link: String, viewController: UIViewController, sender: Any) { - //guard let tableShare = tableShare else { return } - - //if let name = URL(string: tableShare.url), !name.absoluteString.isEmpty { - let objectsToShare = [link] - - let activityViewController = UIActivityViewController(activityItems: objectsToShare, applicationActivities: nil) - - if UIDevice.current.userInterfaceIdiom == .pad { - if activityViewController.responds(to: #selector(getter: UIViewController.popoverPresentationController)) { - activityViewController.popoverPresentationController?.sourceView = sender as? UIView - activityViewController.popoverPresentationController?.sourceRect = (sender as AnyObject).bounds - } + let objectsToShare = [link] + + let activityViewController = UIActivityViewController(activityItems: objectsToShare, applicationActivities: nil) + + if UIDevice.current.userInterfaceIdiom == .pad { + if activityViewController.responds(to: #selector(getter: UIViewController.popoverPresentationController)) { + activityViewController.popoverPresentationController?.sourceView = sender as? UIView + activityViewController.popoverPresentationController?.sourceRect = (sender as AnyObject).bounds } - - viewController.present(activityViewController, animated: true, completion: nil) - //} + } + + viewController.present(activityViewController, animated: true, completion: nil) } func getImageShareType(shareType: Int) -> UIImage? { diff --git a/iOSClient/Share/NCShareLinkFolderMenuView.xib b/iOSClient/Share/NCShareLinkFolderMenuView.xib index 00ed0e590..8fb3aed5c 100644 --- a/iOSClient/Share/NCShareLinkFolderMenuView.xib +++ b/iOSClient/Share/NCShareLinkFolderMenuView.xib @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina4_0" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view opaque="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="NCShareLinkMenuView" customModule="Nextcloud" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> + <rect key="frame" x="0.0" y="0.0" width="250" height="600"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="sjf-wF-y07" userLabel="SwitchAllowEditing"> @@ -20,7 +20,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Read only" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IHP-P8-rm2"> - <rect key="frame" x="70" y="70" width="240" height="15"/> + <rect key="frame" x="70" y="70" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="lcS-7f-bEg"/> </constraints> @@ -35,7 +35,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hide download" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KXo-cP-gkc"> - <rect key="frame" x="70" y="223" width="240" height="15"/> + <rect key="frame" x="70" y="223" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="IEP-cO-Um6"/> </constraints> @@ -50,7 +50,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password protect" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HaY-OM-mQh"> - <rect key="frame" x="70" y="274" width="240" height="15"/> + <rect key="frame" x="70" y="274" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="MeH-bs-tZK"/> </constraints> @@ -59,7 +59,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e1F-PV-32s"> - <rect key="frame" x="70" y="299" width="240" height="30"/> + <rect key="frame" x="70" y="299" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="tTv-8w-kxm"/> </constraints> @@ -76,7 +76,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set expiration date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qll-9F-4DA"> - <rect key="frame" x="70" y="357" width="240" height="15"/> + <rect key="frame" x="70" y="357" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="KyU-PL-PRI"/> </constraints> @@ -85,7 +85,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ymk-0u-ddH"> - <rect key="frame" x="70" y="382" width="240" height="30"/> + <rect key="frame" x="70" y="382" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="G4f-LN-v7k"/> </constraints> @@ -103,7 +103,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note to recipient" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="grT-sd-j7q"> - <rect key="frame" x="70" y="437" width="245" height="15"/> + <rect key="frame" x="70" y="437" width="175" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gof-GU-toa"/> </constraints> @@ -112,7 +112,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FyH-3p-EdC"> - <rect key="frame" x="70" y="462" width="240" height="30"/> + <rect key="frame" x="70" y="462" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="2CZ-EP-NrP"/> </constraints> @@ -130,7 +130,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Delete share link" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ff4-JE-zGU"> - <rect key="frame" x="70" y="517" width="240" height="15"/> + <rect key="frame" x="70" y="517" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gYi-S0-IOg"/> </constraints> @@ -139,7 +139,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CLA-UL-mYb"> - <rect key="frame" x="13" y="512" width="287" height="25"/> + <rect key="frame" x="13" y="512" width="217" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="fWP-XF-kQx"/> </constraints> @@ -155,7 +155,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add another link" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cna-iK-PD7"> - <rect key="frame" x="70" y="562" width="240" height="15"/> + <rect key="frame" x="70" y="562" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="p9o-oI-gWq"/> </constraints> @@ -164,7 +164,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0bK-Kl-hcs"> - <rect key="frame" x="13" y="557" width="287" height="25"/> + <rect key="frame" x="13" y="557" width="217" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="wQO-6d-vWV"/> </constraints> @@ -179,7 +179,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Allow upload and editing" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9rD-k5-hnW"> - <rect key="frame" x="70" y="121" width="240" height="15"/> + <rect key="frame" x="70" y="121" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="zKi-d5-7DQ"/> </constraints> @@ -194,7 +194,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="File drop (upload only)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QJc-Cx-Fa3"> - <rect key="frame" x="70" y="172" width="240" height="15"/> + <rect key="frame" x="70" y="172" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="GRe-k0-V9C"/> </constraints> @@ -203,7 +203,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Placeholder" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JOx-l5-TUp"> - <rect key="frame" x="10" y="12" width="300" height="30"/> + <rect key="frame" x="10" y="12" width="230" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="eTg-X2-ih2"/> </constraints> @@ -271,6 +271,7 @@ <constraint firstAttribute="trailing" secondItem="CLA-UL-mYb" secondAttribute="trailing" constant="20" id="oEb-Su-Nu5"/> <constraint firstItem="qll-9F-4DA" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="qEq-8J-iTD"/> <constraint firstItem="ymk-0u-ddH" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="qrv-wQ-p6E"/> + <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="0bK-Kl-hcs" secondAttribute="bottom" constant="10" id="rgb-gX-oJd"/> <constraint firstAttribute="trailing" secondItem="KXo-cP-gkc" secondAttribute="trailing" constant="10" id="uDa-6r-K84"/> <constraint firstAttribute="trailing" secondItem="qll-9F-4DA" secondAttribute="trailing" constant="10" id="vaT-9Q-m84"/> <constraint firstItem="F4T-wQ-tBU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="x4S-GE-lJ8"/> @@ -279,6 +280,7 @@ <constraint firstItem="Ff4-JE-zGU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="zc7-db-OeN"/> <constraint firstItem="JOx-l5-TUp" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="10" id="zsp-AH-Dzr"/> </constraints> + <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <connections> <outlet property="buttonAddAnotherLink" destination="0bK-Kl-hcs" id="XMo-Cp-y6f"/> <outlet property="buttonDeleteShareLink" destination="CLA-UL-mYb" id="LVP-Vh-RHb"/> @@ -305,7 +307,7 @@ <outlet property="switchReadOnly" destination="sjf-wF-y07" id="QSL-7L-cdn"/> <outlet property="switchSetExpirationDate" destination="dB8-1M-WZr" id="R5d-Hf-ga6"/> </connections> - <point key="canvasLocation" x="-141" y="446"/> + <point key="canvasLocation" x="-142.5" y="519.71830985915494"/> </view> </objects> <resources> diff --git a/iOSClient/Share/NCShareLinkMenuView.swift b/iOSClient/Share/NCShareLinkMenuView.swift index 1060e3bec..5a6093e69 100644 --- a/iOSClient/Share/NCShareLinkMenuView.swift +++ b/iOSClient/Share/NCShareLinkMenuView.swift @@ -132,9 +132,9 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, UITextFieldDeleg fieldPasswordProtect.delegate = self fieldNoteToRecipient.delegate = self - imageNoteToRecipient.image = UIImage.init(named: "file_txt")!.image(color: UIColor(red: 76/255, green: 76/255, blue: 76/255, alpha: 1), size: 50) - imageDeleteShareLink.image = NCUtility.shared.loadImage(named: "trash", color: UIColor(red: 76/255, green: 76/255, blue: 76/255, alpha: 1), size: 50) - imageAddAnotherLink.image = NCUtility.shared.loadImage(named: "plus", color: UIColor(red: 76/255, green: 76/255, blue: 76/255, alpha: 1), size: 50) + imageNoteToRecipient.image = UIImage.init(named: "file_txt")!.image(color: NCBrandColor.shared.gray, size: 50) + imageDeleteShareLink.image = NCUtility.shared.loadImage(named: "trash", color: NCBrandColor.shared.gray, size: 50) + imageAddAnotherLink.image = NCUtility.shared.loadImage(named: "plus", color: NCBrandColor.shared.gray, size: 50) NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardWillShowNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil) @@ -479,10 +479,6 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, UITextFieldDeleg } func calendar(_ calendar: FSCalendar, appearance: FSCalendarAppearance, titleDefaultColorFor date: Date) -> UIColor? { - if date > Date() { - return UIColor(red: 60/255, green: 60/255, blue: 60/255, alpha: 1) - } else { - return UIColor(red: 190/255, green: 190/255, blue: 190/255, alpha: 1) - } + return date > Date() ? NCBrandColor.shared.label : NCBrandColor.shared.systemGray3 } } diff --git a/iOSClient/Share/NCShareLinkMenuView.xib b/iOSClient/Share/NCShareLinkMenuView.xib index 4b7333c0b..35748f2e1 100644 --- a/iOSClient/Share/NCShareLinkMenuView.xib +++ b/iOSClient/Share/NCShareLinkMenuView.xib @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina3_5" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view opaque="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="NCShareLinkMenuView" customModule="Nextcloud" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> + <rect key="frame" x="0.0" y="0.0" width="250" height="500"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Placeholder" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AjK-Ty-MRn"> - <rect key="frame" x="10" y="10" width="300" height="30"/> + <rect key="frame" x="10" y="10" width="230" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="sVl-pt-Qe5"/> </constraints> @@ -31,7 +31,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Allow editing" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IHP-P8-rm2"> - <rect key="frame" x="70" y="68" width="240" height="15"/> + <rect key="frame" x="70" y="68" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="lcS-7f-bEg"/> </constraints> @@ -46,7 +46,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hide download" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KXo-cP-gkc"> - <rect key="frame" x="70" y="119" width="240" height="15"/> + <rect key="frame" x="70" y="119" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="IEP-cO-Um6"/> </constraints> @@ -61,7 +61,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password protect" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HaY-OM-mQh"> - <rect key="frame" x="70" y="170" width="240" height="15"/> + <rect key="frame" x="70" y="170" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="MeH-bs-tZK"/> </constraints> @@ -70,7 +70,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e1F-PV-32s"> - <rect key="frame" x="70" y="195" width="240" height="30"/> + <rect key="frame" x="70" y="195" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="tTv-8w-kxm"/> </constraints> @@ -87,7 +87,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set expiration date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qll-9F-4DA"> - <rect key="frame" x="70" y="253" width="240" height="15"/> + <rect key="frame" x="70" y="253" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="KyU-PL-PRI"/> </constraints> @@ -96,7 +96,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ymk-0u-ddH"> - <rect key="frame" x="70" y="278" width="240" height="30"/> + <rect key="frame" x="70" y="278" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="G4f-LN-v7k"/> </constraints> @@ -114,7 +114,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note to recipient" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="grT-sd-j7q"> - <rect key="frame" x="70" y="333" width="245" height="15"/> + <rect key="frame" x="70" y="333" width="175" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gof-GU-toa"/> </constraints> @@ -123,7 +123,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FyH-3p-EdC"> - <rect key="frame" x="70" y="358" width="240" height="30"/> + <rect key="frame" x="70" y="358" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="hye-cf-nPD"/> </constraints> @@ -141,7 +141,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Delete share link" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ff4-JE-zGU"> - <rect key="frame" x="70" y="413" width="240" height="15"/> + <rect key="frame" x="70" y="413" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gYi-S0-IOg"/> </constraints> @@ -150,7 +150,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CLA-UL-mYb"> - <rect key="frame" x="13" y="408" width="287" height="25"/> + <rect key="frame" x="13" y="408" width="217" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="fWP-XF-kQx"/> </constraints> @@ -166,7 +166,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add another link" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cna-iK-PD7"> - <rect key="frame" x="70" y="458" width="240" height="15"/> + <rect key="frame" x="70" y="458" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="p9o-oI-gWq"/> </constraints> @@ -175,7 +175,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0bK-Kl-hcs"> - <rect key="frame" x="13" y="453" width="287" height="25"/> + <rect key="frame" x="13" y="453" width="217" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="wQO-6d-vWV"/> </constraints> @@ -221,6 +221,7 @@ <constraint firstItem="HDO-WC-RvJ" firstAttribute="top" secondItem="UIn-eq-hkP" secondAttribute="bottom" constant="20" id="dex-mb-oRg"/> <constraint firstItem="AjK-Ty-MRn" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="10" id="eT2-WG-2Db"/> <constraint firstItem="hr8-Qe-xD0" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="elF-be-kqS"/> + <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="0bK-Kl-hcs" secondAttribute="bottom" constant="10" id="eyC-io-Nk6"/> <constraint firstItem="cna-iK-PD7" firstAttribute="centerY" secondItem="0bK-Kl-hcs" secondAttribute="centerY" id="fDj-O7-Xdr"/> <constraint firstItem="hr8-Qe-xD0" firstAttribute="top" secondItem="FyH-3p-EdC" secondAttribute="bottom" constant="20" id="itX-To-Hbm"/> <constraint firstItem="ymk-0u-ddH" firstAttribute="top" secondItem="qll-9F-4DA" secondAttribute="bottom" constant="10" id="k4G-Yb-xBy"/> @@ -239,6 +240,7 @@ <constraint firstItem="Ff4-JE-zGU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="zc7-db-OeN"/> <constraint firstItem="UIn-eq-hkP" firstAttribute="top" secondItem="sjf-wF-y07" secondAttribute="bottom" constant="20" id="zex-fG-9ns"/> </constraints> + <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <connections> <outlet property="buttonAddAnotherLink" destination="0bK-Kl-hcs" id="XMo-Cp-y6f"/> <outlet property="buttonDeleteShareLink" destination="CLA-UL-mYb" id="LVP-Vh-RHb"/> @@ -261,7 +263,7 @@ <outlet property="switchPasswordProtect" destination="HDO-WC-RvJ" id="K7a-3i-8kx"/> <outlet property="switchSetExpirationDate" destination="dB8-1M-WZr" id="R5d-Hf-ga6"/> </connections> - <point key="canvasLocation" x="-60" y="275"/> + <point key="canvasLocation" x="-60" y="350.625"/> </view> </objects> <resources> diff --git a/iOSClient/Share/NCShareUserFolderMenuView.xib b/iOSClient/Share/NCShareUserFolderMenuView.xib index f9cb2fadc..2908ef2a1 100644 --- a/iOSClient/Share/NCShareUserFolderMenuView.xib +++ b/iOSClient/Share/NCShareUserFolderMenuView.xib @@ -1,18 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina3_5" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina3_5" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view opaque="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="NCShareUserMenuView" customModule="Nextcloud" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> + <rect key="frame" x="0.0" y="0.0" width="250" height="420"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="sjf-wF-y07"> @@ -22,7 +20,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can reshare" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IHP-P8-rm2"> - <rect key="frame" x="70" y="18" width="240" height="15"/> + <rect key="frame" x="70" y="18" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="lcS-7f-bEg"/> </constraints> @@ -37,7 +35,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set expiration date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qll-9F-4DA"> - <rect key="frame" x="70" y="222" width="240" height="15"/> + <rect key="frame" x="70" y="222" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="KyU-PL-PRI"/> </constraints> @@ -46,11 +44,10 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ymk-0u-ddH"> - <rect key="frame" x="70" y="247" width="240" height="30"/> + <rect key="frame" x="70" y="247" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="G4f-LN-v7k"/> </constraints> - <nil key="textColor"/> <fontDescription key="fontDescription" type="system" pointSize="13"/> <textInputTraits key="textInputTraits"/> <connections> @@ -65,7 +62,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note to recipient" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="grT-sd-j7q"> - <rect key="frame" x="70" y="302" width="245" height="15"/> + <rect key="frame" x="70" y="302" width="175" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gof-GU-toa"/> </constraints> @@ -74,8 +71,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FyH-3p-EdC"> - <rect key="frame" x="70" y="327" width="240" height="30"/> - <nil key="textColor"/> + <rect key="frame" x="70" y="327" width="170" height="34"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits"/> <connections> @@ -83,14 +79,14 @@ </connections> </textField> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="trash" translatesAutoresizingMaskIntoConstraints="NO" id="hr8-Qe-xD0" userLabel="Image Delete Share Link"> - <rect key="frame" x="13" y="377" width="25" height="25"/> + <rect key="frame" x="13" y="381" width="25" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="Ktg-2f-87b"/> <constraint firstAttribute="width" constant="25" id="ZJu-Y5-U67"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unshare" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ff4-JE-zGU"> - <rect key="frame" x="70" y="382" width="240" height="15"/> + <rect key="frame" x="70" y="386" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gYi-S0-IOg"/> </constraints> @@ -99,7 +95,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CLA-UL-mYb"> - <rect key="frame" x="13" y="377" width="287" height="25"/> + <rect key="frame" x="13" y="381" width="217" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="fWP-XF-kQx"/> </constraints> @@ -114,7 +110,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can create" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G13-DS-7uC"> - <rect key="frame" x="70" y="69" width="240" height="15"/> + <rect key="frame" x="70" y="69" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="nK7-xW-fbq"/> </constraints> @@ -129,7 +125,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can change" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YWL-Ks-51c"> - <rect key="frame" x="70" y="120" width="240" height="15"/> + <rect key="frame" x="70" y="120" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="NYy-3u-P1R"/> </constraints> @@ -144,7 +140,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can delete" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dZP-fH-9sg"> - <rect key="frame" x="70" y="171" width="240" height="15"/> + <rect key="frame" x="70" y="171" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="p6u-3B-cFa"/> </constraints> @@ -196,9 +192,11 @@ <constraint firstItem="ymk-0u-ddH" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="qrv-wQ-p6E"/> <constraint firstItem="vja-ge-I6S" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="10" id="ukl-JN-XFD"/> <constraint firstAttribute="trailing" secondItem="qll-9F-4DA" secondAttribute="trailing" constant="10" id="vaT-9Q-m84"/> + <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="CLA-UL-mYb" secondAttribute="bottom" constant="10" id="w6T-Q9-OKA"/> <constraint firstItem="F4T-wQ-tBU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="x4S-GE-lJ8"/> <constraint firstItem="Ff4-JE-zGU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="zc7-db-OeN"/> </constraints> + <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <connections> <outlet property="buttonUnshare" destination="CLA-UL-mYb" id="fwq-pr-JO0"/> <outlet property="fieldNoteToRecipient" destination="FyH-3p-EdC" id="389-TM-dhC"/> @@ -223,6 +221,6 @@ </objects> <resources> <image name="file_txt" width="300" height="300"/> - <image name="trash" width="300" height="300"/> + <image name="trash" width="512" height="512"/> </resources> </document> diff --git a/iOSClient/Share/NCShareUserMenuView.swift b/iOSClient/Share/NCShareUserMenuView.swift index 2ff139ae6..38d1c6ff6 100644 --- a/iOSClient/Share/NCShareUserMenuView.swift +++ b/iOSClient/Share/NCShareUserMenuView.swift @@ -105,8 +105,8 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, UITextFieldDeleg fieldNoteToRecipient.delegate = self - imageNoteToRecipient.image = UIImage.init(named: "file_txt")!.image(color: UIColor(red: 76/255, green: 76/255, blue: 76/255, alpha: 1), size: 50) - imageUnshare.image = NCUtility.shared.loadImage(named: "trash", color: UIColor(red: 76/255, green: 76/255, blue: 76/255, alpha: 1), size: 50) + imageNoteToRecipient.image = UIImage.init(named: "file_txt")!.image(color: NCBrandColor.shared.gray, size: 50) + imageUnshare.image = NCUtility.shared.loadImage(named: "trash", color: NCBrandColor.shared.gray, size: 50) NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardWillShowNotification, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil) @@ -393,10 +393,6 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, UITextFieldDeleg } func calendar(_ calendar: FSCalendar, appearance: FSCalendarAppearance, titleDefaultColorFor date: Date) -> UIColor? { - if date > Date() { - return UIColor(red: 60/255, green: 60/255, blue: 60/255, alpha: 1) - } else { - return UIColor(red: 190/255, green: 190/255, blue: 190/255, alpha: 1) - } + return date > Date() ? NCBrandColor.shared.label : NCBrandColor.shared.systemGray3 } } diff --git a/iOSClient/Share/NCShareUserMenuView.xib b/iOSClient/Share/NCShareUserMenuView.xib index 2cfcdbd56..38a4304ad 100644 --- a/iOSClient/Share/NCShareUserMenuView.xib +++ b/iOSClient/Share/NCShareUserMenuView.xib @@ -1,18 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> - <device id="retina3_5" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> + <device id="retina3_5" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view opaque="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="NCShareUserMenuView" customModule="Nextcloud" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> + <rect key="frame" x="0.0" y="0.0" width="250" height="270"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="sjf-wF-y07"> @@ -22,7 +20,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can reshare" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IHP-P8-rm2"> - <rect key="frame" x="70" y="18" width="240" height="15"/> + <rect key="frame" x="70" y="18" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="lcS-7f-bEg"/> </constraints> @@ -37,7 +35,7 @@ </connections> </switch> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set expiration date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qll-9F-4DA"> - <rect key="frame" x="70" y="69" width="240" height="15"/> + <rect key="frame" x="70" y="69" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="KyU-PL-PRI"/> </constraints> @@ -46,11 +44,10 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ymk-0u-ddH"> - <rect key="frame" x="70" y="94" width="240" height="30"/> + <rect key="frame" x="70" y="94" width="170" height="30"/> <constraints> <constraint firstAttribute="height" constant="30" id="G4f-LN-v7k"/> </constraints> - <nil key="textColor"/> <fontDescription key="fontDescription" type="system" pointSize="13"/> <textInputTraits key="textInputTraits"/> <connections> @@ -65,7 +62,7 @@ </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note to recipient" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="grT-sd-j7q"> - <rect key="frame" x="70" y="149" width="245" height="15"/> + <rect key="frame" x="70" y="149" width="175" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gof-GU-toa"/> </constraints> @@ -74,8 +71,7 @@ <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FyH-3p-EdC"> - <rect key="frame" x="70" y="174" width="240" height="30"/> - <nil key="textColor"/> + <rect key="frame" x="70" y="174" width="170" height="34"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits"/> <connections> @@ -83,14 +79,14 @@ </connections> </textField> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="trash" translatesAutoresizingMaskIntoConstraints="NO" id="hr8-Qe-xD0" userLabel="Image Delete Share Link"> - <rect key="frame" x="13" y="224" width="25" height="25"/> + <rect key="frame" x="13" y="228" width="25" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="Ktg-2f-87b"/> <constraint firstAttribute="width" constant="25" id="ZJu-Y5-U67"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unshare" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ff4-JE-zGU"> - <rect key="frame" x="70" y="229" width="240" height="15"/> + <rect key="frame" x="70" y="233" width="170" height="15"/> <constraints> <constraint firstAttribute="height" constant="15" id="gYi-S0-IOg"/> </constraints> @@ -99,7 +95,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CLA-UL-mYb"> - <rect key="frame" x="13" y="224" width="287" height="25"/> + <rect key="frame" x="13" y="228" width="217" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="fWP-XF-kQx"/> </constraints> @@ -118,6 +114,7 @@ <constraint firstAttribute="trailing" secondItem="ymk-0u-ddH" secondAttribute="trailing" constant="10" id="Chd-iQ-EdR"/> <constraint firstItem="sjf-wF-y07" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="EW6-D3-tml"/> <constraint firstItem="IHP-P8-rm2" firstAttribute="centerY" secondItem="sjf-wF-y07" secondAttribute="centerY" id="HiA-pE-L6l"/> + <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="CLA-UL-mYb" secondAttribute="bottom" constant="10" id="MQ9-xT-wSR"/> <constraint firstAttribute="trailing" secondItem="grT-sd-j7q" secondAttribute="trailing" constant="5" id="Nyn-RD-jTz"/> <constraint firstItem="dB8-1M-WZr" firstAttribute="top" secondItem="sjf-wF-y07" secondAttribute="bottom" constant="20" id="P2C-Pq-hSl"/> <constraint firstAttribute="trailing" secondItem="FyH-3p-EdC" secondAttribute="trailing" constant="10" id="RhU-wl-afT"/> @@ -139,6 +136,7 @@ <constraint firstItem="F4T-wQ-tBU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="13" id="x4S-GE-lJ8"/> <constraint firstItem="Ff4-JE-zGU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="zc7-db-OeN"/> </constraints> + <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <connections> <outlet property="buttonUnshare" destination="CLA-UL-mYb" id="fwq-pr-JO0"/> <outlet property="fieldNoteToRecipient" destination="FyH-3p-EdC" id="389-TM-dhC"/> @@ -157,6 +155,6 @@ </objects> <resources> <image name="file_txt" width="300" height="300"/> - <image name="trash" width="300" height="300"/> + <image name="trash" width="512" height="512"/> </resources> </document> |