diff options
author | Henrik Storch <henrik.storch@nextcloud.com> | 2022-04-21 17:34:56 +0300 |
---|---|---|
committer | Henrik Storch <henrik.storch@nextcloud.com> | 2022-04-28 08:15:58 +0300 |
commit | 847e23df084cf6f2d39b5fd291f76a754e3323ad (patch) | |
tree | 520b12084f3d292c4bc31ce32b4e8d8bac81f4d7 | |
parent | 800594ddf7a8bf57a05309d45f79bda61cd3b4a4 (diff) |
Fix share permission button UI
- use 100% corner radius & 1pt border, to match nextcloud.com UI
Signed-off-by: Henrik Storch <henrik.storch@nextcloud.com>
-rw-r--r-- | iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.swift | 9 | ||||
-rw-r--r-- | iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.xib | 19 |
2 files changed, 17 insertions, 11 deletions
diff --git a/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.swift b/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.swift index a396c9116..ffad1f97e 100644 --- a/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.swift +++ b/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.swift @@ -41,16 +41,19 @@ class NCShareAdvancePermissionFooter: UIView { buttonCancel.addTarget(self, action: #selector(cancelClicked), for: .touchUpInside) buttonCancel.setTitle(NSLocalizedString("_cancel_", comment: ""), for: .normal) - buttonCancel.layer.cornerRadius = 10 + buttonCancel.layer.cornerRadius = 25 buttonCancel.layer.masksToBounds = true - buttonCancel.layer.borderWidth = 2 + buttonCancel.layer.borderWidth = 1 + buttonCancel.backgroundColor = NCBrandColor.shared.secondarySystemBackground buttonCancel.layer.borderColor = NCBrandColor.shared.systemGray.cgColor + buttonCancel.setTitleColor(NCBrandColor.shared.label.withAlphaComponent(0.3), for: .highlighted) buttonNext.setTitle(NSLocalizedString(delegate?.isNewShare == true ? "_share_" : "_save_", comment: ""), for: .normal) - buttonNext.layer.cornerRadius = 10 + buttonNext.layer.cornerRadius = 25 buttonNext.layer.masksToBounds = true buttonNext.backgroundColor = NCBrandColor.shared.brand buttonNext.addTarget(self, action: #selector(nextClicked), for: .touchUpInside) + buttonNext.setTitleColor(UIColor(white: 1, alpha: 0.3), for: .highlighted) } @objc func cancelClicked() { diff --git a/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.xib b/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.xib index 24d8697c5..b90d1675d 100644 --- a/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.xib +++ b/iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.xib @@ -12,23 +12,23 @@ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="NCShareAdvancePermissionFooter" customModule="Nextcloud" customModuleProvider="target"> - <rect key="frame" x="0.0" y="0.0" width="750" height="296"/> + <rect key="frame" x="0.0" y="0.0" width="688" height="376"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mg2-Ou-yoX"> - <rect key="frame" x="16" y="128" width="351" height="50"/> - <color key="backgroundColor" red="0.8862745098" green="0.0" blue="0.4549019608" alpha="1" colorSpace="calibratedRGB"/> - <state key="normal" title="Send share"/> - <state key="highlighted"> + <rect key="frame" x="16" y="168" width="320" height="50"/> + <color key="backgroundColor" systemColor="systemBlueColor"/> + <fontDescription key="fontDescription" type="system" pointSize="18"/> + <state key="normal" title="Send share"> <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rCI-63-PtL"> - <rect key="frame" x="383" y="128" width="351" height="50"/> + <rect key="frame" x="352" y="168" width="320" height="50"/> <constraints> <constraint firstAttribute="height" constant="50" id="vdI-sH-cTb"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="17"/> + <fontDescription key="fontDescription" type="system" pointSize="18"/> <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> <state key="normal" title="Cancel"> <color key="titleColor" systemColor="labelColor"/> @@ -51,12 +51,15 @@ <outlet property="buttonCancel" destination="rCI-63-PtL" id="SoT-Ko-LL5"/> <outlet property="buttonNext" destination="Mg2-Ou-yoX" id="F2d-L5-dHo"/> </connections> - <point key="canvasLocation" x="169.56521739130437" y="197.54464285714286"/> + <point key="canvasLocation" x="139.13043478260872" y="43.526785714285715"/> </view> </objects> <resources> <systemColor name="labelColor"> <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </systemColor> + <systemColor name="systemBlueColor"> + <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + </systemColor> </resources> </document> |