Browse Source

modify view more menu

Marino Faggiana 8 years ago
parent
commit
d69ca2c304

+ 1 - 1
iOSClient/Brand/CCNextcloudImages.h

@@ -27,4 +27,4 @@
 #define image_brandNavigationController         @"nextcloud_navigationcontroller"
 #define image_brandNavigationControllerOffline  @"nextcloud_navigationcontroller_offline"
 #define image_brandBackgroundLite               @"nextcloud_lite"
-#define image_brandLogoMenu                     @"nextcloud_background"
+#define image_brandMenuMoreBackground           @"MoreBackground"

+ 1 - 1
iOSClient/Images.xcassets/nextcloud_background.imageset/Contents.json → iOSClient/Images.xcassets/MoreBackground.imageset/Contents.json

@@ -6,7 +6,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "nextcloudBackground@2x.jpg",
+      "filename" : "MoreBackground@2x.jpg",
       "scale" : "2x"
     },
     {

BIN
iOSClient/Images.xcassets/MoreBackground.imageset/MoreBackground@2x.jpg


BIN
iOSClient/Images.xcassets/moreActivity.imageset/moreActivity@2x.png


BIN
iOSClient/Images.xcassets/moreExternalSite.imageset/moreExternalSite@2x.png


BIN
iOSClient/Images.xcassets/moreLocalStorage.imageset/moreLocalStorage@2x.png


BIN
iOSClient/Images.xcassets/moreSettings.imageset/moreSettings@2x.png


BIN
iOSClient/Images.xcassets/moreSettingsExternalSite.imageset/moreSettingsExternalSite@2x.png


BIN
iOSClient/Images.xcassets/moreTransfers.imageset/moreTransfers@2x.png


BIN
iOSClient/Images.xcassets/nextcloud_background.imageset/nextcloudBackground@2x.jpg


+ 6 - 2
iOSClient/Main/CCMore.swift

@@ -50,7 +50,9 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         tableView.delegate = self
         tableView.dataSource = self
         
-        imageLogo.image = UIImage.init(named: image_brandLogoMenu)
+        tableView.separatorColor = Constant.GlobalConstants.k_Color_Seperator
+        
+        imageLogo.image = UIImage.init(named: image_brandMenuMoreBackground)
         
         let tap = UITapGestureRecognizer(target: self, action: #selector(tapLabelQuotaExternalSite))
         labelQuotaExternalSite.isUserInteractionEnabled = true
@@ -188,11 +190,13 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         
         let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! CCCellMore
 
-        // change color selection
+        // change color selection and disclosure indicator
         let selectionColor : UIView = UIView.init()
         selectionColor.backgroundColor = Constant.GlobalConstants.k_Color_SelectBackgrond
         cell.selectedBackgroundView = selectionColor
         
+        cell.accessoryType = UITableViewCellAccessoryType.disclosureIndicator
+        
         // Menu Normal
         if (indexPath.section == 0) {
             

+ 7 - 6
iOSClient/Main/Main.storyboard

@@ -67,21 +67,22 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nextcloud_background" translatesAutoresizingMaskIntoConstraints="NO" id="cxb-Vw-8zb">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="MoreBackground" translatesAutoresizingMaskIntoConstraints="NO" id="cxb-Vw-8zb">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="100" id="mmt-Ka-rkQ"/>
                                 </constraints>
                             </imageView>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="50" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="Xym-IM-aqh">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" rowHeight="50" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="Xym-IM-aqh">
                                 <rect key="frame" x="0.0" y="100" width="375" height="460"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                                <color key="separatorColor" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="50" id="zQQ-52-W9I" customClass="CCCellMore" customModule="Nextcloud" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="56" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zQQ-52-W9I" id="Zho-os-HYj">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="RZt-EQ-32U">
@@ -809,10 +810,10 @@
         </scene>
     </scenes>
     <resources>
+        <image name="MoreBackground" width="225" height="150"/>
         <image name="Plus" width="40" height="40"/>
         <image name="avatar" width="25" height="25"/>
         <image name="fileNextcloud" width="25" height="25"/>
-        <image name="nextcloud_background" width="960" height="640"/>
         <image name="nextcloud_lite" width="223" height="157"/>
         <image name="tabBarFavorite" width="25" height="25"/>
         <image name="tabBarMore" width="25" height="25"/>