Browse Source

remove Library CCProgress not compatibility with ios11

Marino Faggiana 7 years ago
parent
commit
8e92d9dc4d

+ 0 - 20
Nextcloud.xcodeproj/project.pbxproj

@@ -361,8 +361,6 @@
 		F78964AE1EBB576C00403E13 /* JDStatusBarStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964AA1EBB576C00403E13 /* JDStatusBarStyle.m */; };
 		F78964AF1EBB576C00403E13 /* JDStatusBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = F78964AC1EBB576C00403E13 /* JDStatusBarView.m */; };
 		F78BFEE11D31126B00E513CF /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F78BFEDE1D31126B00E513CF /* MainInterface.storyboard */; };
-		F7A13A031E7F3D5D00016680 /* CCProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A13A001E7F3D5D00016680 /* CCProgressView.m */; };
-		F7A13A041E7F3D5D00016680 /* UINavigationController+CCProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A13A021E7F3D5D00016680 /* UINavigationController+CCProgress.m */; };
 		F7A321551E9E2A070069AD1B /* CCFavorites.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A3214F1E9E2A070069AD1B /* CCFavorites.m */; };
 		F7A321561E9E2A070069AD1B /* CCFavoritesCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A321511E9E2A070069AD1B /* CCFavoritesCell.m */; };
 		F7A321571E9E2A070069AD1B /* CCFavoritesCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F7A321521E9E2A070069AD1B /* CCFavoritesCell.xib */; };
