Explorar o código

remove code for iOS 9

Marino Faggiana %!s(int64=6) %!d(string=hai) anos
pai
achega
ff18ecb0aa

+ 0 - 16
iOSClient/AppDelegate.m

@@ -730,20 +730,12 @@
     item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFiles"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFiles"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
-    if ([[[UIDevice currentDevice] systemVersion] floatValue] < 10.0) {
-        item.image = item.selectedImage = [UIImage imageNamed:@"tabBarFilesIOS9"];
-    }
-    
     // Favorites
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFavorite];
     [item setTitle:NSLocalizedString(@"_favorites_", nil)];
     item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFavorites"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarFavorites"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
-    if ([[[UIDevice currentDevice] systemVersion] floatValue] < 10.0) {
-        item.image = item.selectedImage = [UIImage imageNamed:@"tabBarFavoritesIOS9"];
-    }
-    
     // (PLUS)
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexPlusHide];
     item.title = @"";
@@ -756,20 +748,12 @@
     item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMedia"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMedia"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
-    if ([[[UIDevice currentDevice] systemVersion] floatValue] < 10.0) {
-        item.image = item.selectedImage = [UIImage imageNamed:@"tabBarMediaIOS9"];
-    }
-    
     // More
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexMore];
     [item setTitle:NSLocalizedString(@"_more_", nil)];
     item.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMore"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     item.selectedImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarMore"] multiplier:2 color:[NCBrandColor sharedInstance].brandElement];
     
-    if ([[[UIDevice currentDevice] systemVersion] floatValue] < 10.0) {
-        item.image = item.selectedImage = [UIImage imageNamed:@"tabBarMoreIOS9"];
-    }
-    
     // Plus Button
     UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"tabBarPlus"] multiplier:3 color:[NCBrandColor sharedInstance].brandElement];
     UIButton *buttonPlus = [UIButton buttonWithType:UIButtonTypeCustom];

+ 0 - 23
iOSClient/Images.xcassets/tabBarFavoritesIOS9.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarFavoritesIOS9.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarFavoritesIOS9@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarFavoritesIOS9@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN=BIN
iOSClient/Images.xcassets/tabBarFavoritesIOS9.imageset/tabBarFavoritesIOS9.png


BIN=BIN
iOSClient/Images.xcassets/tabBarFavoritesIOS9.imageset/tabBarFavoritesIOS9@2x.png


BIN=BIN
iOSClient/Images.xcassets/tabBarFavoritesIOS9.imageset/tabBarFavoritesIOS9@3x.png


+ 0 - 23
iOSClient/Images.xcassets/tabBarFilesIOS9.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarFilesIOS9.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarFilesIOS9@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarFilesIOS9@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN=BIN
iOSClient/Images.xcassets/tabBarFilesIOS9.imageset/tabBarFilesIOS9.png


BIN=BIN
iOSClient/Images.xcassets/tabBarFilesIOS9.imageset/tabBarFilesIOS9@2x.png


BIN=BIN
iOSClient/Images.xcassets/tabBarFilesIOS9.imageset/tabBarFilesIOS9@3x.png


+ 0 - 23
iOSClient/Images.xcassets/tabBarMediaIOS9.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarMediaIOS9.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarMediaIOS9@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarMediaIOS9@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN=BIN
iOSClient/Images.xcassets/tabBarMediaIOS9.imageset/tabBarMediaIOS9.png


BIN=BIN
iOSClient/Images.xcassets/tabBarMediaIOS9.imageset/tabBarMediaIOS9@2x.png


BIN=BIN
iOSClient/Images.xcassets/tabBarMediaIOS9.imageset/tabBarMediaIOS9@3x.png


+ 0 - 23
iOSClient/Images.xcassets/tabBarMoreIOS9.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarMoreIOS9.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarMoreIOS9@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "tabBarMoreIOS9@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

BIN=BIN
iOSClient/Images.xcassets/tabBarMoreIOS9.imageset/tabBarMoreIOS9.png


BIN=BIN
iOSClient/Images.xcassets/tabBarMoreIOS9.imageset/tabBarMoreIOS9@2x.png


BIN=BIN
iOSClient/Images.xcassets/tabBarMoreIOS9.imageset/tabBarMoreIOS9@3x.png


+ 1 - 6
iOSClient/Main/CCMain.m

@@ -558,12 +558,7 @@
 
             _imageTitleHome = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 60, 30)]; // IMAGE = 120 x 60
             _imageTitleHome.contentMode = UIViewContentModeScaleAspectFill;
-            
-            if ([[[UIDevice currentDevice] systemVersion] floatValue] < 10.0) {
-                _imageTitleHome.translatesAutoresizingMaskIntoConstraints = YES;    //iOS 9
-            } else {
-                _imageTitleHome.translatesAutoresizingMaskIntoConstraints = NO;     //iOS >= 9
-            }
+            _imageTitleHome.translatesAutoresizingMaskIntoConstraints = NO;
             _imageTitleHome.image = image;
             
             // backbutton