Marino Faggiana 8 жил өмнө
parent
commit
ca7d5889c9
23 өөрчлөгдсөн 34 нэмэгдсэн , 39 устгасан
  1. 0 2
      Nextcloud.xcodeproj/project.pbxproj
  2. 1 1
      iOSClient/Images.xcassets/buttonDown.imageset/Contents.json
  3. BIN
      iOSClient/Images.xcassets/buttonDown.imageset/More_9a9a9a_50.png
  4. BIN
      iOSClient/Images.xcassets/buttonDown.imageset/buttonDown.png
  5. BIN
      iOSClient/Images.xcassets/buttonDown.imageset/buttonDown@2x.png
  6. BIN
      iOSClient/Images.xcassets/buttonDown.imageset/buttonDown@3x.png
  7. 3 5
      iOSClient/Images.xcassets/nextcloudLogin.imageset/Contents.json
  8. BIN
      iOSClient/Images.xcassets/nextcloudLogin.imageset/ImageLoginNextcloud.png
  9. BIN
      iOSClient/Images.xcassets/nextcloudLogin.imageset/ImageLoginNextcloud@2x.png
  10. BIN
      iOSClient/Images.xcassets/nextcloudLogin.imageset/ImageLoginNextcloud@3x.png
  11. BIN
      iOSClient/Images.xcassets/nextcloudLogin.imageset/nextcloudLogin@2x.png
  12. 0 2
      iOSClient/Images.xcassets/nextcloud_lite.imageset/Contents.json
  13. BIN
      iOSClient/Images.xcassets/nextcloud_lite.imageset/nextcloud_lite.png
  14. BIN
      iOSClient/Images.xcassets/nextcloud_lite.imageset/nextcloud_lite@2x.png
  15. BIN
      iOSClient/Images.xcassets/nextcloud_lite.imageset/nextcloud_lite@3x.png
  16. 2 4
      iOSClient/Images.xcassets/nextcloudlaunchscreen.imageset/Contents.json
  17. BIN
      iOSClient/Images.xcassets/nextcloudlaunchscreen.imageset/nextcloudlaunchscreen.png
  18. BIN
      iOSClient/Images.xcassets/nextcloudlaunchscreen.imageset/nextcloudlaunchscreen@2x.png
  19. BIN
      iOSClient/Images.xcassets/nextcloudlaunchscreen.imageset/nextcloudlaunchscreen@3x.png
  20. 4 4
      iOSClient/LaunchScreenNextcloud.xib
  21. 1 1
      iOSClient/Login/CCLogin.storyboard
  22. 18 18
      iOSClient/Offline/CCCellOffline.xib
  23. 5 2
      iOSClient/Offline/CCOfflinePageContent.m

+ 0 - 2
Nextcloud.xcodeproj/project.pbxproj

@@ -1086,7 +1086,6 @@
 		F721372E1BAFF0920012B613 /* CCPatenteGuida.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPatenteGuida.m; sourceTree = "<group>"; };
 		F721372F1BAFF0920012B613 /* CCTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTemplates.h; sourceTree = "<group>"; };
 		F72137301BAFF0920012B613 /* CCTemplates.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTemplates.m; sourceTree = "<group>"; };
-		F7229B461DF71BA800E8C4E7 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = SOURCE_ROOT; };
 		F7229B491DF71BB300E8C4E7 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = SOURCE_ROOT; };
 		F7253FC81E38BAF20084135B /* JSAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAlertView.h; sourceTree = "<group>"; };
 		F7253FC91E38BAF20084135B /* JSAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSAlertView.m; sourceTree = "<group>"; };
@@ -3358,7 +3357,6 @@
 				F76344751BF259A800188725 /* synchronized.gif */,
 				F7D154271E2392A300202FD9 /* Nextcloud-Bridging-Header.h */,
 				F75CDBF51DF063AD00116AD0 /* .gitignore */,
-				F7229B461DF71BA800E8C4E7 /* ChangeLog */,
 				F7229B491DF71BB300E8C4E7 /* AUTHORS */,
 				F78BFECA1D3111B800E513CF /* LaunchScreenNextcloud.xib */,
 				F77D49A71DC238E500CDC568 /* loading@2x.gif */,

+ 1 - 1
iOSClient/Images.xcassets/buttonDown.imageset/Contents.json

