Marino Faggiana 8 жил өмнө
parent
commit
dd45be49fa

+ 8 - 8
Nextcloud.xcodeproj/project.pbxproj

@@ -269,7 +269,6 @@
 		084215271E646E0200C8F4F3 /* HRBrightnessCursor.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F0DE11C889300008DAB36 /* HRBrightnessCursor.m */; };
 		084215281E646E0200C8F4F3 /* UIImage+Masking.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F04C61C889184008DAB36 /* UIImage+Masking.m */; };
 		084215291E646E0200C8F4F3 /* NSData+CommonCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F02AF1C889183008DAB36 /* NSData+CommonCrypto.m */; };
-		0842152A1E646E0200C8F4F3 /* CCOffline.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C00D461E2D0D0F0032160B /* CCOffline.m */; };
 		0842152B1E646E0200C8F4F3 /* CYRToken.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F0DDF1C889300008DAB36 /* CYRToken.m */; };
 		0842152C1E646E0200C8F4F3 /* AHKActionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = F72AAEC31E5C60C700BB17E1 /* AHKActionSheet.m */; };
 		0842152D1E646E0200C8F4F3 /* CTAssetsGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F06E521DBFACC600099AE9 /* CTAssetsGridView.m */; };
@@ -1095,7 +1094,6 @@
 		F7BF1B431D51E893000854F6 /* CCLogin.m in Sources */ = {isa = PBXBuildFile; fileRef = F7BF1B401D51E893000854F6 /* CCLogin.m */; };
 		F7C00D471E2D0D0F0032160B /* CCCellOffline.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C00D431E2D0D0F0032160B /* CCCellOffline.m */; };
 		F7C00D481E2D0D0F0032160B /* CCCellOffline.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7C00D441E2D0D0F0032160B /* CCCellOffline.xib */; };
-		F7C00D491E2D0D0F0032160B /* CCOffline.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C00D461E2D0D0F0032160B /* CCOffline.m */; };
 		F7C5259E1E3B45FA00FFE02C /* CCNotificationPushKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C5259D1E3B45FA00FFE02C /* CCNotificationPushKey.swift */; };
 		F7C525A01E3B48B700FFE02C /* CCNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7C5259F1E3B48B700FFE02C /* CCNotification.swift */; };
 		F7C525A21E3B6DA800FFE02C /* CCNotification.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7C525A11E3B6DA800FFE02C /* CCNotification.storyboard */; };
@@ -1196,6 +1194,8 @@
 		F7F6AC4E1E525AD300E8EB45 /* CCManageCryptoCloud.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F6AC4D1E525AD300E8EB45 /* CCManageCryptoCloud.m */; };
 		F7F801031D98205A007537BC /* CCCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F801011D98205A007537BC /* CCCertificate.m */; };
 		F7F801051D98205A007537BC /* CCCertificate.m in Sources */ = {isa = PBXBuildFile; fileRef = F7F801011D98205A007537BC /* CCCertificate.m */; };
+		F7FB5F131E66CDCB00389481 /* CCOfflineContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F121E66CDCB00389481 /* CCOfflineContainer.m */; };
+		F7FB5F141E66CDCB00389481 /* CCOfflineContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = F7FB5F121E66CDCB00389481 /* CCOfflineContainer.m */; };
 		F7FC7D561DC1F93800BB2C6A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F7FC7D551DC1F93800BB2C6A /* libz.tbd */; };
 		F7FC88FA1E140558006D0506 /* cryptocloud.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F78088E51DD3A1DB005C5A7C /* cryptocloud.xcdatamodeld */; };
 		F7FC88FB1E141A34006D0506 /* BKPasscodeView.strings in Resources */ = {isa = PBXBuildFile; fileRef = F72B60911A24F00B004EF66F /* BKPasscodeView.strings */; };
