New menu More

iOSClient/AppDelegate.m

@@ -857,11 +857,11 @@
     item.image = [UIImage imageNamed:image_tabBarPhotos];
     item.selectedImage = [UIImage imageNamed:image_tabBarPhotos];
     
-    // Settings
-    item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexSettings];
-    [item setTitle:NSLocalizedString(@"_settings_", nil)];
-    item.image = [UIImage imageNamed:image_tabBarSettings];
-    item.selectedImage = [UIImage imageNamed:image_tabBarSettings];
+    // More
+    item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexMore];
+    [item setTitle:NSLocalizedString(@"_more_", nil)];
+    item.image = [UIImage imageNamed:image_tabBarMore];
+    item.selectedImage = [UIImage imageNamed:image_tabBarMore];
     
     // Plus Button
     UIImage *buttonImage = [UIImage imageNamed:image_tabBarPlus];    

iOSClient/CCGlobal.h

@@ -249,7 +249,6 @@ extern NSString *const urlBaseUploadDB;
 #define k_tabBarApplicationIndexOffline                 1
 #define k_tabBarApplicationIndexHide                    2
 #define k_tabBarApplicationIndexPhotos                  3
-#define k_tabBarApplicationIndexSettings                4
 #define k_tabBarApplicationIndexMore                    4
 
 #define k_keyFileNameMask                               @"fileNameMask"

iOSClient/Main/Main.storyboard

@@ -33,11 +33,11 @@
                         <viewControllerLayoutGuide type="bottom" id="EGW-gb-08A"/>
                     </layoutGuides>
                     <view key="view" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="qPP-0c-bH9">
-                        <rect key="frame" x="0.0" y="64" width="384" height="554"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="RbN-9l-HP2">
-                                <rect key="frame" x="0.0" y="-66" width="384" height="620"/>
+                                <rect key="frame" x="0.0" y="-46" width="375" height="713"/>
                                 <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </tableView>
                         </subviews>
@@ -63,7 +63,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="wVn-RD-GD2" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="9213" y="1218"/>
+            <point key="canvasLocation" x="10542" y="1620"/>
         </scene>
         <!--More-->
         <scene sceneID="Mdr-ch-zRI">
@@ -78,7 +78,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nextcloudBackground" translatesAutoresizingMaskIntoConstraints="NO" id="cxb-Vw-8zb">
-                                <rect key="frame" x="0.0" y="20" width="375" height="166"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="122"/>
                             </imageView>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Xym-IM-aqh">
                                 <rect key="frame" x="0.0" y="194" width="375" height="413"/>
@@ -152,6 +152,7 @@
                             <constraint firstItem="cxb-Vw-8zb" firstAttribute="leading" secondItem="XtC-Je-LUc" secondAttribute="leading" id="qyg-dI-shE"/>
                         </constraints>
                     </view>
+                    <navigationItem key="navigationItem" id="170-MG-QpZ"/>
                     <connections>
                         <outlet property="labelQuota" destination="WdB-hd-mrv" id="E8O-S8-Hh2"/>
                         <outlet property="progressQuota" destination="HgC-Ub-Dtb" id="l5v-Nu-A4I"/>
@@ -160,7 +161,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="D6O-WR-IEL" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="9872.7999999999993" y="1217.5412293853074"/>
+            <point key="canvasLocation" x="9212" y="1218"/>
         </scene>
         <!--Offline Container-->
         <scene sceneID="AYB-62-j4s">
@@ -371,7 +372,7 @@
                         <viewControllerLayoutGuide type="bottom" id="hEi-St-jlW"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="dTI-9C-Bf2">
-                        <rect key="frame" x="0.0" y="64" width="384" height="554"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
@@ -391,7 +392,7 @@
                         <viewControllerLayoutGuide type="bottom" id="qyW-zc-26J"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="y8W-PN-QtS">
-                        <rect key="frame" x="0.0" y="64" width="384" height="554"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
@@ -411,7 +412,7 @@
                         <viewControllerLayoutGuide type="bottom" id="mUa-nu-y9y"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="WFy-lj-QJi">
-                        <rect key="frame" x="0.0" y="64" width="384" height="554"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
@@ -431,7 +432,7 @@
                         <viewControllerLayoutGuide type="bottom" id="MYl-TL-mVB"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="DkJ-LZ-yPy">
-                        <rect key="frame" x="0.0" y="64" width="384" height="554"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
@@ -460,7 +461,7 @@
                         <segue destination="hwM-4d-Afb" kind="relationship" relationship="viewControllers" id="tds-0Q-7Zf"/>
                         <segue destination="Cc7-4O-z6Q" kind="relationship" relationship="viewControllers" id="YKg-LH-tor"/>
                         <segue destination="Npr-vu-PSD" kind="relationship" relationship="viewControllers" id="XeU-GF-etm"/>
-                        <segue destination="ftT-7F-lfU" kind="relationship" relationship="viewControllers" id="z8K-RX-gJH"/>
+                        <segue destination="1Z8-Bx-Dqo" kind="relationship" relationship="viewControllers" id="z6l-ei-IMY"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="d2B-Yg-rp2" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -657,27 +658,6 @@
             </objects>
             <point key="canvasLocation" x="8572" y="327"/>
         </scene>
-        <!--Settings-->
-        <scene sceneID="nEn-y9-HDF">
-            <objects>
-                <navigationController extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="ftT-7F-lfU" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Settings" image="tabBarSettings" id="Yua-ga-FRJ"/>
-                    <toolbarItems/>
-                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-                    <size key="freeformSize" width="384" height="667"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="Gr7-lE-Txr">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="amx-XG-NId" kind="relationship" relationship="rootViewController" id="Qwl-Zd-dt3"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="5WQ-nE-llq" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="9213" y="327"/>
-        </scene>
         <!--Manage Synchronizations-->
         <scene sceneID="rlM-Pz-rta">
             <objects>
@@ -687,7 +667,7 @@
                         <viewControllerLayoutGuide type="bottom" id="uoD-Vb-rfP"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="cO8-G4-hHt">
-                        <rect key="frame" x="0.0" y="64" width="384" height="554"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
@@ -707,7 +687,7 @@
                         <viewControllerLayoutGuide type="bottom" id="wiG-3f-6XF"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="LNE-IV-JjC">
-                        <rect key="frame" x="0.0" y="64" width="384" height="554"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
@@ -737,6 +717,25 @@
             </objects>
             <point key="canvasLocation" x="7935" y="327"/>
         </scene>
+        <!--More-->
+        <scene sceneID="4RE-f1-SKU">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="1Z8-Bx-Dqo" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="More" image="tabBarMore" id="U4f-qS-cgh"/>
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="yVo-p8-ApS">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="9DM-ts-oJu" kind="relationship" relationship="rootViewController" id="KD8-1A-v76"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="D7n-Z1-9wU" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="9212" y="326"/>
+        </scene>
     </scenes>
     <resources>
         <image name="Plus" width="40" height="40"/>
@@ -744,8 +743,8 @@
         <image name="fileNextcloud" width="25" height="25"/>
         <image name="nextcloudBackground" width="960" height="640"/>
         <image name="tabBarFavorite" width="25" height="25"/>
+        <image name="tabBarMore" width="25" height="25"/>
         <image name="tabBarPhotos" width="25" height="21"/>
-        <image name="tabBarSettings" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="45n-bF-9RO"/>