@@ -1161,10 +1159,6 @@
 		F7956FC91B4886E60085DEA3 /* CCUploadFromOtherUpp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCUploadFromOtherUpp.h; sourceTree = "<group>"; };
 		F7956FCA1B4886E60085DEA3 /* CCUploadFromOtherUpp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCUploadFromOtherUpp.m; sourceTree = "<group>"; };
 		F7956FCB1B4886E60085DEA3 /* CCUploadFromOtherUpp.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = CCUploadFromOtherUpp.storyboard; sourceTree = "<group>"; };
-		F7A139FF1E7F3D5D00016680 /* CCProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProgressView.h; sourceTree = "<group>"; };
-		F7A13A001E7F3D5D00016680 /* CCProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCProgressView.m; sourceTree = "<group>"; };
-		F7A13A011E7F3D5D00016680 /* UINavigationController+CCProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+CCProgress.h"; sourceTree = "<group>"; };
-		F7A13A021E7F3D5D00016680 /* UINavigationController+CCProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+CCProgress.m"; sourceTree = "<group>"; };
 		F7A3214E1E9E2A070069AD1B /* CCFavorites.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFavorites.h; sourceTree = "<group>"; };
 		F7A3214F1E9E2A070069AD1B /* CCFavorites.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CCFavorites.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		F7A321501E9E2A070069AD1B /* CCFavoritesCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFavoritesCell.h; sourceTree = "<group>"; };
@@ -2357,17 +2351,6 @@
 			path = JDStatusBarNotification;
 			sourceTree = "<group>";
 		};
-		F7A139FE1E7F3D5D00016680 /* CCProgress */ = {
-			isa = PBXGroup;
-			children = (
-				F7A139FF1E7F3D5D00016680 /* CCProgressView.h */,
-				F7A13A001E7F3D5D00016680 /* CCProgressView.m */,
-				F7A13A011E7F3D5D00016680 /* UINavigationController+CCProgress.h */,
-				F7A13A021E7F3D5D00016680 /* UINavigationController+CCProgress.m */,
-			);
-			path = CCProgress;
-			sourceTree = "<group>";
-		};
 		F7A3214D1E9E2A070069AD1B /* Favorites */ = {
 			isa = PBXGroup;
 			children = (
@@ -2797,7 +2780,6 @@
 			children = (
 				F72AAEC11E5C60C700BB17E1 /* AHKActionSheet */,
 				F73CC0571E813DFF006E3047 /* BKPasscodeView */,
-				F7A139FE1E7F3D5D00016680 /* CCProgress */,
 				F7D423A31F063B81009C9782 /* CTAssetsPickerController */,
 				F7F54CAD1E5B14C700E19C62 /* MWPhotoBrowser */,
 				F7B4F1C51F44356F00B53B42 /* NCUchardet */,
@@ -3641,7 +3623,6 @@
 				F77B0E131D118A16002130FE /* AppDelegate.m in Sources */,
 				F762CB861EACB81000B38484 /* RECommonFunctions.m in Sources */,
 				F750374F1DBFA91A008FB480 /* NSArray+PureLayout.m in Sources */,
-				F7A13A031E7F3D5D00016680 /* CCProgressView.m in Sources */,
 				F77B0E141D118A16002130FE /* CCError.m in Sources */,
 				F73B4F131F470D9100BBEE4B /* nsUniversalDetector.cpp in Sources */,
 				F72756721F7153FC0011E2FC /* NCClientEncryption.m in Sources */,
@@ -3781,7 +3762,6 @@
 				F70022C21EC4C9100080073F /* OCNotifications.m in Sources */,
 				F70022BF1EC4C9100080073F /* OCFileDto.m in Sources */,
 				F73B4F011F470D9100BBEE4B /* LangThaiModel.cpp in Sources */,
-				F7A13A041E7F3D5D00016680 /* UINavigationController+CCProgress.m in Sources */,
 				F70022DD1EC4C9100080073F /* OCWebDAVClient.m in Sources */,
 				F73B4F001F470D9100BBEE4B /* LangSpanishModel.cpp in Sources */,
 				F77B0EAD1D118A16002130FE /* CCGlobal.m in Sources */,

+ 0 - 5
iOSClient/Favorites/CCFavorites.m

@@ -121,11 +121,6 @@
 {
     NSDictionary *dict = notification.userInfo;
     float progress = [[dict valueForKey:@"progress"] floatValue];
-    
-    if (progress == 0)
-        [self.navigationController cancelCCProgress];
-    else
-        [self.navigationController setCCProgressPercentage:progress*100 andTintColor:[NCBrandColor sharedInstance].navigationBarProgress];
 }
 
 #pragma --------------------------------------------------------------------------------------------

+ 0 - 20
iOSClient/Library/CCProgress/CCProgressView.h

@@ -1,20 +0,0 @@
-//
-//  CCProgressView.h
-//  NavigationProgress
-//
-//  Created by Shawn Gryschuk on 2013-09-19.
-//  Copyright (c) 2013 Shawn Gryschuk. All rights reserved.
-//
-//  Modify Marino Faggiana
-
-#import <UIKit/UIKit.h>
-
-@interface CCProgressView : UIView
-
-/**
- *  The current progress shown by the receiver.
- *  The progress value ranges from 0 to 1. The default value is 0.
- */
-@property (nonatomic, assign) float progress;
-
-@end

+ 0 - 67
iOSClient/Library/CCProgress/CCProgressView.m

@@ -1,67 +0,0 @@
-//
-//  CCProgressView.m
-//  NavigationProgress
-//
-//  Created by Shawn Gryschuk on 2013-09-19.
-//  Copyright (c) 2013 Shawn Gryschuk. All rights reserved.
-//
-//  Modify Marino Faggiana
-
-#import "CCProgressView.h"
-
-@interface CCProgressView ()
-@property (nonatomic, strong) UIView *progressBar;
-@end
-
-@implementation CCProgressView
-
-- (void)setProgress:(float)progress {
-	_progress = (progress < 0) ? 0 :
-				(progress > 1) ? 1 :
-				progress;
-
-	CGRect slice, remainder;
-	CGRectDivide(self.bounds, &slice, &remainder, CGRectGetWidth(self.bounds) * _progress, CGRectMinXEdge);
-
-	if (!CGRectEqualToRect(self.progressBar.frame, slice)) {
-		self.progressBar.frame = slice;
-	}
-}
-
-#pragma mark - UIView
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-	if (self = [super initWithFrame:frame]) {
-		self.frame = frame;
-		self.clipsToBounds = YES;
-		self.backgroundColor = [UIColor clearColor];
-		self.tintAdjustmentMode = UIViewTintAdjustmentModeNormal;
-		self.progressBar = [[UIView alloc] init];
-		self.progressBar.backgroundColor = self.tintColor;
-		self.progress = 0;
-		[self addSubview:self.progressBar];
-	}
-	return self;
-}
-
-- (void)setFrame:(CGRect)frame
-{
-	// 0.5 pt doesn't work well with autoresizingMask.
-	frame.origin.y = ceilf(frame.origin.y);
-	frame.size.height = floorf(frame.size.height);
-	[super setFrame:frame];
-
-	__weak typeof(self)weakSelf = self;
-	dispatch_async(dispatch_get_main_queue(), ^{
-		weakSelf.progress = weakSelf.progress;
-	});
-}
-
-- (void)setTintColor:(UIColor *)tintColor
-{
-	[super setTintColor:tintColor];
-	self.progressBar.backgroundColor = tintColor;
-}
-
-@end

+ 0 - 33
iOSClient/Library/CCProgress/UINavigationController+CCProgress.h

@@ -1,33 +0,0 @@
-//
-//  UINavigationController+SGProgress.h
-//  NavigationProgress
-//
-//  Created by Shawn Gryschuk on 2013-09-19.
-//  Copyright (c) 2013 Shawn Gryschuk. All rights reserved.
-//
-//  Modify Marino Faggiana
-
-#import <UIKit/UIKit.h>
-
-#define kSGProgressTitleChanged @"kCCProgressTitleChanged"
-#define kSGProgressOldTitle @"kCCProgressOldTitle"
-
-@interface UINavigationController (CCProgress)
-
-- (void)showCCProgress;
-- (void)showCCProgressWithDuration:(float)duration;
-- (void)showCCProgressWithDuration:(float)duration andTintColor:(UIColor *)tintColor;
-- (void)showCCProgressWithDuration:(float)duration andTintColor:(UIColor *)tintColor andTitle:(NSString *)title;
-- (void)showCCProgressWithMaskAndDuration:(float)duration;
-- (void)showCCProgressWithMaskAndDuration:(float)duration andTitle:(NSString *)title;
-
-- (void)finishCCProgress;
-- (void)cancelCCProgress;
-
-- (void)setCCProgressPercentage:(float)percentage;
-- (void)setCCProgressPercentage:(float)percentage andTitle:(NSString *)title;
-- (void)setCCProgressPercentage:(float)percentage andTintColor:(UIColor *)tintColor;
-- (void)setCCProgressMaskWithPercentage:(float)percentage;
-- (void)setCCProgressMaskWithPercentage:(float)percentage andTitle:(NSString *)title;
-
-@end

+ 0 - 307
iOSClient/Library/CCProgress/UINavigationController+CCProgress.m

@@ -1,307 +0,0 @@
-//
-//  UINavigationController+SGProgress.m
-//  NavigationProgress
-//
-//  Created by Shawn Gryschuk on 2013-09-19.
-//  Copyright (c) 2013 Shawn Gryschuk. All rights reserved.
-//
-//  Modify Marino Faggiana
-
-#import "UINavigationController+CCProgress.h"
-#import "CCProgressView.h"
-
-#define SGMaskColor [UIColor colorWithWhite:0 alpha:0.4]
-
-NSInteger const SGProgressMasktagId = 221222322;
-NSInteger const SGProgressMiniMasktagId = 221222321;
-CGFloat const SGProgressBarHeight = 2.0;
-
-@implementation UINavigationController (SGProgress)
-
-- (CCProgressView *)progressView
-{
-	CCProgressView *_progressView;
-	for (UIView *subview in [self.navigationBar subviews])
-	{
-		if ([subview isKindOfClass:[CCProgressView class]])
-		{
-			_progressView = (CCProgressView *)subview;
-		}
-	}
-
-	if (!_progressView)
-	{
-		CGRect slice, remainder;
-		CGRectDivide(self.navigationBar.bounds, &slice, &remainder, SGProgressBarHeight, CGRectMaxYEdge);
-		_progressView = [[CCProgressView alloc] initWithFrame:slice];
-		_progressView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin;
-		[self.navigationBar addSubview:_progressView];
-	}
-
-	return _progressView;
-}
-
-- (UIView *)topMask
-{
-	UIView *topMask;
-	for (UIView *subview in [self.view subviews])
-	{
-		if (subview.tag == SGProgressMiniMasktagId)
-		{
-			topMask = subview;
-		}
-	}
-	return topMask;
-}
-
-- (UIView *)bottomMask
-{
-	UIView *bottomMask;
-	for (UIView *subview in [self.view subviews])
-	{
-		if (subview.tag == SGProgressMasktagId)
-		{
-			bottomMask = subview;
-		}
-	}
-	return bottomMask;
-}
-
-- (BOOL)hasCCProgressMask
-{
-	for (UIView *subview in [self.view subviews])
-	{
-		if (subview.tag == SGProgressMiniMasktagId || subview.tag == SGProgressMasktagId)
-		{
-			return YES;
-		}
-	}
-	return NO;
-}
-
-- (void)setupCCProgressMask
-{
-	self.view.tintAdjustmentMode = UIViewTintAdjustmentModeDimmed;
-
-	UIView *topMask = [self topMask];
-	UIView *bottomMask = [self bottomMask];
-
-	if (!topMask)
-	{
-		topMask = [[UIView alloc] init];
-		topMask.tag = SGProgressMiniMasktagId;
-		topMask.backgroundColor = SGMaskColor;
-		topMask.alpha = 0;
-		[self.view addSubview:topMask];
-	}
-
-	if (!bottomMask)
-	{
-		bottomMask = [[UIView alloc] init];
-		bottomMask.tag = SGProgressMasktagId;
-		bottomMask.backgroundColor = SGMaskColor;
-		bottomMask.alpha = 0;
-		[self.view addSubview:bottomMask];
-	}
-
-	[self updateCCProgressMaskFrame];
-
-	[UIView animateWithDuration:0.3 animations:^{
-		topMask.alpha = 1;
-		bottomMask.alpha = 1;
-	}];
-}
-
-- (void)updateCCProgressMaskFrame
-{
-	CGFloat width = CGRectGetWidth(self.view.bounds);
-	CGFloat height = CGRectGetMaxY(self.navigationBar.frame) - CGRectGetHeight([[self progressView] frame]);
-	[[self topMask] setFrame:CGRectMake(0, 0, width, height)];
-
-	CGRect slice, remainder;
-	CGRectDivide(self.view.bounds, &slice, &remainder, CGRectGetMaxY(self.navigationBar.frame) + 0.5, CGRectMinYEdge);
-	[[self bottomMask] setFrame:remainder];
-}
-
-- (void)removeCCMask
-{
-	for (UIView *subview in [self.view subviews])
-	{
-		if (subview.tag == SGProgressMasktagId || subview.tag == SGProgressMiniMasktagId)
-		{
-			[UIView animateWithDuration:0.3 animations:^{
-				subview.alpha = 0;
-			} completion:^(BOOL finished) {
-				[subview removeFromSuperview];
-				self.view.tintAdjustmentMode = UIViewTintAdjustmentModeNormal;
-			}];
-		}
-	}
-}
-
-- (void)resetTitle
-{
-	BOOL titleChanged = [[[NSUserDefaults standardUserDefaults] objectForKey:kSGProgressTitleChanged] boolValue];
-
-	if(titleChanged)
-	{
-		NSString *oldTitle = [[NSUserDefaults standardUserDefaults] objectForKey:kSGProgressOldTitle];
-		//add animation
-		self.visibleViewController.navigationItem.title = oldTitle;
-	}
-
-	[[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:NO] forKey:kSGProgressTitleChanged];
-	[[NSUserDefaults standardUserDefaults] setObject:@"" forKey:kSGProgressOldTitle];
-	[[NSUserDefaults standardUserDefaults] synchronize];
-
-}
-
-- (void)changeCCProgressWithTitle:(NSString *)title
-{
-	BOOL titleAlreadyChanged = [[[NSUserDefaults standardUserDefaults] objectForKey:kSGProgressTitleChanged] boolValue];
-	if(!titleAlreadyChanged)
-	{
-		NSString *oldTitle = self.visibleViewController.navigationItem.title;
-		[[NSUserDefaults standardUserDefaults] setObject:oldTitle forKey:kSGProgressOldTitle];
-		[[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:YES] forKey:kSGProgressTitleChanged];
-		[[NSUserDefaults standardUserDefaults] synchronize];
-
-		//add animation
-		self.visibleViewController.navigationItem.title = title;
-	}
-}
-
-#pragma mark - UIViewController
-
-- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
-{
-	if ([self hasCCProgressMask])
-	{
-		__weak typeof(self)weakSelf = self;
-		__block NSTimeInterval timeInterval = 0;
-		dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-			while (timeInterval <= duration) {
-				[NSThread sleepForTimeInterval:0.1];
-				timeInterval += 0.1;
-				dispatch_async(dispatch_get_main_queue(), ^{
-					[weakSelf updateCCProgressMaskFrame];
-				});
-			}
-		});
-	}
-}
-
-#pragma mark user functions
-
-- (void)showCCProgress
-{
-	[self showCCProgressWithDuration:3];
-}
-
-- (void)showCCProgressWithDuration:(float)duration
-{
-	CCProgressView *progressView = [self progressView];
-
-	[UIView animateWithDuration:duration delay:0 options:UIViewAnimationOptionCurveEaseIn animations:^{
-		progressView.progress = 1;
-	} completion:^(BOOL finished) {
-		[UIView animateWithDuration:0.5 animations:^{
-			progressView.alpha = 0;
-		} completion:^(BOOL finished) {
-			[progressView removeFromSuperview];
-			[self removeCCMask];
-			[self resetTitle];
-		}];
-	}];
-}
-
-- (void)showCCProgressWithDuration:(float)duration andTintColor:(UIColor *)tintColor
-{
-	[[self progressView] setTintColor:tintColor];
-	[self showCCProgressWithDuration:duration];
-}
-
-- (void)showCCProgressWithDuration:(float)duration andTintColor:(UIColor *)tintColor andTitle:(NSString *)title
-{
-	[self changeCCProgressWithTitle:title];
-	[self showCCProgressWithDuration:duration andTintColor:tintColor];
-}
-
-- (void)showCCProgressWithMaskAndDuration:(float)duration
-{
-	[self setupCCProgressMask];
-	[self showCCProgressWithDuration:duration];
-}
-
-- (void)showCCProgressWithMaskAndDuration:(float)duration andTitle:(NSString *) title
-{
-	[self changeCCProgressWithTitle:title];
-	[self showCCProgressWithMaskAndDuration:duration];
-}
-
-- (void)finishCCProgress
-{
-	CCProgressView *progressView = [self progressView];
-	[UIView animateWithDuration:0.1 animations:^{
-		progressView.progress = 1;
-	}];
-}
-
-- (void)cancelCCProgress
-{
-	CCProgressView *progressView = [self progressView];
-	[UIView animateWithDuration:0.5 animations:^{
-		progressView.alpha = 0;
-	} completion:^(BOOL finished) {
-		[progressView removeFromSuperview];
-		[self removeCCMask];
-		[self resetTitle];
-	}];
-}
-
-- (void)setCCProgressPercentage:(float)percentage
-{
-	CCProgressView *progressView = [self progressView];
-
-	[UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
-		progressView.progress = percentage / 100.f;
-
-	} completion:^(BOOL finished) {
-		if (percentage >= 100)
-		{
-			[UIView animateWithDuration:0.5 animations:^{
-				progressView.alpha = 0;
-			} completion:^(BOOL finished) {
-				[progressView removeFromSuperview];
-				[self removeCCMask];
-				[self resetTitle];
-			}];
-		}
-	}];
-}
-
-- (void)setCCProgressPercentage:(float)percentage andTitle:(NSString *)title
-{
-	[self changeCCProgressWithTitle:title];
-	[self setCCProgressPercentage:percentage];
-}
-
-- (void)setCCProgressPercentage:(float)percentage andTintColor:(UIColor *)tintColor
-{
-	[[self progressView] setTintColor:tintColor];
-	[self setCCProgressPercentage:percentage];
-}
-
-- (void)setCCProgressMaskWithPercentage:(float)percentage
-{
-	[self setCCProgressPercentage:percentage];
-	[self setupCCProgressMask];
-}
-
-- (void)setCCProgressMaskWithPercentage:(float)percentage andTitle:(NSString *)title
-{
-	[self changeCCProgressWithTitle:title];
-	[self setCCProgressMaskWithPercentage:percentage];
-}
-
-@end

