瀏覽代碼

change classname

Marino Faggiana 8 年之前
父節點
當前提交
c8feb719d1

+ 14 - 14
Nextcloud.xcodeproj/project.pbxproj

@@ -272,7 +272,7 @@
 		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 */; };
-		0842152E1E646E0200C8F4F3 /* CCControlCenterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D6A08C1D82DBFA0045AD1A /* CCControlCenterCell.m */; };
+		0842152E1E646E0200C8F4F3 /* CCControlCenterTransferCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D6A08C1D82DBFA0045AD1A /* CCControlCenterTransferCell.m */; };
 		0842152F1E646E0200C8F4F3 /* Acknowledgements.m in Sources */ = {isa = PBXBuildFile; fileRef = F7ACE42A1BAC0268006C0017 /* Acknowledgements.m */; };
 		084215301E646E0200C8F4F3 /* PPImageScrollingCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F05211C889184008DAB36 /* PPImageScrollingCellView.m */; };
 		084215311E646E0200C8F4F3 /* LMMediaPlayerHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F0F311C889339008DAB36 /* LMMediaPlayerHelper.m */; };
@@ -326,7 +326,7 @@
 		084215631E646E0200C8F4F3 /* ZSSviewsource.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0DD51C889300008DAB36 /* ZSSviewsource.png */; };
 		084215641E646E0200C8F4F3 /* ZSSforcejustify@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0D981C889300008DAB36 /* ZSSforcejustify@2x.png */; };
 		084215651E646E0200C8F4F3 /* ZSSh1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F70F0D9A1C889300008DAB36 /* ZSSh1@2x.png */; };
-		084215661E646E0200C8F4F3 /* CCControlCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7D6A08D1D82DBFA0045AD1A /* CCControlCenterCell.xib */; };
+		084215661E646E0200C8F4F3 /* CCControlCenterTransferCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7D6A08D1D82DBFA0045AD1A /* CCControlCenterTransferCell.xib */; };
 		084215671E646E0200C8F4F3 /* ImageSelectedSmallOn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7F54CBD1E5B14C700E19C62 /* ImageSelectedSmallOn@3x.png */; };
 		084215681E646E0200C8F4F3 /* Intro.strings in Resources */ = {isa = PBXBuildFile; fileRef = F744BE9F1BEBB69F004FFF66 /* Intro.strings */; };
 		084215691E646E0200C8F4F3 /* UIBarButtonItemArrowLeft.png in Resources */ = {isa = PBXBuildFile; fileRef = F7F54CC41E5B14C700E19C62 /* UIBarButtonItemArrowLeft.png */; };
@@ -1106,8 +1106,8 @@
 		F7D2677C1E157053005ACB7E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7F67BB81A24D27800EE80DA /* Images.xcassets */; };
 		F7D267871E157057005ACB7E /* Nextcloud.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F7596C771D128FC80092A6B8 /* Nextcloud.xcassets */; };
 		F7D6A0911D82DBFA0045AD1A /* CCControlCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D6A08A1D82DBFA0045AD1A /* CCControlCenter.m */; };
-		F7D6A0931D82DBFA0045AD1A /* CCControlCenterCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D6A08C1D82DBFA0045AD1A /* CCControlCenterCell.m */; };
-		F7D6A0951D82DBFA0045AD1A /* CCControlCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7D6A08D1D82DBFA0045AD1A /* CCControlCenterCell.xib */; };
+		F7D6A0931D82DBFA0045AD1A /* CCControlCenterTransferCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D6A08C1D82DBFA0045AD1A /* CCControlCenterTransferCell.m */; };
+		F7D6A0951D82DBFA0045AD1A /* CCControlCenterTransferCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7D6A08D1D82DBFA0045AD1A /* CCControlCenterTransferCell.xib */; };
 		F7D6A0971D82DBFA0045AD1A /* CCMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = F7D6A08F1D82DBFA0045AD1A /* CCMenu.m */; };
 		F7DA62AE1E41E666003E1740 /* CCOfflinePageContent.m in Sources */ = {isa = PBXBuildFile; fileRef = F7DA62AD1E41E666003E1740 /* CCOfflinePageContent.m */; };
 		F7DCA1C81D32BD4100E48D39 /* Share Ext Nextcloud.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = F7DCA1B81D32BD4100E48D39 /* Share Ext Nextcloud.entitlements */; };
