Skip to content

Commit 55b7a91

Browse files
committed
New assets for HUDs
1 parent 9c71649 commit 55b7a91

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+186
-67
lines changed

iMEGA/AppDelegate.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ - (void)processLink:(NSString *)url {
433433
NSString *afterSlashesString = [url substringFromIndex:7]; // "mega://" = 7 characters
434434

435435
if ([afterSlashesString isEqualToString:@""] || (afterSlashesString.length < 2)) {
436-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"invalidLink", nil)];
436+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"invalidLink", nil)];
437437
return;
438438
}
439439

@@ -453,8 +453,8 @@ - (void)processLink:(NSString *)url {
453453
self.urlType = URLTypeConfirmationLink;
454454
return;
455455
}
456-
457-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"invalidLink", nil)];
456+
457+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"invalidLink", nil)];
458458
}
459459

460460
- (void)dissmissPreviousLinkIfPresented {
@@ -867,7 +867,7 @@ - (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
867867
}
868868

869869
case MEGARequestTypeLogout:
870-
[SVProgressHUD showWithStatus:AMLocalizedString(@"loggingOut", @"String shown when you are logging out of your account.")];
870+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudLogOut"] status:AMLocalizedString(@"loggingOut", @"String shown when you are logging out of your account.")];
871871
break;
872872

873873
default:

iMEGA/Camera uploads/CameraUploadsPopUpViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ - (IBAction)enableTouchUpInside:(UIButton *)sender {
130130
[[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:[CameraUploads syncManager].isCameraUploadsEnabled] forKey:kIsCameraUploadsEnabled];
131131

132132
[self dismissViewControllerAnimated:YES completion:^{
133-
[SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"cameraUploadsEnabled", @"Camera Uploads enabled!")];
133+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudCameraUploads"] status:AMLocalizedString(@"cameraUploadsEnabled", nil)];
134134
}];
135135
}
136136
}

iMEGA/Camera uploads/PhotosViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)butto
699699
- (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
700700
switch ([request type]) {
701701
case MEGARequestTypeExport:
702-
[SVProgressHUD showWithStatus:AMLocalizedString(@"generatingLink", @"Generating link...")];
702+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudLink"] status:AMLocalizedString(@"generatingLink", nil)];
703703
break;
704704

705705
default:
@@ -732,7 +732,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
732732
remainingOperations--;
733733
if (remainingOperations == 0) {
734734
NSString *message = (self.selectedItemsDictionary.count <= 1 ) ? AMLocalizedString(@"fileMovedToRubbishBinMessage", nil) : [NSString stringWithFormat:AMLocalizedString(@"filesMovedToRubbishBinMessage", nil), self.selectedItemsDictionary.count];
735-
[SVProgressHUD showSuccessWithStatus:message];
735+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudRubbishBin"] status:message];
736736
// [self setEditing:NO animated:NO];
737737
}
738738
break;

iMEGA/Cloud drive/Activities/GetLinkActivity.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ - (void)performActivity {
6363
if ([MEGAReachabilityManager isReachable]) {
6464
[[MEGASdkManager sharedMEGASdk] exportNode:node];
6565
} else {
66-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", nil)];
66+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
6767
}
6868
}
6969

iMEGA/Cloud drive/Activities/MEGAActivityItemProvider.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ - (id)item {
5656
if ([MEGAReachabilityManager isReachable]) {
5757
[[MEGASdkManager sharedMEGASdk] exportNode:_node delegate:self];
5858
} else {
59-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", nil)];
59+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
6060
}
6161

6262
});
@@ -86,7 +86,7 @@ - (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
8686
switch ([request type]) {
8787
case MEGARequestTypeExport: {
8888
if ([request access]) {
89-
[SVProgressHUD showWithStatus:AMLocalizedString(@"generatingLink", nil)];
89+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudLink"] status:AMLocalizedString(@"generatingLink", nil)];
9090
}
9191
break;
9292
}

iMEGA/Cloud drive/Activities/RemoveLinkActivity.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ - (void)performActivity {
6464
if ([MEGAReachabilityManager isReachable]) {
6565
[[MEGASdkManager sharedMEGASdk] disableExportNode:node];
6666
} else {
67-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", nil)];
67+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
6868
}
6969
}
7070

iMEGA/Cloud drive/BrowserViewController.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ - (IBAction)moveNode:(UIBarButtonItem *)sender {
207207
[[MEGASdkManager sharedMEGASdk] moveNode:n newParent:self.parentNode];
208208
}
209209
} else {
210-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
210+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
211211
}
212212
}
213213

@@ -219,7 +219,7 @@ - (IBAction)copyNode:(UIBarButtonItem *)sender {
219219
[[MEGASdkManager sharedMEGASdk] copyNode:n newParent:self.parentNode];
220220
}
221221
} else {
222-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
222+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
223223
}
224224
}
225225

