diff --git a/Source/Resources/Icons/Icon-20.png b/Source/Resources/Icons/Icon-20.png new file mode 100644 index 0000000000..0c1d2f78d7 Binary files /dev/null and b/Source/Resources/Icons/Icon-20.png differ diff --git a/Source/Resources/Icons/Icon-20@2x.png b/Source/Resources/Icons/Icon-20@2x.png new file mode 100644 index 0000000000..b6aa647d9c Binary files /dev/null and b/Source/Resources/Icons/Icon-20@2x.png differ diff --git a/Source/Resources/Icons/Icon-20@3x.png b/Source/Resources/Icons/Icon-20@3x.png new file mode 100644 index 0000000000..64f6fcfcb7 Binary files /dev/null and b/Source/Resources/Icons/Icon-20@3x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Source/Resources/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..35bcc596a9 --- /dev/null +++ b/Source/Resources/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-20@2x-1.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-29@2x-1.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40@2x-1.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-1024.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-1024.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-1024.png new file mode 100644 index 0000000000..85ef1affc1 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-1024.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20.png new file mode 100644 index 0000000000..0c1d2f78d7 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png new file mode 100644 index 0000000000..b6aa647d9c Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png new file mode 100644 index 0000000000..b6aa647d9c Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png new file mode 100644 index 0000000000..64f6fcfcb7 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29.png new file mode 100644 index 0000000000..9a5fd862a9 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png new file mode 100644 index 0000000000..a138dc23ab Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png new file mode 100644 index 0000000000..a138dc23ab Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png new file mode 100644 index 0000000000..addce683b0 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 0000000000..b6aa647d9c Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png new file mode 100644 index 0000000000..65afeb9506 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 0000000000..65afeb9506 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png new file mode 100644 index 0000000000..fb4d0c869a Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 0000000000..a34708de8c Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png new file mode 100644 index 0000000000..08c9bdd38a Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 0000000000..f715cbab2d Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 0000000000..3cdc5a2e5f Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 0000000000..1f0f7ff0e7 Binary files /dev/null and b/Source/Resources/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/Source/Resources/Images.xcassets/Contents.json b/Source/Resources/Images.xcassets/Contents.json new file mode 100644 index 0000000000..da4a164c91 --- /dev/null +++ b/Source/Resources/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Source/edX-Info.plist b/Source/edX-Info.plist index e438c089ee..37188350b4 100644 --- a/Source/edX-Info.plist +++ b/Source/edX-Info.plist @@ -53,7 +53,7 @@ CFBundleVersion - 2.13.0 + 2.13.2 FIREBASE_ANALYTICS_COLLECTION_ENABLED FacebookDisplayName diff --git a/edX.xcodeproj/project.pbxproj b/edX.xcodeproj/project.pbxproj index 86164c0097..c2744aee1f 100644 --- a/edX.xcodeproj/project.pbxproj +++ b/edX.xcodeproj/project.pbxproj @@ -110,6 +110,7 @@ 22A4191E1EB1CF1500BBC8CA /* shareCourse@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 22A4191C1EB1CF1500BBC8CA /* shareCourse@2x.png */; }; 22AB76181FFF62A80082F4EE /* CourseCertificateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22AB76171FFF62A80082F4EE /* CourseCertificateView.swift */; }; 22B6EF851FB4684A00480A38 /* CourseTabBarLoadStateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22B6EF841FB4684A00480A38 /* CourseTabBarLoadStateViewController.swift */; }; + 22B85A34203EEE1E0071AD43 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 22B85A33203EEE1E0071AD43 /* Images.xcassets */; }; 22D73B5D1ED575C000220280 /* course-dates.js in Resources */ = {isa = PBXBuildFile; fileRef = 22D73B5C1ED575C000220280 /* course-dates.js */; }; 22DCA5031F0E6B41009E64D7 /* CourseSectionTableViewCellTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22DCA5021F0E6B41009E64D7 /* CourseSectionTableViewCellTests.swift */; }; 22F8A9101F45EFAF0025E18A /* AccountViewControllerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22F8A90F1F45EFAF0025E18A /* AccountViewControllerTest.swift */; }; @@ -913,6 +914,7 @@ 22A4191C1EB1CF1500BBC8CA /* shareCourse@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shareCourse@2x.png"; sourceTree = ""; }; 22AB76171FFF62A80082F4EE /* CourseCertificateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseCertificateView.swift; sourceTree = ""; }; 22B6EF841FB4684A00480A38 /* CourseTabBarLoadStateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseTabBarLoadStateViewController.swift; sourceTree = ""; }; + 22B85A33203EEE1E0071AD43 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 22D73B5C1ED575C000220280 /* course-dates.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "course-dates.js"; sourceTree = ""; }; 22DCA5021F0E6B41009E64D7 /* CourseSectionTableViewCellTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseSectionTableViewCellTests.swift; sourceTree = ""; }; 22F8A90F1F45EFAF0025E18A /* AccountViewControllerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AccountViewControllerTest.swift; path = ../Source/AccountViewControllerTest.swift; sourceTree = ""; }; @@ -2034,6 +2036,7 @@ 69ECC5A11D50D1170030CF87 /* Resources */ = { isa = PBXGroup; children = ( + 22B85A33203EEE1E0071AD43 /* Images.xcassets */, 77BFD8691BB9E15B001D7BE5 /* Strings.swift */, 6919F5FB1D65CD14006935C8 /* Colors */, 69ECC5A21D50D1170030CF87 /* Fonts */, @@ -3722,6 +3725,7 @@ 69ECC6171D50D1170030CF87 /* bt_google.png in Resources */, 69ECC62E1D50D1170030CF87 /* ic_cancel.png in Resources */, 69ECC64E1D50D1170030CF87 /* Default-414w-736h@3x.png in Resources */, + 22B85A34203EEE1E0071AD43 /* Images.xcassets in Resources */, B4B6D5EA1A9490FC000F44E8 /* OEXRegistrationViewController.xib in Resources */, 69ECC5FE1D50D1170030CF87 /* OpenSans-Bold.ttf in Resources */, 69ECC60F1D50D1170030CF87 /* arrow_next@2x.png in Resources */, @@ -4754,6 +4758,7 @@ baseConfigurationReference = 6C5AB6D484316B1D809C5BC7 /* Pods-edX.profile.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = edX.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -5193,6 +5198,7 @@ baseConfigurationReference = B1AF3BB032520841A93A174B /* Pods-edX.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = edX.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -5230,6 +5236,7 @@ baseConfigurationReference = FFF07B872500B8140F91FB08 /* Pods-edX.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = edX.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer";