Marino Faggiana 7 years ago
parent
commit
9f5fcc8711

+ 5 - 5
iOSClient/Create/CCCreateCloud.swift

@@ -641,6 +641,8 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
                  self.fileName = CCUtility.removeForbiddenCharactersServer(fileNameNew as! String)
             }
         
+            self.title = fileName
+
             self.form.delegate = self
         }
     }
@@ -666,11 +668,6 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
         self.reloadForm()
     }
     
-    override func viewWillDisappear(_ animated: Bool)
-    {
-        super.viewWillDisappear(animated)
-    }
-    
     func reloadForm() {
         
         self.form.delegate = nil
@@ -678,7 +675,10 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
         let buttonDestinationFolder : XLFormRowDescriptor  = self.form.formRow(withTag: "ButtonDestinationFolder")!
         buttonDestinationFolder.title = self.titleServerUrl
         
+        self.title = fileName
+        
         self.tableView.reloadData()
+        
         self.form.delegate = self
     }
     

+ 8 - 6
iOSClient/Text/NCText.storyboard

@@ -12,30 +12,31 @@
         <!--Text-->
         <scene sceneID="l1e-ys-YzZ">
             <objects>
-                <viewController extendedLayoutIncludesOpaqueBars="YES" id="oRF-nm-GrS" customClass="NCText" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="oRF-nm-GrS" customClass="NCText" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="Uyq-V3-KbV"/>
                         <viewControllerLayoutGuide type="bottom" id="5fD-Qb-N57"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="skk-fU-Vk6">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="64" width="375" height="559"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="onDrag" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="pmg-g2-Fbs">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" keyboardDismissMode="interactive" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="pmg-g2-Fbs">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                <textInputTraits key="textInputTraits"/>
                             </textView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="5fD-Qb-N57" firstAttribute="top" secondItem="pmg-g2-Fbs" secondAttribute="bottom" id="KKy-aG-Q0G"/>
-                            <constraint firstItem="pmg-g2-Fbs" firstAttribute="top" secondItem="Uyq-V3-KbV" secondAttribute="bottom" constant="-64" id="MOE-fS-vSb"/>
+                            <constraint firstItem="pmg-g2-Fbs" firstAttribute="top" secondItem="Uyq-V3-KbV" secondAttribute="bottom" id="MOE-fS-vSb"/>
                             <constraint firstAttribute="trailing" secondItem="pmg-g2-Fbs" secondAttribute="trailing" id="dYU-vc-Fz6"/>
                             <constraint firstItem="pmg-g2-Fbs" firstAttribute="leading" secondItem="skk-fU-Vk6" secondAttribute="leading" id="jcN-jR-tMp"/>
                         </constraints>
                     </view>
+                    <extendedEdge key="edgesForExtendedLayout"/>
                     <toolbarItems>
                         <barButtonItem image="actionSheetModify" id="EDN-Il-Q37">
                             <connections>
@@ -91,6 +92,7 @@
         <scene sceneID="lyP-Qo-Lgl">
             <objects>
                 <navigationController storyboardIdentifier="NCText" automaticallyAdjustsScrollViewInsets="NO" toolbarHidden="NO" id="zKl-U9-avf" sceneMemberID="viewController">
+                    <extendedEdge key="edgesForExtendedLayout"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="UIP-td-6cq">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>

+ 1 - 0
iOSClient/Text/NCText.swift

@@ -105,6 +105,7 @@ class NCText: UIViewController, UITextViewDelegate {
     }
     
     @IBAction func modifyButtonTapped(_ sender: AnyObject) {
+        
         textView.isUserInteractionEnabled = true
         textView.becomeFirstResponder()
     }