@@ -2077,9 +2077,9 @@
 		F7D154271E2392A300202FD9 /* Nextcloud-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Nextcloud-Bridging-Header.h"; sourceTree = "<group>"; };
 		F7D6A0891D82DBFA0045AD1A /* CCControlCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlCenter.h; sourceTree = "<group>"; };
 		F7D6A08A1D82DBFA0045AD1A /* CCControlCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCControlCenter.m; sourceTree = "<group>"; };
-		F7D6A08B1D82DBFA0045AD1A /* CCControlCenterCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlCenterCell.h; sourceTree = "<group>"; };
-		F7D6A08C1D82DBFA0045AD1A /* CCControlCenterCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCControlCenterCell.m; sourceTree = "<group>"; };
-		F7D6A08D1D82DBFA0045AD1A /* CCControlCenterCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CCControlCenterCell.xib; sourceTree = "<group>"; };
+		F7D6A08B1D82DBFA0045AD1A /* CCControlCenterTransferCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlCenterTransferCell.h; sourceTree = "<group>"; };
+		F7D6A08C1D82DBFA0045AD1A /* CCControlCenterTransferCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCControlCenterTransferCell.m; sourceTree = "<group>"; };
+		F7D6A08D1D82DBFA0045AD1A /* CCControlCenterTransferCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CCControlCenterTransferCell.xib; sourceTree = "<group>"; };
 		F7D6A08E1D82DBFA0045AD1A /* CCMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMenu.h; sourceTree = "<group>"; };
 		F7D6A08F1D82DBFA0045AD1A /* CCMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCMenu.m; sourceTree = "<group>"; };
 		F7D722AA1D11B6DA009F1A35 /* CCImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCImages.h; sourceTree = "<group>"; };
@@ -3665,9 +3665,9 @@
 			children = (
 				F7D6A0891D82DBFA0045AD1A /* CCControlCenter.h */,
 				F7D6A08A1D82DBFA0045AD1A /* CCControlCenter.m */,
-				F7D6A08B1D82DBFA0045AD1A /* CCControlCenterCell.h */,
-				F7D6A08C1D82DBFA0045AD1A /* CCControlCenterCell.m */,
-				F7D6A08D1D82DBFA0045AD1A /* CCControlCenterCell.xib */,
+				F7D6A08B1D82DBFA0045AD1A /* CCControlCenterTransferCell.h */,
+				F7D6A08C1D82DBFA0045AD1A /* CCControlCenterTransferCell.m */,
+				F7D6A08D1D82DBFA0045AD1A /* CCControlCenterTransferCell.xib */,
 				F7D6A08E1D82DBFA0045AD1A /* CCMenu.h */,
 				F7D6A08F1D82DBFA0045AD1A /* CCMenu.m */,
 			);
@@ -4399,7 +4399,7 @@
 				084215631E646E0200C8F4F3 /* ZSSviewsource.png in Resources */,
 				084215641E646E0200C8F4F3 /* ZSSforcejustify@2x.png in Resources */,
 				084215651E646E0200C8F4F3 /* ZSSh1@2x.png in Resources */,
-				084215661E646E0200C8F4F3 /* CCControlCenterCell.xib in Resources */,
+				084215661E646E0200C8F4F3 /* CCControlCenterTransferCell.xib in Resources */,
 				084215671E646E0200C8F4F3 /* ImageSelectedSmallOn@3x.png in Resources */,
 				084215681E646E0200C8F4F3 /* Intro.strings in Resources */,
 				084215691E646E0200C8F4F3 /* UIBarButtonItemArrowLeft.png in Resources */,