@@ -2032,8 +2032,6 @@
 		F7C00D421E2D0D0F0032160B /* CCCellOffline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCellOffline.h; sourceTree = "<group>"; };
 		F7C00D431E2D0D0F0032160B /* CCCellOffline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCCellOffline.m; sourceTree = "<group>"; };
 		F7C00D441E2D0D0F0032160B /* CCCellOffline.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CCCellOffline.xib; sourceTree = "<group>"; };
-		F7C00D451E2D0D0F0032160B /* CCOffline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCOffline.h; sourceTree = "<group>"; };
-		F7C00D461E2D0D0F0032160B /* CCOffline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCOffline.m; sourceTree = "<group>"; };
 		F7C00D4A1E2D10BB0032160B /* cryptocloud 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "cryptocloud 7.xcdatamodel"; sourceTree = "<group>"; };
 		F7C0F46E1C8880540059EC54 /* ShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ShareViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		F7C0F46F1C8880540059EC54 /* ShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ShareViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
@@ -2224,6 +2222,8 @@
 		F7F6AC4D1E525AD300E8EB45 /* CCManageCryptoCloud.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCManageCryptoCloud.m; sourceTree = "<group>"; };
 		F7F801001D98205A007537BC /* CCCertificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCertificate.h; sourceTree = "<group>"; };
 		F7F801011D98205A007537BC /* CCCertificate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCCertificate.m; sourceTree = "<group>"; };
+		F7FB5F111E66CDCB00389481 /* CCOfflineContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCOfflineContainer.h; sourceTree = "<group>"; };
+		F7FB5F121E66CDCB00389481 /* CCOfflineContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCOfflineContainer.m; sourceTree = "<group>"; };
 		F7FC7D551DC1F93800BB2C6A /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		F7FCFFD61D70798C000E6E29 /* CCPeekPop.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CCPeekPop.storyboard; sourceTree = "<group>"; };
 		F7FCFFDD1D707B83000E6E29 /* CCPeekPop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPeekPop.h; sourceTree = "<group>"; };
@@ -3592,8 +3592,8 @@
 				F7C00D421E2D0D0F0032160B /* CCCellOffline.h */,
 				F7C00D431E2D0D0F0032160B /* CCCellOffline.m */,
 				F7C00D441E2D0D0F0032160B /* CCCellOffline.xib */,
-				F7C00D451E2D0D0F0032160B /* CCOffline.h */,
-				F7C00D461E2D0D0F0032160B /* CCOffline.m */,
+				F7FB5F111E66CDCB00389481 /* CCOfflineContainer.h */,
+				F7FB5F121E66CDCB00389481 /* CCOfflineContainer.m */,
 				F7DA62AC1E41E666003E1740 /* CCOfflinePageContent.h */,
 				F7DA62AD1E41E666003E1740 /* CCOfflinePageContent.m */,
 				F7EC14791E5D9C0B0046F351 /* CCSynchronize.h */,
@@ -4864,6 +4864,7 @@
 				084214761E646E0200C8F4F3 /* CTAssetsGridViewFooter.m in Sources */,
 				084214771E646E0200C8F4F3 /* CTAssetsGridViewLayout.m in Sources */,
 				084214781E646E0200C8F4F3 /* CCOfflinePageContent.m in Sources */,
+				F7FB5F141E66CDCB00389481 /* CCOfflineContainer.m in Sources */,
 				084214791E646E0200C8F4F3 /* NYXImagesHelper.m in Sources */,
 				0842147A1E646E0200C8F4F3 /* XLFormTextView.m in Sources */,
 				0842147B1E646E0200C8F4F3 /* ZSSBarButtonItem.m in Sources */,
@@ -5041,7 +5042,6 @@
 				084215271E646E0200C8F4F3 /* HRBrightnessCursor.m in Sources */,
 				084215281E646E0200C8F4F3 /* UIImage+Masking.m in Sources */,
 				084215291E646E0200C8F4F3 /* NSData+CommonCrypto.m in Sources */,
-				0842152A1E646E0200C8F4F3 /* CCOffline.m in Sources */,
 				0842152B1E646E0200C8F4F3 /* CYRToken.m in Sources */,
 				0842152C1E646E0200C8F4F3 /* AHKActionSheet.m in Sources */,
 				0842152D1E646E0200C8F4F3 /* CTAssetsGridView.m in Sources */,
@@ -5447,6 +5447,7 @@
 				F7F06EB71DBFACC600099AE9 /* CTAssetsGridViewFooter.m in Sources */,
 				F7F06EB91DBFACC600099AE9 /* CTAssetsGridViewLayout.m in Sources */,
 				F7DA62AE1E41E666003E1740 /* CCOfflinePageContent.m in Sources */,