@@ -262,7 +262,7 @@ - (IBAction)selectSharedFolder:(UIButton *)sender {
262262
[actionSheet showFromTabBar:self.tabBarController.tabBar];
263263
}
264264
} else {
265-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
265+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
266266
}
267267
}
268268

@@ -272,7 +272,7 @@ - (IBAction)uploadToMega:(UIBarButtonItem *)sender {
272272
[[MEGASdkManager sharedMEGASdk] startUploadWithLocalPath:self.localpath parent:self.parentNode];
273273
[self dismissViewControllerAnimated:YES completion:nil];
274274
} else {
275-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
275+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
276276
}
277277
}
278278

@@ -321,7 +321,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
321321
if ([MEGAReachabilityManager isReachable]) {
322322
[[MEGASdkManager sharedMEGASdk] createFolderWithName:[[folderAlertView textFieldAtIndex:0] text] parent:self.parentNode];
323323
} else {
324-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
324+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
325325
}
326326
}
327327
}
@@ -390,7 +390,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
390390
- (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEGAError *)error {
391391
if ([error type]) {
392392
if ([error type] == MEGAErrorTypeApiEOverQuota) {
393-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"quotaExceeded", @"Storage quota exceeded")];
393+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudWarning"] status:AMLocalizedString(@"quotaExceeded", nil)];
394394
}
395395

396396
return;
@@ -505,7 +505,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
505505

506506
if (remainingOperations == 0) {
507507
// NSString *message = (self.selectedNodesArray.count <= 1 ) ? [NSString stringWithFormat:AMLocalizedString(@"fileMoved", nil)] : [NSString stringWithFormat:AMLocalizedString(@"filesMoved", nil), self.selectedNodesArray.count];
508-
[SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"sharedFolder_success", @"Folder shared!")];
508+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudSharedFolder"] status:AMLocalizedString(@"sharedFolder_success", nil)];
509509
[self dismissViewControllerAnimated:YES completion:nil];
510510
}
511511
break;

iMEGA/Cloud drive/CloudDriveTableViewController.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
10061006
[self.searchDisplayController.searchResultsTableView reloadData];
10071007
}
10081008
} else {
1009-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
1009+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
10101010
}
10111011
}
10121012
break;
@@ -1017,7 +1017,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
10171017
if ([MEGAReachabilityManager isReachable]) {
10181018
[[MEGASdkManager sharedMEGASdk] createFolderWithName:[[folderAlertView textFieldAtIndex:0] text] parent:self.parentNode];
10191019
} else {
1020-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
1020+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
10211021
}
10221022
}
10231023
break;
@@ -1034,7 +1034,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
10341034
[[MEGASdkManager sharedMEGASdk] removeNode:[self.selectedNodesArray objectAtIndex:i]];
10351035
}
10361036
} } else {
1037-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
1037+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
10381038
}
10391039
}
10401040
break;
@@ -1346,7 +1346,7 @@ - (void)showImagePickerForSourceType:(UIImagePickerControllerSourceType)sourceTy
13461346

13471347
if (![UIImagePickerController isSourceTypeAvailable:sourceType]) {
13481348
if (sourceType == UIImagePickerControllerSourceTypeCamera) {
1349-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noCamera", @"No camera available")];
1349+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudNoCamera"] status:AMLocalizedString(@"noCamera", nil)];
13501350
}
13511351
return;
13521352
}
@@ -1550,7 +1550,7 @@ - (IBAction)downloadAction:(UIBarButtonItem *)sender {
15501550
}
15511551
}
15521552

1553-
[SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"downloadStarted", nil)];
1553+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudDownload"] status:AMLocalizedString(@"downloadStarted", nil)];
15541554

15551555
for (MEGANode *n in self.selectedNodesArray) {
15561556
[Helper downloadNode:n folderPath:[Helper pathForOffline] isFolderLink:NO];
@@ -1872,7 +1872,7 @@ - (BOOL)previewController:(QLPreviewController *)controller shouldOpenURL:(NSURL
18721872
- (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
18731873
switch ([request type]) {
18741874
case MEGARequestTypeExport:
1875-
[SVProgressHUD showWithStatus:AMLocalizedString(@"generatingLink", @"Generating link...")];
1875+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudLink"] status:AMLocalizedString(@"generatingLink", nil)];
18761876
break;
18771877

18781878
default:
@@ -1952,7 +1952,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
19521952
}
19531953
}
19541954

1955-
[SVProgressHUD showSuccessWithStatus:message];
1955+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudRubbishBin"] status:message];
19561956
[self setEditing:NO animated:YES];
19571957
}
19581958
break;
@@ -1993,7 +1993,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
19931993
} else {
19941994
message = AMLocalizedString(@"shareFolderLeaved", @"Folder leave");
19951995
}
1996-
[SVProgressHUD showSuccessWithStatus:message];
1996+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudMinus"] status:message];
19971997
[self setEditing:NO animated:YES];
19981998
}
19991999
break;
@@ -2097,7 +2097,7 @@ - (void)onTransferFinish:(MEGASdk *)api transfer:(MEGATransfer *)transfer error:
20972097
[alertView show];
20982098
}
20992099
} else if ([error type] == MEGAErrorTypeApiEIncomplete) {
2100-
[SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"transferCanceled", @"Transfer canceled")];
2100+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudMinus"] status:AMLocalizedString(@"transferCanceled", nil)];
21012101
NSString *base64Handle = [MEGASdk base64HandleForHandle:transfer.nodeHandle];
21022102
NSIndexPath *indexPath = [self.nodesIndexPathMutableDictionary objectForKey:base64Handle];
21032103
if (indexPath != nil) {

iMEGA/Cloud drive/DetailsNodeInfoViewController.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,30 +173,30 @@ - (void)download {
173173
return;
174174
}
175175

176-
[SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"downloadStarted", nil)];
176+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudDownload"] status:AMLocalizedString(@"downloadStarted", nil)];
177177
[Helper downloadNode:self.node folderPath:[Helper pathForOffline] isFolderLink:NO];
178178

