diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index ccc796aa6..8c9022bab 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -394,6 +394,7 @@ B6416FD1199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416FA2199A0478003C5699 /* Localizable.strings */; }; B6416FD2199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416FA5199A0478003C5699 /* Localizable.strings */; }; B6416FD4199A0478003C5699 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6416FAB199A0478003C5699 /* Localizable.strings */; }; + B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B66DBF4919D5BBC8006EA940 /* Images.xcassets */; }; B67ADDC41989FF8700E1A773 /* CallServerRequestsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B67ADDC31989FF8700E1A773 /* CallServerRequestsManager.m */; }; B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B67EBF5C19194AC60084CCFD /* Settings.bundle */; }; B684A46D19C3446200B11029 /* PushManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B684A46C19C3446200B11029 /* PushManagerTest.m */; }; @@ -1097,6 +1098,7 @@ B6416FAC199A0478003C5699 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = Localizable.strings; sourceTree = ""; }; B657DDC91911A40500F45B0C /* Signal.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Signal.entitlements; sourceTree = ""; }; B661C211198EE2EA00548CA1 /* iOSVersions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iOSVersions.h; path = src/environment/iOSVersions.h; sourceTree = ""; }; + B66DBF4919D5BBC8006EA940 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; B67ADDC21989FF8700E1A773 /* CallServerRequestsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallServerRequestsManager.h; sourceTree = ""; }; B67ADDC31989FF8700E1A773 /* CallServerRequestsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallServerRequestsManager.m; sourceTree = ""; }; B67EBF5C19194AC60084CCFD /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = SettingsBundle/Settings.bundle; sourceTree = SOURCE_ROOT; }; @@ -2844,6 +2846,7 @@ 76EB03C118170B33006006FC /* src */, D221A094169C9E5E00537ABF /* Supporting Files */, A15706EA17F0CD6D007C2BD6 /* test */, + B66DBF4919D5BBC8006EA940 /* Images.xcassets */, ); path = Signal; sourceTree = ""; @@ -3253,6 +3256,7 @@ E14874E118A06930002CC4F3 /* spinner_error.png in Resources */, B6416FBF199A0478003C5699 /* Localizable.strings in Resources */, B6416FB7199A0478003C5699 /* Localizable.strings in Resources */, + B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */, E14874E218A06930002CC4F3 /* spinner_error@2x.png in Resources */, E14874E318A06930002CC4F3 /* spinner_ringing.png in Resources */, E14874E418A06930002CC4F3 /* spinner_ringing@2x.png in Resources */, @@ -4213,6 +4217,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = C71793B33D9C45079F74487E /* Pods.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( @@ -4442,6 +4448,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = C71793B33D9C45079F74487E /* Pods.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( @@ -4492,6 +4500,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = C71793B33D9C45079F74487E /* Pods.xcconfig */; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ( diff --git a/Signal/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/Signal/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png new file mode 100644 index 000000000..991d0c99f Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png differ diff --git a/Signal/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/Signal/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png new file mode 100644 index 000000000..737b1b6aa Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png differ diff --git a/Signal/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png b/Signal/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png new file mode 100644 index 000000000..65bfe9b2f Binary files /dev/null and b/Signal/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png differ diff --git a/Signal/Images.xcassets/AppIcon.appiconset/Contents.json b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..e8e65e689 --- /dev/null +++ b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,31 @@ +{ + "images" : [ + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon60x60@2x.png", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/LaunchImage.launchimage/Contents.json b/Signal/Images.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 000000000..3dd8aa5b6 --- /dev/null +++ b/Signal/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,142 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "landscape", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "736h", + "scale" : "3x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "8.0", + "subtype" : "667h", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 5caea5bf5..e6662df88 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -9,17 +9,9 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29 - AppIcon40x40 - AppIcon60x60 - - - + + CFBundleIcons~ipad + CFBundleIdentifier org.whispersystems.signal CFBundleInfoDictionaryVersion @@ -29,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.5 + 1.0.6 CFBundleSignature ???? CFBundleVersion - 1.0.5 + 1.0.6 LSApplicationCategoryType public.app-category.social-networking LSRequiresIPhoneOS