@@ -7,7 +7,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "buttonDown@2x.png",
+      "filename" : "More_9a9a9a_50.png",
       "scale" : "2x"
     },
     {

BIN
iOSClient/Images.xcassets/buttonDown.imageset/More_9a9a9a_50.png


BIN
iOSClient/Images.xcassets/buttonDown.imageset/buttonDown.png


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


BIN
iOSClient/Images.xcassets/buttonDown.imageset/buttonDown@3x.png


+ 3 - 5
iOSClient/Images.xcassets/nextcloudLogin.imageset/Contents.json

@@ -2,18 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "ImageLoginNextcloud.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "ImageLoginNextcloud@2x.png",
+      "filename" : "nextcloudLogin@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "ImageLoginNextcloud@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

BIN
iOSClient/Images.xcassets/nextcloudLogin.imageset/ImageLoginNextcloud.png


BIN
iOSClient/Images.xcassets/nextcloudLogin.imageset/ImageLoginNextcloud@2x.png


BIN
iOSClient/Images.xcassets/nextcloudLogin.imageset/ImageLoginNextcloud@3x.png


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


+ 0 - 2
iOSClient/Images.xcassets/nextcloud_lite.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "nextcloud_lite.png",
       "scale" : "1x"
     },
     {
@@ -12,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "nextcloud_lite@3x.png",
       "scale" : "3x"
     }
   ],

BIN
iOSClient/Images.xcassets/nextcloud_lite.imageset/nextcloud_lite.png


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


BIN
iOSClient/Images.xcassets/nextcloud_lite.imageset/nextcloud_lite@3x.png


+ 2 - 4
iOSClient/Images.xcassets/nextcloudlaunchscreen.imageset/Contents.json

@@ -2,8 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "nextcloudlaunchscreen.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
@@ -12,8 +11,7 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "nextcloudlaunchscreen@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

BIN
iOSClient/Images.xcassets/nextcloudlaunchscreen.imageset/nextcloudlaunchscreen.png


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


BIN
iOSClient/Images.xcassets/nextcloudlaunchscreen.imageset/nextcloudlaunchscreen@3x.png


+ 4 - 4
iOSClient/LaunchScreenNextcloud.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -23,7 +23,7 @@
                     </constraints>
                 </imageView>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" red="0.0" green="0.50980392156862742" blue="0.78823529411764703" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="centerX" secondItem="Rrv-MP-hCW" secondAttribute="centerX" id="0bC-RK-gM4"/>
                 <constraint firstAttribute="centerY" secondItem="Rrv-MP-hCW" secondAttribute="centerY" id="Uob-Sg-luZ"/>
@@ -34,6 +34,6 @@
         </view>
     </objects>
     <resources>
-        <image name="nextcloudlaunchscreen" width="200" height="86"/>
+        <image name="nextcloudlaunchscreen" width="223" height="157"/>
     </resources>
 </document>

+ 1 - 1
iOSClient/Login/CCLogin.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>

+ 18 - 18
iOSClient/Offline/CCCellOffline.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -16,12 +16,12 @@
             <rect key="frame" x="0.0" y="0.0" width="600" height="60"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2" id="sQq-jC-UEV">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="600" height="59"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QNC-8X-DAC">
-                        <rect key="frame" x="56" y="11" width="486" height="16"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <rect key="frame" x="56" y="13" width="485" height="20"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -33,16 +33,16 @@
                         </constraints>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DQR-yN-JaH">
-                        <rect key="frame" x="37" y="39" width="15" height="15"/>
+                        <rect key="frame" x="37" y="40" width="15" height="15"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="15" id="O4C-De-dnI"/>
                             <constraint firstAttribute="height" constant="15" id="bun-Ao-Ysu"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" tag="102" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p7I-KN-FVZ">
-                        <rect key="frame" x="56" y="39" width="485" height="12"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                        <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <rect key="frame" x="56" y="33" width="485" height="15"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dhG-hb-z3n" userLabel="Offline Image View">
@@ -53,29 +53,29 @@
                         </constraints>
                     </imageView>
                     <button opaque="NO" alpha="0.40000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6B9-Jc-esJ" userLabel="buttonDown">
-                        <rect key="frame" x="549" y="18" width="25" height="25"/>
+                        <rect key="frame" x="541" y="0.0" width="60" height="60"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="25" id="PcN-jN-71v"/>
-                            <constraint firstAttribute="width" constant="25" id="bAG-EX-HKe"/>
+                            <constraint firstAttribute="height" constant="60" id="PcN-jN-71v"/>
+                            <constraint firstAttribute="width" constant="60" id="bAG-EX-HKe"/>
                         </constraints>
-                        <state key="normal" title="Button" image="buttonDown"/>
+                        <state key="normal" image="buttonDown"/>
                     </button>
                 </subviews>
                 <constraints>
                     <constraint firstItem="p7I-KN-FVZ" firstAttribute="leading" secondItem="DQR-yN-JaH" secondAttribute="trailing" constant="4" id="2xR-G4-B2S"/>
                     <constraint firstItem="dhG-hb-z3n" firstAttribute="top" secondItem="sQq-jC-UEV" secondAttribute="topMargin" constant="31" id="4Zy-SY-nfT"/>
