marinofaggiana пре 5 година
родитељ
комит
f198404416
2 измењених фајлова са 23 додато и 7 уклоњено
  1. 3 0
      iOSClient/Share/NCShare.storyboard
  2. 20 7
      iOSClient/Share/NCShare.swift

+ 3 - 0
iOSClient/Share/NCShare.storyboard

@@ -72,6 +72,9 @@
                                 <subviews>
                                     <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="iSO-mc-0TB">
                                         <rect key="frame" x="5" y="20" width="354" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="30" id="0aG-z9-fcy"/>
+                                        </constraints>
                                         <nil key="textColor"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <textInputTraits key="textInputTraits"/>

+ 20 - 7
iOSClient/Share/NCShare.swift

@@ -238,9 +238,6 @@ class NCShare: UIViewController {
 
     var height: CGFloat = 0
     
-    private let shareLinkMenuViewWidth: CGFloat = 200
-    private let shareLinkMenuViewHeight: CGFloat = 200
-
     private let iconShare: CGFloat = 200
 
     
@@ -274,10 +271,9 @@ class NCShare: UIViewController {
         
         // Menu
         shareLinkMenuView = Bundle.main.loadNibNamed("NCShareLinkMenuView", owner: self, options: nil)?.first as? NCShareLinkMenuView
-        shareLinkMenuView?.frame = CGRect(x: self.view.bounds.width-shareLinkMenuViewWidth-35, y: height+80, width: shareLinkMenuViewWidth, height: height+shareLinkMenuViewHeight)
-        shareLinkMenuView?.layer.borderColor = UIColor.lightGray.cgColor
-        shareLinkMenuView?.layer.borderWidth = 1
-        shareLinkMenuView?.isHidden = true
+        let shareLinkMenuViewX = self.view.bounds.width-(shareLinkMenuView?.frame.width)!-35
+        let shareLinkMenuViewY = height+80
+        shareLinkMenuView?.frame = CGRect(x: shareLinkMenuViewX, y: shareLinkMenuViewY, width: (shareLinkMenuView?.frame.width)!, height: height+(shareLinkMenuView?.frame.height)!)
         self.view.addSubview(shareLinkMenuView!)
     }
 }
@@ -298,7 +294,24 @@ class NCShareLinkMenuView: UIView {
     @IBOutlet weak var switchAllowEditing: UISwitch!
     @IBOutlet weak var labelAllowEditing: UILabel!
     
+    private let width: CGFloat = 200
+    private let height: CGFloat = 200
+    
     override func awakeFromNib() {
+        
+        self.frame.size.width = width
+        self.frame.size.height = height
+
+        isHidden = true
+
+        layer.borderColor = UIColor.lightGray.cgColor
+        layer.borderWidth = 0.5
+        layer.cornerRadius = 5
+        layer.masksToBounds = false
+        layer.shadowOffset = CGSize(width: 2, height: 2)
+        layer.shadowOpacity = 0.2
+        layer.cornerRadius = 5
+        
         switchAllowEditing.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
     }
 }