+ 0 - 1
iOSClient/Main/CCDetail.h

@@ -29,7 +29,6 @@
 #import "TWMessageBarManager.h"
 #import "MWPhotoBrowser.h"
 #import "ReaderViewController.h"
-#import "UINavigationController+CCProgress.h"
 #import "CCGraphics.h"
 
 @class tableMetadata;

+ 0 - 5
iOSClient/Main/CCDetail.m

@@ -700,11 +700,6 @@
 {
     NSDictionary *dict = notification.userInfo;
     float progress = [[dict valueForKey:@"progress"] floatValue];
-    
-    if (progress == 0)
-        [self.navigationController cancelCCProgress];
-    else
-        [self.navigationController setCCProgressPercentage:progress*100 andTintColor:[NCBrandColor sharedInstance].navigationBarProgress];
 }
 
 - (void)downloadPhotoBrowserFailure:(NSInteger)errorCode

+ 0 - 1
iOSClient/Main/CCMain.h

@@ -32,7 +32,6 @@
 #import "CTAssetSelectionLabel.h"
 #import "BKPasscodeViewController.h"
 #import "NSString+TruncateToWidth.h"
-#import "UINavigationController+CCProgress.h"
 #import "UIScrollView+EmptyDataSet.h"
 #import "CCLogin.h"
 #import "CCCellMain.h"