179179
if ([self.node isFolder]) {
180180
[self.navigationController popViewControllerAnimated:YES];
181181
}
182182
} else {
183-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
183+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
184184
}
185185
}
186186

187187
- (void)getLink {
188188
if ([MEGAReachabilityManager isReachable]) {
189189
[[MEGASdkManager sharedMEGASdk] exportNode:self.node];
190190
} else {
191-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
191+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
192192
}
193193
}
194194

195195
- (void)disableLink {
196196
if ([MEGAReachabilityManager isReachable]) {
197197
[[MEGASdkManager sharedMEGASdk] disableExportNode:self.node];
198198
} else {
199-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
199+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
200200
}
201201
}
202202

@@ -210,7 +210,7 @@ - (void)browserWithAction:(NSInteger)browserAction {
210210
browserVC.selectedNodesArray = [NSArray arrayWithObject:self.node];
211211
[browserVC setBrowserAction:browserAction]; //
212212
} else {
213-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
213+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
214214
}
215215
}
216216

@@ -229,7 +229,7 @@ - (void)rename {
229229

230230
[renameAlertView show];
231231
} else {
232-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
232+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
233233
}
234234
}
235235

@@ -259,7 +259,7 @@ - (void)delete {
259259
[removeAlertView show];
260260
}
261261
} else {
262-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
262+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
263263
}
264264
}
265265

@@ -832,7 +832,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
832832

833833
case MEGARequestTypeCancelTransfer:
834834
[self.tableView reloadData];
835-
[SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"transferCanceled", @"Transfer canceled!")];
835+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudMinus"] status:AMLocalizedString(@"transferCanceled", nil)];
836836
break;
837837

838838
default:

iMEGA/Contacts/ContactsViewController.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ - (IBAction)shareFolderWithTouchUpInside:(UIButton *)sender {
315315
}
316316
}
317317
} else {
318-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
318+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
319319
}
320320
}
321321

@@ -605,7 +605,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
605605
if ([MEGAReachabilityManager isReachable]) {
606606
[[MEGASdkManager sharedMEGASdk] addContactWithEmail:[[alertView textFieldAtIndex:0] text] delegate:self];
607607
} else {
608-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
608+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
609609
}
610610
}
611611
} else if (alertView.tag == 1) {
@@ -616,7 +616,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
616616
[[MEGASdkManager sharedMEGASdk] removeContactUser:[self.selectedUsersArray objectAtIndex:i] delegate:self];
617617
}
618618
} else {
619-
[SVProgressHUD showErrorWithStatus:AMLocalizedString(@"noInternetConnection", @"No Internet Connection")];
619+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudForbidden"] status:AMLocalizedString(@"noInternetConnection", nil)];
620620
}
621621
}
622622
} else if (alertView.tag == 2) {
@@ -723,7 +723,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
723723
remainingOperations--;
724724
if (remainingOperations == 0) {
725725
NSString *message = (self.selectedUsersArray.count <= 1 ) ? [NSString stringWithFormat:AMLocalizedString(@"removedContact", nil), [request email]] : [NSString stringWithFormat:AMLocalizedString(@"removedContacts", nil), self.selectedUsersArray.count];
726-
[SVProgressHUD showSuccessWithStatus:message];
726+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudMinus"] status:message];
727727
[self setTableViewEditing:NO animated:NO];
728728
}
729729

@@ -733,7 +733,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
733733
case MEGARequestTypeShare: {
734734
remainingOperations--;
735735
if (remainingOperations == 0) {
736-
[SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"sharedFolder_success", @"Folder shared!")];
736+
[SVProgressHUD showImage:[UIImage imageNamed:@"hudSharedFolder"] status:AMLocalizedString(@"sharedFolder_success", nil)];
737737
[self dismissViewControllerAnimated:YES completion:nil];
738738
}
739739
break;

0 commit comments

Comments
 (0)