@@ -4641,7 +4641,7 @@
 				F77B0F141D118A16002130FE /* ZSSviewsource.png in Resources */,
 				F77B0F151D118A16002130FE /* ZSSforcejustify@2x.png in Resources */,
 				F77B0F171D118A16002130FE /* ZSSh1@2x.png in Resources */,
-				F7D6A0951D82DBFA0045AD1A /* CCControlCenterCell.xib in Resources */,
+				F7D6A0951D82DBFA0045AD1A /* CCControlCenterTransferCell.xib in Resources */,
 				F7F54CF31E5B14C700E19C62 /* ImageSelectedSmallOn@3x.png in Resources */,
 				F77B0F181D118A16002130FE /* Intro.strings in Resources */,
 				F7F54CFA1E5B14C700E19C62 /* UIBarButtonItemArrowLeft.png in Resources */,
@@ -5067,7 +5067,7 @@
 				0842152B1E646E0200C8F4F3 /* CYRToken.m in Sources */,
 				0842152C1E646E0200C8F4F3 /* AHKActionSheet.m in Sources */,
 				0842152D1E646E0200C8F4F3 /* CTAssetsGridView.m in Sources */,
-				0842152E1E646E0200C8F4F3 /* CCControlCenterCell.m in Sources */,
+				0842152E1E646E0200C8F4F3 /* CCControlCenterTransferCell.m in Sources */,
 				0842152F1E646E0200C8F4F3 /* Acknowledgements.m in Sources */,
 				084215301E646E0200C8F4F3 /* PPImageScrollingCellView.m in Sources */,
 				084215311E646E0200C8F4F3 /* LMMediaPlayerHelper.m in Sources */,
@@ -5660,7 +5660,7 @@
 				F77B0ECF1D118A16002130FE /* CYRToken.m in Sources */,
 				F72AAECA1E5C60C700BB17E1 /* AHKActionSheet.m in Sources */,
 				F7F06EB11DBFACC600099AE9 /* CTAssetsGridView.m in Sources */,