+ 0 - 6
iOSClient/Main/CCMain.m

@@ -2375,12 +2375,6 @@
     NSString *serverUrl = [dict valueForKey:@"serverUrl"];
     float progress = [[dict valueForKey:@"progress"] floatValue];
     
-    // CCProgress
-    if (progress == 0)
-        [self.navigationController cancelCCProgress];
-    else
-        [self.navigationController setCCProgressPercentage:progress*100 andTintColor: [NCBrandColor sharedInstance].navigationBarProgress];
-    
     // Check
     if (!fileID || [fileID isEqualToString: @""])
         return;

+ 0 - 1
iOSClient/Photos/CCPhotos.h

@@ -28,7 +28,6 @@
 #import "UIScrollView+EmptyDataSet.h"
 #import "OCErrorMsg.h"
 #import "TWMessageBarManager.h"
-#import "UINavigationController+CCProgress.h"
 #import "CCManageLocation.h"
 #import "CCDetail.h"
 #import "CCUtility.h"

+ 0 - 5
iOSClient/Photos/CCPhotos.m

@@ -488,11 +488,6 @@
 {
     NSDictionary *dict = notification.userInfo;
     float progress = [[dict valueForKey:@"progress"] floatValue];
-    
-    if (progress == 0)
-        [self.navigationController cancelCCProgress];
-    else
-        [self.navigationController setCCProgressPercentage:progress*100 andTintColor:[NCBrandColor sharedInstance].navigationBarProgress];
 }
 
 #pragma --------------------------------------------------------------------------------------------

+ 0 - 5
iOSClient/Shares/NCShares.m

@@ -103,11 +103,6 @@
 {
     NSDictionary *dict = notification.userInfo;
     float progress = [[dict valueForKey:@"progress"] floatValue];
-    
-    if (progress == 0)
-        [self.navigationController cancelCCProgress];
-    else
-        [self.navigationController setCCProgressPercentage:progress*100 andTintColor:[NCBrandColor sharedInstance].navigationBarProgress];
 }
 
 #pragma --------------------------------------------------------------------------------------------