diff --git a/CAENLabStatus.xcodeproj/project.pbxproj b/CAENLabStatus.xcodeproj/project.pbxproj index d9881b0..993e569 100644 --- a/CAENLabStatus.xcodeproj/project.pbxproj +++ b/CAENLabStatus.xcodeproj/project.pbxproj @@ -8,12 +8,6 @@ /* Begin PBXBuildFile section */ 839FC83E181C0B0B00BCBD42 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 839FC83D181C0B0A00BCBD42 /* MobileCoreServices.framework */; }; - 839FC847181C106900BCBD42 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC841181C106900BCBD42 /* Icon-72.png */; }; - 839FC848181C106900BCBD42 /* Icon-Small-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC842181C106900BCBD42 /* Icon-Small-50.png */; }; - 839FC849181C106900BCBD42 /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC843181C106900BCBD42 /* Icon-Small.png */; }; - 839FC84A181C106900BCBD42 /* Icon-Small@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC844181C106900BCBD42 /* Icon-Small@2x.png */; }; - 839FC84B181C106900BCBD42 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC845181C106900BCBD42 /* Icon.png */; }; - 839FC84C181C106900BCBD42 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC846181C106900BCBD42 /* Icon@2x.png */; }; 839FC850181C107300BCBD42 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC84D181C107300BCBD42 /* Default-568h@2x.png */; }; 839FC851181C107300BCBD42 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC84E181C107300BCBD42 /* Default.png */; }; 839FC852181C107300BCBD42 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 839FC84F181C107300BCBD42 /* Default@2x.png */; }; @@ -55,12 +49,6 @@ 2F9BF83E866346FD8FC88787 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4FEA9C46C9904C3BBF393C63 /* Pods.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.xcconfig; path = Pods/Pods.xcconfig; sourceTree = SOURCE_ROOT; }; 839FC83D181C0B0A00BCBD42 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; - 839FC841181C106900BCBD42 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "Resources/Icon-72.png"; sourceTree = ""; }; - 839FC842181C106900BCBD42 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small-50.png"; path = "Resources/Icon-Small-50.png"; sourceTree = ""; }; - 839FC843181C106900BCBD42 /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small.png"; path = "Resources/Icon-Small.png"; sourceTree = ""; }; - 839FC844181C106900BCBD42 /* Icon-Small@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-Small@2x.png"; path = "Resources/Icon-Small@2x.png"; sourceTree = ""; }; - 839FC845181C106900BCBD42 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = Resources/Icon.png; sourceTree = ""; }; - 839FC846181C106900BCBD42 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "Resources/Icon@2x.png"; sourceTree = ""; }; 839FC84D181C107300BCBD42 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "Resources/Default-568h@2x.png"; sourceTree = ""; }; 839FC84E181C107300BCBD42 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Default.png; sourceTree = ""; }; 839FC84F181C107300BCBD42 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Default@2x.png"; sourceTree = ""; }; @@ -135,19 +123,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 839FC83F181C105200BCBD42 /* Icons */ = { - isa = PBXGroup; - children = ( - 839FC841181C106900BCBD42 /* Icon-72.png */, - 839FC842181C106900BCBD42 /* Icon-Small-50.png */, - 839FC843181C106900BCBD42 /* Icon-Small.png */, - 839FC844181C106900BCBD42 /* Icon-Small@2x.png */, - 839FC845181C106900BCBD42 /* Icon.png */, - 839FC846181C106900BCBD42 /* Icon@2x.png */, - ); - name = Icons; - sourceTree = ""; - }; 839FC840181C105700BCBD42 /* Launch Images */ = { isa = PBXGroup; children = ( @@ -214,7 +189,6 @@ isa = PBXGroup; children = ( 839FC840181C105700BCBD42 /* Launch Images */, - 839FC83F181C105200BCBD42 /* Icons */, 93D9F66B14D3997600AD2152 /* CAENLabStatus-Info.plist */, 93D9F66C14D3997600AD2152 /* InfoPlist.strings */, 93D9F66F14D3997600AD2152 /* main.m */, @@ -343,21 +317,15 @@ buildActionMask = 2147483647; files = ( 93D9F66E14D3997600AD2152 /* InfoPlist.strings in Resources */, - 839FC847181C106900BCBD42 /* Icon-72.png in Resources */, - 839FC848181C106900BCBD42 /* Icon-Small-50.png in Resources */, - 839FC84C181C106900BCBD42 /* Icon@2x.png in Resources */, 93FDA8C214D9FE1A00787F8C /* 247-InfoCircle.png in Resources */, - 839FC84A181C106900BCBD42 /* Icon-Small@2x.png in Resources */, 839FC851181C107300BCBD42 /* Default.png in Resources */, 93FDA8C314D9FE1A00787F8C /* 247-InfoCircle@2x.png in Resources */, 937CCCA81686463D0075BD01 /* greyButton.png in Resources */, - 839FC849181C106900BCBD42 /* Icon-Small.png in Resources */, 839FC852181C107300BCBD42 /* Default@2x.png in Resources */, 839FC854181C24F200BCBD42 /* Images.xcassets in Resources */, 937CCCA91686463D0075BD01 /* greyButton@2x.png in Resources */, 937CCCAA1686463D0075BD01 /* greyButtonHighlight.png in Resources */, 839FC850181C107300BCBD42 /* Default-568h@2x.png in Resources */, - 839FC84B181C106900BCBD42 /* Icon.png in Resources */, 937CCCAB1686463D0075BD01 /* greyButtonHighlight@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Contents.json b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Contents.json index 12e4085..06aa3ee 100644 --- a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,50 +1,58 @@ { "images" : [ { + "size" : "29x29", "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" + "filename" : "Icon-Small@2x.png", + "scale" : "2x" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-Spotlight-iOS7@2x.png", + "scale" : "2x" }, { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-120.png", + "scale" : "2x" }, { - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small.png", + "scale" : "1x" }, { + "size" : "29x29", "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" + "filename" : "Icon-Small@2x-1.png", + "scale" : "2x" }, { + "size" : "40x40", "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" + "filename" : "Icon-Spotlight-iOS7.png", + "scale" : "1x" }, { - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-Spotlight-iOS7@2x-1.png", + "scale" : "2x" }, { - "size" : "29x29", + "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-Small.png", + "filename" : "Icon-76.png", "scale" : "1x" }, { + "size" : "76x76", "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" + "filename" : "Icon-76@2x.png", + "scale" : "2x" } ], "info" : { diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-120.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-120.png new file mode 100644 index 0000000..591656a Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-120.png differ diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-76.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 0000000..72977ca Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 0000000..e8c51a5 Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png new file mode 100644 index 0000000..534a672 Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png differ diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png new file mode 100644 index 0000000..534a672 Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7.png new file mode 100644 index 0000000..7a201e8 Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7.png differ diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7@2x-1.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7@2x-1.png new file mode 100644 index 0000000..8bbdab6 Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7@2x-1.png differ diff --git a/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7@2x.png b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7@2x.png new file mode 100644 index 0000000..8bbdab6 Binary files /dev/null and b/CAENLabStatus/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-iOS7@2x.png differ diff --git a/CAENLabStatus/Resources/Icon-72.png b/CAENLabStatus/Resources/Icon-72.png deleted file mode 100644 index 714a870..0000000 Binary files a/CAENLabStatus/Resources/Icon-72.png and /dev/null differ diff --git a/CAENLabStatus/Resources/Icon-Small-50.png b/CAENLabStatus/Resources/Icon-Small-50.png deleted file mode 100644 index 4ddd86a..0000000 Binary files a/CAENLabStatus/Resources/Icon-Small-50.png and /dev/null differ diff --git a/CAENLabStatus/Resources/Icon-Small.png b/CAENLabStatus/Resources/Icon-Small.png deleted file mode 100644 index ce192c4..0000000 Binary files a/CAENLabStatus/Resources/Icon-Small.png and /dev/null differ diff --git a/CAENLabStatus/Resources/Icon-Small@2x.png b/CAENLabStatus/Resources/Icon-Small@2x.png deleted file mode 100644 index 5b470ad..0000000 Binary files a/CAENLabStatus/Resources/Icon-Small@2x.png and /dev/null differ diff --git a/CAENLabStatus/Resources/Icon.png b/CAENLabStatus/Resources/Icon.png deleted file mode 100644 index 0d69d92..0000000 Binary files a/CAENLabStatus/Resources/Icon.png and /dev/null differ diff --git a/CAENLabStatus/Resources/Icon@2x.png b/CAENLabStatus/Resources/Icon@2x.png deleted file mode 100644 index 853806d..0000000 Binary files a/CAENLabStatus/Resources/Icon@2x.png and /dev/null differ diff --git a/Icon/generated/Icon-120.png b/Icon/generated/Icon-120.png new file mode 100644 index 0000000..591656a Binary files /dev/null and b/Icon/generated/Icon-120.png differ diff --git a/Icon/generated/Icon-72.png b/Icon/generated/Icon-72.png new file mode 100644 index 0000000..52b6738 Binary files /dev/null and b/Icon/generated/Icon-72.png differ diff --git a/Icon/generated/Icon-72@2x.png b/Icon/generated/Icon-72@2x.png new file mode 100644 index 0000000..1ec1dd5 Binary files /dev/null and b/Icon/generated/Icon-72@2x.png differ diff --git a/Icon/generated/Icon-76.png b/Icon/generated/Icon-76.png new file mode 100644 index 0000000..72977ca Binary files /dev/null and b/Icon/generated/Icon-76.png differ diff --git a/Icon/generated/Icon-76@2x.png b/Icon/generated/Icon-76@2x.png new file mode 100644 index 0000000..e8c51a5 Binary files /dev/null and b/Icon/generated/Icon-76@2x.png differ diff --git a/Icon/generated/Icon-Small-50.png b/Icon/generated/Icon-Small-50.png new file mode 100644 index 0000000..8ef2e4d Binary files /dev/null and b/Icon/generated/Icon-Small-50.png differ diff --git a/Icon/generated/Icon-Small.png b/Icon/generated/Icon-Small.png new file mode 100644 index 0000000..f470153 Binary files /dev/null and b/Icon/generated/Icon-Small.png differ diff --git a/Icon/generated/Icon-Small@2x.png b/Icon/generated/Icon-Small@2x.png new file mode 100644 index 0000000..534a672 Binary files /dev/null and b/Icon/generated/Icon-Small@2x.png differ diff --git a/Icon/generated/Icon-Spotlight-iOS7.png b/Icon/generated/Icon-Spotlight-iOS7.png new file mode 100644 index 0000000..7a201e8 Binary files /dev/null and b/Icon/generated/Icon-Spotlight-iOS7.png differ diff --git a/Icon/generated/Icon-Spotlight-iOS7@2x.png b/Icon/generated/Icon-Spotlight-iOS7@2x.png new file mode 100644 index 0000000..8bbdab6 Binary files /dev/null and b/Icon/generated/Icon-Spotlight-iOS7@2x.png differ diff --git a/Icon/generated/Icon-iPad-Spotlight-iOS7@2x.png b/Icon/generated/Icon-iPad-Spotlight-iOS7@2x.png new file mode 100644 index 0000000..f27ea66 Binary files /dev/null and b/Icon/generated/Icon-iPad-Spotlight-iOS7@2x.png differ diff --git a/Icon/generated/Icon.png b/Icon/generated/Icon.png new file mode 100644 index 0000000..6670aee Binary files /dev/null and b/Icon/generated/Icon.png differ diff --git a/Icon/generated/Icon@2x.png b/Icon/generated/Icon@2x.png new file mode 100644 index 0000000..b030e8d Binary files /dev/null and b/Icon/generated/Icon@2x.png differ diff --git a/Icon/generated/iTunesArtwork b/Icon/generated/iTunesArtwork new file mode 100644 index 0000000..257fcae Binary files /dev/null and b/Icon/generated/iTunesArtwork differ diff --git a/Icon/generated/iTunesArtwork@2x b/Icon/generated/iTunesArtwork@2x new file mode 100644 index 0000000..249809e Binary files /dev/null and b/Icon/generated/iTunesArtwork@2x differ diff --git a/Icon/iTunesArtwork b/Icon/iTunesArtwork deleted file mode 100644 index 643c7a7..0000000 Binary files a/Icon/iTunesArtwork and /dev/null differ