diff --git a/Libraries/FontAwesome.swift/Classes/FontAwesome.swift b/Libraries/FontAwesome.swift/Classes/FontAwesome.swift index db0f2b3daf..dfbcde20d6 100644 --- a/Libraries/FontAwesome.swift/Classes/FontAwesome.swift +++ b/Libraries/FontAwesome.swift/Classes/FontAwesome.swift @@ -33,7 +33,7 @@ private class FontLoader { // If this framework is added using CocoaPods, resources is placed under a subdirectory fontURL = bundle.url(forResource: name, withExtension: "otf", subdirectory: "FontAwesome.swift.bundle")! } else { - fontURL = bundle.url(forResource: name, withExtension: "otf")! + fontURL = bundle.url(forResource: name, withExtension: "ttf")! } let data = try! Data(contentsOf: fontURL) @@ -654,6 +654,7 @@ public enum FontAwesome: String { case Yen = "\u{f157}C" case Youtube = "\u{f167}" case YoutubePlay = "\u{f16a}" + case Clone = "\u{f24d}" } public extension String { diff --git a/Source/EnrolledTabBarViewController.swift b/Source/EnrolledTabBarViewController.swift index 0d8366ad7a..605bfb7394 100644 --- a/Source/EnrolledTabBarViewController.swift +++ b/Source/EnrolledTabBarViewController.swift @@ -90,7 +90,7 @@ class EnrolledTabBarViewController: UITabBarController, UITabBarControllerDelega tabBarItems.append(item) case .Program: guard environment.config.programConfig.enabled, let programsURL = environment.config.programConfig.programURL else { break } - item = TabBarItem(title: option.title(), viewController: ProgramsViewController(environment: environment, programsURL: programsURL), icon: Icon.Courseware, detailText: Strings.Dashboard.courseCourseDetail) + item = TabBarItem(title: option.title(), viewController: ProgramsViewController(environment: environment, programsURL: programsURL), icon: Icon.Clone, detailText: Strings.Dashboard.courseCourseDetail) tabBarItems.append(item) case .CourseCatalog: guard environment.config.courseEnrollmentConfig.isCourseDiscoveryEnabled(), let router = environment.router else { break } diff --git a/Source/Icon.swift b/Source/Icon.swift index adf6916854..db1e84cd05 100644 --- a/Source/Icon.swift +++ b/Source/Icon.swift @@ -149,6 +149,7 @@ public enum Icon { case MoreOptionsIcon case Account case ArrowLeft + case Clone private var renderer : IconRenderer { switch self { @@ -166,6 +167,8 @@ public enum Icon { return FontAwesomeRenderer(icon: .Camera) case .Close: return FontAwesomeRenderer(icon: .Close) + case .Clone: + return FontAwesomeRenderer(icon: .Clone) case .Comment: return FontAwesomeRenderer(icon: .Comment) case .Comments: diff --git a/Source/Resources/Fonts/FontAwesome.otf b/Source/Resources/Fonts/FontAwesome.otf deleted file mode 100644 index f7936cc1e7..0000000000 Binary files a/Source/Resources/Fonts/FontAwesome.otf and /dev/null differ diff --git a/Source/Resources/Fonts/FontAwesome.ttf b/Source/Resources/Fonts/FontAwesome.ttf new file mode 100644 index 0000000000..26dea7951a Binary files /dev/null and b/Source/Resources/Fonts/FontAwesome.ttf differ diff --git a/Source/edX-Info.plist b/Source/edX-Info.plist index 57ac0bf8b2..de2a59192d 100644 --- a/Source/edX-Info.plist +++ b/Source/edX-Info.plist @@ -94,7 +94,7 @@ so you can select a profile image UIAppFonts - FontAwesome.otf + FontAwesome.ttf OpenSans-Italic.ttf OpenSans-Regular.ttf OpenSans-Semibold.ttf diff --git a/edX.xcodeproj/project.pbxproj b/edX.xcodeproj/project.pbxproj index 72ca5559f4..54d4e49c54 100644 --- a/edX.xcodeproj/project.pbxproj +++ b/edX.xcodeproj/project.pbxproj @@ -111,6 +111,7 @@ 228CBD881ECF553E0054D063 /* CourseShareUtmParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 228CBD871ECF553E0054D063 /* CourseShareUtmParameters.swift */; }; 228E0B8D1F431F7B0073E6FA /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 228E0B8C1F431F7B0073E6FA /* AccountViewController.swift */; }; 228E0B8F1F43208C0073E6FA /* AccountViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 228E0B8E1F43208C0073E6FA /* AccountViewCell.swift */; }; + 228E169C2136BC0E006FA184 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 228E169B2136BC0E006FA184 /* FontAwesome.ttf */; }; 2294A54A206E637100D64FFC /* VideoPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2294A549206E637000D64FFC /* VideoPlayer.swift */; }; 22A1B6FF206CFFA3001C1704 /* TranscriptManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22A1B6FE206CFFA3001C1704 /* TranscriptManager.swift */; }; 22A4191D1EB1CF1500BBC8CA /* shareCourse.png in Resources */ = {isa = PBXBuildFile; fileRef = 22A4191B1EB1CF1500BBC8CA /* shareCourse.png */; }; @@ -174,7 +175,6 @@ 69AD2B8D1E4B1CE500029B9B /* RatingViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69AD2B8B1E4B1CA000029B9B /* RatingViewControllerTests.swift */; }; 69C12C661E07F5F8004E7261 /* VideoTranscript.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69C12C651E07F5F8004E7261 /* VideoTranscript.swift */; }; 69E1CD011D7D7BA300531449 /* OEXRegistrationViewController+Swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69E1CD001D7D7BA300531449 /* OEXRegistrationViewController+Swift.swift */; }; - 69ECC5FD1D50D1170030CF87 /* FontAwesome.otf in Resources */ = {isa = PBXBuildFile; fileRef = 69ECC5A31D50D1170030CF87 /* FontAwesome.otf */; }; 69ECC5FE1D50D1170030CF87 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 69ECC5A41D50D1170030CF87 /* OpenSans-Bold.ttf */; }; 69ECC5FF1D50D1170030CF87 /* OpenSans-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 69ECC5A51D50D1170030CF87 /* OpenSans-BoldItalic.ttf */; }; 69ECC6001D50D1170030CF87 /* OpenSans-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 69ECC5A61D50D1170030CF87 /* OpenSans-ExtraBold.ttf */; }; @@ -1031,6 +1031,7 @@ 228CBD871ECF553E0054D063 /* CourseShareUtmParameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseShareUtmParameters.swift; sourceTree = ""; }; 228E0B8C1F431F7B0073E6FA /* AccountViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = ""; }; 228E0B8E1F43208C0073E6FA /* AccountViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountViewCell.swift; sourceTree = ""; }; + 228E169B2136BC0E006FA184 /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = ""; }; 2294A549206E637000D64FFC /* VideoPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayer.swift; sourceTree = ""; }; 22A1B6FE206CFFA3001C1704 /* TranscriptManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranscriptManager.swift; sourceTree = ""; }; 22A4191B1EB1CF1500BBC8CA /* shareCourse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shareCourse.png; sourceTree = ""; }; @@ -1092,7 +1093,6 @@ 69C12C651E07F5F8004E7261 /* VideoTranscript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoTranscript.swift; sourceTree = ""; }; 69DD264F1D8FC55C00CF7E87 /* RegistrationForm.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = RegistrationForm.json; sourceTree = ""; }; 69E1CD001D7D7BA300531449 /* OEXRegistrationViewController+Swift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OEXRegistrationViewController+Swift.swift"; sourceTree = ""; }; - 69ECC5A31D50D1170030CF87 /* FontAwesome.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.otf; sourceTree = ""; }; 69ECC5A41D50D1170030CF87 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Bold.ttf"; sourceTree = ""; }; 69ECC5A51D50D1170030CF87 /* OpenSans-BoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-BoldItalic.ttf"; sourceTree = ""; }; 69ECC5A61D50D1170030CF87 /* OpenSans-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-ExtraBold.ttf"; sourceTree = ""; }; @@ -2282,8 +2282,8 @@ 69ECC5A21D50D1170030CF87 /* Fonts */ = { isa = PBXGroup; children = ( + 228E169B2136BC0E006FA184 /* FontAwesome.ttf */, BD7C6C3F1DCA329A0004D135 /* fonts.json */, - 69ECC5A31D50D1170030CF87 /* FontAwesome.otf */, 69ECC5A41D50D1170030CF87 /* OpenSans-Bold.ttf */, 69ECC5A51D50D1170030CF87 /* OpenSans-BoldItalic.ttf */, 69ECC5A61D50D1170030CF87 /* OpenSans-ExtraBold.ttf */, @@ -4156,7 +4156,6 @@ E054B09F1EC3178200FACBA6 /* screen_1.png in Resources */, B71AA1B620CEF64D00700C5E /* environmental-studies@2x.png in Resources */, B75E8F5E20A5B1EB00685F58 /* Default-Landscape-375w-812h@3x.png in Resources */, - 69ECC5FD1D50D1170030CF87 /* FontAwesome.otf in Resources */, B71AA1CC20CEF64D00700C5E /* medicine@2x.png in Resources */, B71AA1CB20CEF64D00700C5E /* engineering@2x.png in Resources */, B793455D20B584F500DBFC33 /* subjects.json in Resources */, @@ -4212,6 +4211,7 @@ 69ECC63E1D50D1170030CF87 /* icon_google_white.png in Resources */, B71AA1A020CEF64D00700C5E /* social-sciences@3x.png in Resources */, 69ECC63D1D50D1170030CF87 /* icon_facebook_white@2x.png in Resources */, + 228E169C2136BC0E006FA184 /* FontAwesome.ttf in Resources */, 69ECC6361D50D1170030CF87 /* ic_partiallywatched@2x.png in Resources */, 69ECC6081D50D1170030CF87 /* Icon-29.png in Resources */, 69ECC6041D50D1170030CF87 /* OpenSans-LightItalic.ttf in Resources */,