+				F7FB5F131E66CDCB00389481 /* CCOfflineContainer.m in Sources */,
 				F77B0E351D118A16002130FE /* NYXImagesHelper.m in Sources */,
 				F73CCE171DC13776007E38D8 /* XLFormTextView.m in Sources */,
 				F77B0E361D118A16002130FE /* ZSSBarButtonItem.m in Sources */,
@@ -5624,7 +5625,6 @@
 				F77B0ECB1D118A16002130FE /* HRBrightnessCursor.m in Sources */,
 				F77B0ECC1D118A16002130FE /* UIImage+Masking.m in Sources */,
 				F77B0ECE1D118A16002130FE /* NSData+CommonCrypto.m in Sources */,
-				F7C00D491E2D0D0F0032160B /* CCOffline.m in Sources */,
 				F77B0ECF1D118A16002130FE /* CYRToken.m in Sources */,
 				F72AAECA1E5C60C700BB17E1 /* AHKActionSheet.m in Sources */,
 				F7F06EB11DBFACC600099AE9 /* CTAssetsGridView.m in Sources */,

+ 2 - 2
iOSClient/AppDelegate.h

@@ -37,7 +37,7 @@
 #import "CCQuickActions.h"
 #import "CCMain.h"
 #import "CCPhotosCameraUpload.h"
-#import "CCOffline.h"
+#import "CCOfflineContainer.h"
 #import "CCSettings.h"
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate, BKPasscodeLockScreenManagerDelegate, BKPasscodeViewControllerDelegate, LMMediaPlayerViewDelegate, TWMessageBarStyleSheet>
@@ -129,7 +129,7 @@
 @property (nonatomic, strong) CCMain *homeMain;
 @property (nonatomic, strong) CCPhotosCameraUpload *activePhotosCameraUpload;
 @property (nonatomic, retain) CCDetail *activeDetail;
-@property (nonatomic, retain) CCOffline *activeOffline;
+@property (nonatomic, retain) CCOfflineContainer *activeOffline;
 @property (nonatomic, retain) CCSettings *activeSettings;
 
 @property (nonatomic, strong) NSMutableDictionary *listMainVC;

+ 1 - 1
iOSClient/AppDelegate.m

@@ -28,7 +28,7 @@
 #import "CCNetworking.h"
 #import "CCCoreData.h"
 #import "CCCrypto.h"
-#import "CCOffline.h"
+#import "CCOfflineContainer.h"
 #import "CCManageAsset.h"
 #import "CCGraphics.h"
 #import "CCPhotosCameraUpload.h"

+ 11 - 10
iOSClient/Main/Main.storyboard

@@ -65,10 +65,10 @@
             </objects>
             <point key="canvasLocation" x="9213" y="1218"/>
         </scene>
-        <!--Offline-->
+        <!--Offline Container-->
         <scene sceneID="AYB-62-j4s">
             <objects>
-                <viewController storyboardIdentifier="OfflineViewController" id="rwz-Z7-lr8" customClass="CCOffline" sceneMemberID="viewController">
+                <viewController id="rwz-Z7-lr8" customClass="CCOfflineContainer" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="dzn-ww-83z"/>
                         <viewControllerLayoutGuide type="bottom" id="tXj-pi-tXG"/>
@@ -455,7 +455,7 @@
         <scene sceneID="dMv-43-hWy">
             <objects>
                 <navigationController storyboardIdentifier="CCMainNC" extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="bSZ-tE-FEj" customClass="CCControlCenter" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="File" image="tabBarCryptoCloud" id="Zxv-aS-HGF"/>
+                    <tabBarItem key="tabBarItem" title="File" image="fileNextcloud" id="Zxv-aS-HGF"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="cj6-rT-wnB">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
@@ -470,11 +470,11 @@
             </objects>
             <point key="canvasLocation" x="5215" y="327"/>
         </scene>
-        <!--Offline-->
+        <!--Favorite-->
         <scene sceneID="YSr-JF-a0V">
             <objects>
                 <navigationController extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="hwM-4d-Afb" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Offline" image="tabBarOffline" id="o09-67-hwf"/>