-				F7D6A0931D82DBFA0045AD1A /* CCControlCenterCell.m in Sources */,
+				F7D6A0931D82DBFA0045AD1A /* CCControlCenterTransferCell.m in Sources */,
 				F77B0ED11D118A16002130FE /* Acknowledgements.m in Sources */,
 				F77B0ED31D118A16002130FE /* PPImageScrollingCellView.m in Sources */,
 				F77B0ED41D118A16002130FE /* LMMediaPlayerHelper.m in Sources */,

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -2550,7 +2550,7 @@
     
     if (indexPath) {
         
-        CCControlCenterCell *cell = (CCControlCenterCell *)[self.tableView cellForRowAtIndexPath:indexPath];
+        CCControlCenterTransferCell *cell = (CCControlCenterTransferCell *)[self.tableView cellForRowAtIndexPath:indexPath];
         
         if (cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
         else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;

+ 6 - 2
iOSClient/MenuAccount+ControlCenter/CCControlCenter.h

@@ -24,15 +24,19 @@
 #import <UIKit/UIKit.h>
 
 #import "CCGlobal.h"
-#import "CCControlCenterCell.h"
+#import "CCControlCenterTransferCell.h"
 #import "CCSection.h"
 #import "CCMetadata.h"
 
-@interface CCControlCenter : UINavigationController <UITableViewDataSource, UITableViewDelegate>
+@interface CCControlCenter : UINavigationController <UITableViewDataSource, UITableViewDelegate, UIPageViewControllerDataSource, UIPageViewControllerDelegate>
 
 @property (nonatomic) BOOL isPopGesture;
 @property (nonatomic) BOOL isOpen;
 
+@property (strong, nonatomic) UIPageViewController *pageViewController;
+@property (strong, nonatomic) NSArray *pageType;
+@property (strong, nonatomic) NSString *currentPageType;
+
 - (void)reloadDatasource;
 
 - (void)setControlCenterHidden:(BOOL)hidden;

+ 3 - 3
iOSClient/MenuAccount+ControlCenter/CCControlCenter.m

@@ -89,7 +89,7 @@
     _tableView = [[UITableView alloc] init];
     [_tableView setFrame:CGRectMake(0, 0, self.navigationBar.frame.size.width, 0)];
     _tableView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-    [_tableView registerNib:[UINib nibWithNibName:@"CCControlCenterCell" bundle:nil] forCellReuseIdentifier:@"CCControlCenterCell"];
+    [_tableView registerNib:[UINib nibWithNibName:@"CCControlCenterTransferCell" bundle:nil] forCellReuseIdentifier:@"ControlCenterTransferCell"];
     _tableView.delegate = self;
     _tableView.dataSource = self;
     _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -381,7 +381,7 @@
     
     if (indexPath && indexPath.row == 0) {
         
-        CCControlCenterCell *cell = (CCControlCenterCell *)[_tableView cellForRowAtIndexPath:indexPath];
+        CCControlCenterTransferCell *cell = (CCControlCenterTransferCell *)[_tableView cellForRowAtIndexPath:indexPath];
     
         if (cryptated) cell.progressView.progressTintColor = COLOR_CRYPTOCLOUD;
         else cell.progressView.progressTintColor = COLOR_TEXT_ANTHRACITE;
@@ -743,7 +743,7 @@
     NSString *fileID = [[_sectionDataSource.sectionArrayRow objectForKey:[_sectionDataSource.sections objectAtIndex:indexPath.section]] objectAtIndex:indexPath.row];
     CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
     
-    CCControlCenterCell *cell = (CCControlCenterCell *)[tableView dequeueReusableCellWithIdentifier:@"CCControlCenterCell" forIndexPath:indexPath];
+    CCControlCenterTransferCell *cell = (CCControlCenterTransferCell *)[tableView dequeueReusableCellWithIdentifier:@"ControlCenterTransferCell" forIndexPath:indexPath];
     cell.backgroundColor = [UIColor clearColor];
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
         

+ 2 - 2
iOSClient/MenuAccount+ControlCenter/CCControlCenterCell.h → iOSClient/MenuAccount+ControlCenter/CCControlCenterTransferCell.h

@@ -1,5 +1,5 @@
 //
-//  CCControlCenterCell.h
+//  CCControlCenterTransferCell.h
 //  Crypto Cloud Technology Nextcloud
 //
 //  Created by Marino Faggiana on 05/05/15.
@@ -23,7 +23,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface CCControlCenterCell : UITableViewCell
+@interface CCControlCenterTransferCell : UITableViewCell
 
 @property(nonatomic, weak) IBOutlet UIImageView *fileImageView;
 @property(nonatomic, weak) IBOutlet UIImageView *statusImageView;

+ 3 - 3
iOSClient/MenuAccount+ControlCenter/CCControlCenterCell.m → iOSClient/MenuAccount+ControlCenter/CCControlCenterTransferCell.m

@@ -1,5 +1,5 @@
 //
-//  CCControlCenterCell.m
+//  CCControlCenterTransferCell.m
 //  Crypto Cloud Technology Nextcloud
 //
 //  Created by Marino Faggiana on 05/05/15.
@@ -21,9 +21,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "CCControlCenterCell.h"
+#import "CCControlCenterTransferCell.h"
 
-@implementation CCControlCenterCell
+@implementation CCControlCenterTransferCell
 
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {

+ 4 - 4
iOSClient/MenuAccount+ControlCenter/CCControlCenterCell.xib → iOSClient/MenuAccount+ControlCenter/CCControlCenterTransferCell.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" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="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="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -13,11 +13,11 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CustomCellFileAndDirectory"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="0.0" reuseIdentifier="CCControlCenterCell" rowHeight="167" id="2" userLabel="CCControlCenterCell" customClass="CCControlCenterCell">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="0.0" reuseIdentifier="ControlCenterTransferCell" rowHeight="167" id="2" userLabel="CCControlCenterTransferCell" customClass="CCControlCenterTransferCell">
             <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.69999999999999996" contentMode="center" tableViewCell="2" id="sQq-jC-UEV">
-                <rect key="frame" x="0.0" y="0.0" width="600" height="49.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
                 <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">