marinofaggiana 3 years ago
parent
commit
89e6949202
2 changed files with 19 additions and 20 deletions
  1. 17 18
      Share/MainInterface.storyboard
  2. 2 2
      Share/NCShareExtension.swift

+ 17 - 18
Share/MainInterface.storyboard

@@ -82,20 +82,9 @@
                                             <outlet property="delegate" destination="VYq-xA-D35" id="DAj-hF-SRY"/>
                                         </connections>
                                     </tableView>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="USb-OF-Gaq">
-                                        <rect key="frame" x="10" y="5" width="40" height="40"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="40" id="5HP-Gs-tLd"/>
-                                            <constraint firstAttribute="width" constant="40" id="NUe-Vv-dOz"/>
-                                        </constraints>
-                                        <state key="normal" image="folder"/>
-                                        <connections>
-                                            <action selector="actionCreateFolder:" destination="VYq-xA-D35" eventType="touchUpInside" id="VKJ-l5-aU0"/>
-                                        </connections>
-                                    </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="create folder" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WHW-J5-8gq">
-                                        <rect key="frame" x="60" y="16.666666666666629" width="344" height="17"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <rect key="frame" x="10" y="33" width="67" height="13.333333333333336"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
@@ -106,24 +95,34 @@
                                             <action selector="actionUpload:" destination="VYq-xA-D35" eventType="touchUpInside" id="ENy-P1-SDo"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="USb-OF-Gaq">
+                                        <rect key="frame" x="28.666666666666671" y="2" width="30" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="30" id="5HP-Gs-tLd"/>
+                                            <constraint firstAttribute="width" constant="30" id="NUe-Vv-dOz"/>
+                                        </constraints>
+                                        <state key="normal" image="folder"/>
+                                        <connections>
+                                            <action selector="actionCreateFolder:" destination="VYq-xA-D35" eventType="touchUpInside" id="VKJ-l5-aU0"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
-                                    <constraint firstItem="WHW-J5-8gq" firstAttribute="leading" secondItem="USb-OF-Gaq" secondAttribute="trailing" constant="10" id="0vb-fF-r1z"/>
                                     <constraint firstItem="eU0-LW-AnG" firstAttribute="top" secondItem="LAs-iQ-u1X" secondAttribute="bottom" constant="50" id="14j-96-VwG"/>
-                                    <constraint firstItem="WHW-J5-8gq" firstAttribute="centerY" secondItem="USb-OF-Gaq" secondAttribute="centerY" id="1g9-zC-1OC"/>
-                                    <constraint firstItem="USb-OF-Gaq" firstAttribute="top" secondItem="FaV-kz-PEs" secondAttribute="top" constant="5" id="1tj-Mf-QjF"/>
                                     <constraint firstAttribute="height" constant="300" id="50u-lA-AUo"/>
                                     <constraint firstAttribute="bottom" secondItem="1xT-vl-sQp" secondAttribute="bottom" constant="20" id="7vg-42-5oO"/>
                                     <constraint firstItem="eU0-LW-AnG" firstAttribute="leading" secondItem="FaV-kz-PEs" secondAttribute="leading" id="E40-Ul-MEV"/>
+                                    <constraint firstItem="WHW-J5-8gq" firstAttribute="leading" secondItem="FaV-kz-PEs" secondAttribute="leading" constant="10" id="FQu-Xp-l7a"/>
+                                    <constraint firstItem="WHW-J5-8gq" firstAttribute="top" secondItem="USb-OF-Gaq" secondAttribute="bottom" constant="1" id="KVN-cR-x3K"/>
+                                    <constraint firstItem="USb-OF-Gaq" firstAttribute="centerX" secondItem="WHW-J5-8gq" secondAttribute="centerX" id="Vbh-0w-Bvo"/>
                                     <constraint firstItem="1xT-vl-sQp" firstAttribute="centerX" secondItem="FaV-kz-PEs" secondAttribute="centerX" id="bUe-Dp-BNI"/>
                                     <constraint firstItem="LAs-iQ-u1X" firstAttribute="leading" secondItem="FaV-kz-PEs" secondAttribute="leading" id="dr0-zN-pwa"/>
-                                    <constraint firstAttribute="trailing" secondItem="WHW-J5-8gq" secondAttribute="trailing" constant="10" id="gsu-fn-Jei"/>
                                     <constraint firstItem="LAs-iQ-u1X" firstAttribute="top" secondItem="FaV-kz-PEs" secondAttribute="top" id="gvj-gm-XbO"/>
+                                    <constraint firstItem="WHW-J5-8gq" firstAttribute="top" secondItem="FaV-kz-PEs" secondAttribute="top" constant="33" id="lWV-vn-0kj"/>
                                     <constraint firstAttribute="trailing" secondItem="eU0-LW-AnG" secondAttribute="trailing" id="qQA-Ix-Ge1"/>
                                     <constraint firstAttribute="bottom" secondItem="eU0-LW-AnG" secondAttribute="bottom" constant="50" id="r6E-QV-nj7"/>
                                     <constraint firstAttribute="trailing" secondItem="LAs-iQ-u1X" secondAttribute="trailing" id="v8j-JB-2Io"/>
-                                    <constraint firstItem="USb-OF-Gaq" firstAttribute="leading" secondItem="FaV-kz-PEs" secondAttribute="leading" constant="10" id="zNy-EW-uZN"/>
                                 </constraints>
                             </view>
                         </subviews>

+ 2 - 2
Share/NCShareExtension.swift

@@ -82,8 +82,8 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
         emptyDataSet = NCEmptyDataSet.init(view: collectionView, offset: -50, delegate: self)
 
         separatorView.backgroundColor = NCBrandColor.shared.separator
-        
-        createFolderButton.setTitle(NSLocalizedString("_create_folder_", comment: ""), for: .normal)
+        tableView.separatorStyle = UITableViewCell.SeparatorStyle.none
+        createFolderLabel.text = NSLocalizedString("_create_folder_", comment: "")
         uploadButton.setTitle(NSLocalizedString("_save_files_", comment: ""), for: .normal)
         
         // LOG