+                    <tabBarItem key="tabBarItem" title="Favorite" image="tabBarFavorite" id="o09-67-hwf"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="MJw-Bn-5le">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
@@ -492,7 +492,7 @@
         <!--Offline Page Content-->
         <scene sceneID="33n-4d-goO">
             <objects>
-                <viewController storyboardIdentifier="OfflinePageContentViewController" id="6uw-SF-2Qu" customClass="CCOfflinePageContent" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="OfflinePageContent" id="6uw-SF-2Qu" customClass="CCOfflinePageContent" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="kXv-QP-Tlq"/>
                         <viewControllerLayoutGuide type="bottom" id="Y8a-Ua-b9s"/>
@@ -625,7 +625,7 @@
         <scene sceneID="cip-AF-Ks2">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Cc7-4O-z6Q" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" enabled="NO" title="" id="vIy-cM-ojV"/>
+                    <tabBarItem key="tabBarItem" enabled="NO" title="" image="Plus" id="vIy-cM-ojV"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="jCU-so-Np6">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -642,13 +642,14 @@
         </scene>
     </scenes>
     <resources>
+        <image name="Plus" width="40" height="40"/>
         <image name="cryptocloud_sfondo_iPad" width="256" height="187"/>
-        <image name="tabBarCryptoCloud" width="50" height="50"/>
-        <image name="tabBarOffline" width="25" height="25"/>
+        <image name="fileNextcloud" width="25" height="25"/>
+        <image name="tabBarFavorite" width="25" height="25"/>
         <image name="tabBarPhotos" width="25" height="25"/>
         <image name="tabBarSettings" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="YTW-Kz-l02"/>
+        <segue reference="45n-bF-9RO"/>
     </inferredMetricsTieBreakers>
 </document>

+ 2 - 2
iOSClient/Offline/CCOffline.h → iOSClient/Offline/CCOfflineContainer.h

@@ -1,5 +1,5 @@
 //
-//  CCOffline.h
+//  CCOfflineContainer.h
 //  Crypto Cloud Technology Nextcloud
 //
 //  Created by Marino Faggiana on 16/01/17.
@@ -25,7 +25,7 @@
 
 #import "CCOfflinePageContent.h"
 
-@interface CCOffline : UIViewController <UIPageViewControllerDataSource, UIPageViewControllerDelegate>
+@interface CCOfflineContainer : UIViewController <UIPageViewControllerDataSource, UIPageViewControllerDelegate>
 
 @property (strong, nonatomic) UIPageViewController *pageViewController;
 @property (strong, nonatomic) NSArray *pageType;

+ 5 - 5
iOSClient/Offline/CCOffline.m → iOSClient/Offline/CCOfflineContainer.m

@@ -1,5 +1,5 @@
 //
-//  CCOffline.m
+//  CCOfflineContainer.m
 //  Crypto Cloud Technology Nextcloud
 //
 //  Created by Marino Faggiana on 16/01/17.
@@ -21,7 +21,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "CCOffline.h"
+#import "CCOfflineContainer.h"
 #import "AppDelegate.h"
 #import "CCSynchronize.h"
 
@@ -33,14 +33,14 @@
 
 #pragma GCC diagnostic ignored "-Wundeclared-selector"
 
-@interface CCOffline ()
+@interface CCOfflineContainer ()
 {
     UIPageControl *pageControl;
 }
 
 @end
 
-@implementation CCOffline
+@implementation CCOfflineContainer
 
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Init =====
@@ -117,7 +117,7 @@
     }
     
     // Create a new view controller and pass suitable data.
-    CCOfflinePageContent *pageContentViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"OfflinePageContentViewController"];
+    CCOfflinePageContent *pageContentViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"OfflinePageContent"];
     
     pageContentViewController.pageIndex = index;
     pageContentViewController.pageType = self.pageType[index];

+ 1 - 1
iOSClient/Offline/CCOfflinePageContent.m

@@ -661,7 +661,7 @@
 
 -(void)performSegueDirectoryWithControlPasscode
 {
-    CCOfflinePageContent *vc = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"OfflinePageContentViewController"];
+    CCOfflinePageContent *vc = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"OfflinePageContent"];
     
     NSString *serverUrl;