Browse Source

Change icon color

Marino Faggiana 8 years ago
parent
commit
bcba23e95e

+ 4 - 0
Libraries external/JSAlertView/JSAlertView.h

@@ -25,4 +25,8 @@
 
 // Standard menthod for displaying alert, fully customizable.
 + (instancetype)alert:(NSString*)message withTitle:(NSString*)title buttons:(NSArray*)buttonTitles withCompletionHandler:(void(^)(NSInteger buttonIndex, NSString *buttonTitle))completionHandler;
+
+// Nextcloud
++ (BOOL)isOpenAlertWindows;
+
 @end

+ 4 - 0
Libraries external/JSAlertView/JSAlertView.m

@@ -124,6 +124,10 @@
     }
 }
 
++ (BOOL)isOpenAlertWindows
+{
+    return [[JSAlertView sharedInstance].allAlertWindows count];
+}
 
 
 /***********************************************************************

+ 4 - 4
iOSClient/Images.xcassets/shareConnect.imageset/Contents.json

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

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


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


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


+ 4 - 4
iOSClient/Images.xcassets/shareLink.imageset/Contents.json

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

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


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


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


+ 4 - 4
iOSClient/Images.xcassets/shareMounted.imageset/Contents.json

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

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


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


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


+ 4 - 4
iOSClient/Images.xcassets/shareUser.imageset/Contents.json

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

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


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


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


+ 5 - 0
iOSClient/Main/CCMain.m

@@ -124,6 +124,7 @@
     _selectedMetadatas = [[NSMutableArray alloc] init];
     _queueSelector = [[NSMutableArray alloc] init];
     _isViewDidLoad = YES;
+    _fatherPermission = @"";
 
     // delegate
     self.tableView.delegate = self;
@@ -1038,6 +1039,10 @@
         for (OCNotifications *notification in listOfNotifications)
             [appDelegate.listOfNotifications setObject:notification forKey:[NSString stringWithFormat:@"%lu", (unsigned long)notification.idNotification]];
     
+    // Test if is already open, otherwise view the messages
+    if ([JSAlertView isOpenAlertWindows])
+        return;
+    
     for (NSString *idNotification in app.listOfNotifications) {
         
         OCNotifications *notification = [app.listOfNotifications objectForKey:idNotification];