Skip to content
This repository has been archived by the owner on May 6, 2024. It is now read-only.

Commit

Permalink
LEARNER-6171, update fontawesome font file and add clone font for pro…
Browse files Browse the repository at this point in the history 
…grams (#1152)
  • Loading branch information
@salman2013
salman2013 committed Aug 31, 2018
1 parent 779e245 commit 523dfcd
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Libraries/FontAwesome.swift/Classes/FontAwesome.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Source/EnrolledTabBarViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 3 additions & 0 deletions Source/Icon.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public enum Icon {
case MoreOptionsIcon
case Account
case ArrowLeft
case Clone

private var renderer : IconRenderer {
switch self {
Expand All @@ -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:
Expand Down
Binary file removed Source/Resources/Fonts/FontAwesome.otf
View file
Binary file not shown.
Binary file added Source/Resources/Fonts/FontAwesome.ttf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Source/edX-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<string>so you can select a profile image</string>
<key>UIAppFonts</key>
<array>
<string>FontAwesome.otf</string>
<string>FontAwesome.ttf</string>
<string>OpenSans-Italic.ttf</string>
<string>OpenSans-Regular.ttf</string>
<string>OpenSans-Semibold.ttf</string>
Expand Down
8 changes: 4 additions & 4 deletions edX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */; };
Expand Down Expand Up @@ -1031,6 +1031,7 @@
228CBD871ECF553E0054D063 /* CourseShareUtmParameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseShareUtmParameters.swift; sourceTree = "<group>"; };
228E0B8C1F431F7B0073E6FA /* AccountViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = "<group>"; };
228E0B8E1F43208C0073E6FA /* AccountViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountViewCell.swift; sourceTree = "<group>"; };
228E169B2136BC0E006FA184 /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = "<group>"; };
2294A549206E637000D64FFC /* VideoPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayer.swift; sourceTree = "<group>"; };
22A1B6FE206CFFA3001C1704 /* TranscriptManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranscriptManager.swift; sourceTree = "<group>"; };
22A4191B1EB1CF1500BBC8CA /* shareCourse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shareCourse.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1092,7 +1093,6 @@
69C12C651E07F5F8004E7261 /* VideoTranscript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoTranscript.swift; sourceTree = "<group>"; };
69DD264F1D8FC55C00CF7E87 /* RegistrationForm.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = RegistrationForm.json; sourceTree = "<group>"; };
69E1CD001D7D7BA300531449 /* OEXRegistrationViewController+Swift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OEXRegistrationViewController+Swift.swift"; sourceTree = "<group>"; };
69ECC5A31D50D1170030CF87 /* FontAwesome.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.otf; sourceTree = "<group>"; };
69ECC5A41D50D1170030CF87 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-Bold.ttf"; sourceTree = "<group>"; };
69ECC5A51D50D1170030CF87 /* OpenSans-BoldItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-BoldItalic.ttf"; sourceTree = "<group>"; };
69ECC5A61D50D1170030CF87 /* OpenSans-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OpenSans-ExtraBold.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -4156,7 +4156,6 @@
E054B09F1EC3178200FACBA6 /* screen_1.png in Resources */,
B71AA1B620CEF64D00700C5E /* [email protected] in Resources */,
B75E8F5E20A5B1EB00685F58 /* [email protected] in Resources */,
69ECC5FD1D50D1170030CF87 /* FontAwesome.otf in Resources */,
B71AA1CC20CEF64D00700C5E /* [email protected] in Resources */,
B71AA1CB20CEF64D00700C5E /* [email protected] in Resources */,
B793455D20B584F500DBFC33 /* subjects.json in Resources */,
Expand Down Expand Up @@ -4212,6 +4211,7 @@
69ECC63E1D50D1170030CF87 /* icon_google_white.png in Resources */,
B71AA1A020CEF64D00700C5E /* [email protected] in Resources */,
69ECC63D1D50D1170030CF87 /* [email protected] in Resources */,
228E169C2136BC0E006FA184 /* FontAwesome.ttf in Resources */,
69ECC6361D50D1170030CF87 /* [email protected] in Resources */,
69ECC6081D50D1170030CF87 /* Icon-29.png in Resources */,
69ECC6041D50D1170030CF87 /* OpenSans-LightItalic.ttf in Resources */,
Expand Down

0 comments on commit 523dfcd

Please sign in to comment.