-                    <constraint firstItem="QNC-8X-DAC" firstAttribute="trailing" secondItem="sQq-jC-UEV" secondAttribute="trailingMargin" constant="-50" id="7zt-c0-CsI"/>
-                    <constraint firstItem="6B9-Jc-esJ" firstAttribute="centerY" secondItem="5" secondAttribute="centerY" id="EoB-vw-kgn"/>
+                    <constraint firstItem="QNC-8X-DAC" firstAttribute="trailing" secondItem="sQq-jC-UEV" secondAttribute="trailingMargin" constant="-51" id="7zt-c0-CsI"/>
+                    <constraint firstItem="6B9-Jc-esJ" firstAttribute="centerY" secondItem="5" secondAttribute="centerY" constant="-1" id="EoB-vw-kgn"/>
                     <constraint firstAttribute="centerY" secondItem="5" secondAttribute="centerY" constant="-1.5" id="FQP-wg-vPF"/>
-                    <constraint firstItem="DQR-yN-JaH" firstAttribute="top" secondItem="p7I-KN-FVZ" secondAttribute="top" id="K6B-gJ-8Fp"/>
+                    <constraint firstItem="DQR-yN-JaH" firstAttribute="top" secondItem="p7I-KN-FVZ" secondAttribute="top" constant="6.5" id="K6B-gJ-8Fp"/>
                     <constraint firstItem="p7I-KN-FVZ" firstAttribute="leading" secondItem="5" secondAttribute="trailing" constant="8" symbolic="YES" id="K7G-0u-f8E"/>
-                    <constraint firstItem="5" firstAttribute="bottom" secondItem="p7I-KN-FVZ" secondAttribute="bottom" id="MuE-C8-4UJ"/>
+                    <constraint firstItem="5" firstAttribute="bottom" secondItem="p7I-KN-FVZ" secondAttribute="bottom" constant="3" id="MuE-C8-4UJ"/>
                     <constraint firstItem="QNC-8X-DAC" firstAttribute="leading" secondItem="5" secondAttribute="trailing" constant="8" symbolic="YES" id="UYc-Al-a4h"/>
                     <constraint firstItem="dhG-hb-z3n" firstAttribute="leading" secondItem="sQq-jC-UEV" secondAttribute="leadingMargin" constant="-4" id="dNM-6x-zkx"/>
                     <constraint firstItem="5" firstAttribute="leading" secondItem="sQq-jC-UEV" secondAttribute="leadingMargin" id="ha0-VA-fF9"/>
                     <constraint firstItem="p7I-KN-FVZ" firstAttribute="trailing" secondItem="sQq-jC-UEV" secondAttribute="trailingMargin" constant="-51" id="kaB-WS-bDl"/>
-                    <constraint firstItem="5" firstAttribute="top" secondItem="QNC-8X-DAC" secondAttribute="top" id="lyH-lh-z03"/>
-                    <constraint firstItem="6B9-Jc-esJ" firstAttribute="leading" secondItem="QNC-8X-DAC" secondAttribute="trailing" constant="7" id="mBS-nt-t6R"/>
+                    <constraint firstItem="5" firstAttribute="top" secondItem="QNC-8X-DAC" secondAttribute="top" constant="-2" id="lyH-lh-z03"/>
+                    <constraint firstItem="6B9-Jc-esJ" firstAttribute="leading" secondItem="QNC-8X-DAC" secondAttribute="trailing" id="mBS-nt-t6R"/>
                     <constraint firstItem="5" firstAttribute="top" secondItem="sQq-jC-UEV" secondAttribute="topMargin" constant="3" id="pRH-CQ-O4x"/>
                 </constraints>
             </tableViewCellContentView>

+ 5 - 2
iOSClient/Offline/CCOfflinePageContent.m

@@ -625,6 +625,7 @@
     [cell.buttonDown addTarget:self action:@selector(cellButtonDownWasTapped:) forControlEvents:UIControlEventTouchUpInside];
     
     // color and font
+    /*
     if (metadata.cryptated) {
         cell.labelTitle.textColor = COLOR_CRYPTOCLOUD;
         cell.labelInfoFile.textColor = [UIColor blackColor];
@@ -637,6 +638,7 @@
         cell.labelInfoFile.text = [CCUtility dateDiff:metadata.date];
         cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     }
+    */
     
     // File name
     cell.labelTitle.text = metadata.fileNamePrint;
@@ -658,8 +660,9 @@
     if (metadata.directory) {
         
         cell.labelInfoFile.text = [CCUtility dateDiff:metadata.date];
-        cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-        
+        cell.accessoryType = UITableViewCellAccessoryNone;
+        //cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+          
     } else {
         
         NSString *date = [CCUtility dateDiff:metadata.date];