Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IOS-10636 update font file without altering the font itself #408

Merged
merged 1 commit into from
Nov 6, 2024
Merged

IOS-10636 update font file without altering the font itself #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions MisticaCatalog/MisticaCatalog.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
84126F7A2C2C00C500ECA607 /* OnAir-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84126F742C2C00C500ECA607 /* OnAir-Regular.ttf */; };
84126F7B2C2C00C500ECA607 /* VivoTypeBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84126F752C2C00C500ECA607 /* VivoTypeBold.ttf */; };
84126F7C2C2C00C500ECA607 /* OnAir-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84126F762C2C00C500ECA607 /* OnAir-Light.ttf */; };
842854EA2CD911E500F007AB /* VivoTypeMedium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 842854E92CD911E500F007AB /* VivoTypeMedium.ttf */; };
843681FE2C36E48B007B30C4 /* BrandStyle+FontMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 843681FD2C36E48B007B30C4 /* BrandStyle+FontMapping.swift */; };
84388C212C380B78007606B3 /* OnAir-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84388C202C380B78007606B3 /* OnAir-Bold.ttf */; };
84388C232C380E0D007606B3 /* Telefonica Sans DemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 84388C222C380E0D007606B3 /* Telefonica Sans DemiBold.otf */; };
8462A7A62C34176400BE8E96 /* Telefonica Sans Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8462A7A32C34176400BE8E96 /* Telefonica Sans Light.otf */; };
84A4D95B2CC9153D00993950 /* VivoTypeMedium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 84A4D95A2CC9153700993950 /* VivoTypeMedium.otf */; };
B8EE89F22614B57600F79386 /* AppCenterDistribute in Frameworks */ = {isa = PBXBuildFile; productRef = B8EE89F12614B57600F79386 /* AppCenterDistribute */; };
B8F9902C2546C98600DFBFE9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B8F98FFE2546C98600DFBFE9 /* LaunchScreen.storyboard */; };
B8F990302546C98700DFBFE9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B8F990032546C98600DFBFE9 /* Assets.xcassets */; };
Expand Down Expand Up @@ -147,11 +147,11 @@
84126F742C2C00C500ECA607 /* OnAir-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OnAir-Regular.ttf"; sourceTree = "<group>"; };
84126F752C2C00C500ECA607 /* VivoTypeBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeBold.ttf; sourceTree = "<group>"; };
84126F762C2C00C500ECA607 /* OnAir-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OnAir-Light.ttf"; sourceTree = "<group>"; };
842854E92CD911E500F007AB /* VivoTypeMedium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeMedium.ttf; sourceTree = "<group>"; };
843681FD2C36E48B007B30C4 /* BrandStyle+FontMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BrandStyle+FontMapping.swift"; sourceTree = "<group>"; wrapsLines = 0; };
84388C202C380B78007606B3 /* OnAir-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OnAir-Bold.ttf"; sourceTree = "<group>"; };
84388C222C380E0D007606B3 /* Telefonica Sans DemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Telefonica Sans DemiBold.otf"; sourceTree = "<group>"; };
8462A7A32C34176400BE8E96 /* Telefonica Sans Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Telefonica Sans Light.otf"; sourceTree = "<group>"; };
84A4D95A2CC9153700993950 /* VivoTypeMedium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeMedium.otf; sourceTree = "<group>"; };
B8E161F92546EF9500DA3743 /* mistica-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "mistica-ios"; path = ..; sourceTree = "<group>"; };
B8F98FEA2546C95600DFBFE9 /* MisticaCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MisticaCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
B8F98FFE2546C98600DFBFE9 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -278,7 +278,7 @@
84388C202C380B78007606B3 /* OnAir-Bold.ttf */,
84126F712C2C00C500ECA607 /* VivoTypeLight.ttf */,
84126F722C2C00C500ECA607 /* VivoTypeRegular.ttf */,
84A4D95A2CC9153700993950 /* VivoTypeMedium.otf */,
842854E92CD911E500F007AB /* VivoTypeMedium.ttf */,
84126F752C2C00C500ECA607 /* VivoTypeBold.ttf */,
8462A7A32C34176400BE8E96 /* Telefonica Sans Light.otf */,
84038E092C38382E003E90F6 /* Telefonica Sans Regular.otf */,
Expand Down Expand Up @@ -472,7 +472,7 @@
84126F772C2C00C500ECA607 /* VivoTypeLight.ttf in Resources */,
8462A7A62C34176400BE8E96 /* Telefonica Sans Light.otf in Resources */,
84126F792C2C00C500ECA607 /* OnAir-Medium.ttf in Resources */,
84A4D95B2CC9153D00993950 /* VivoTypeMedium.otf in Resources */,
842854EA2CD911E500F007AB /* VivoTypeMedium.ttf in Resources */,
84126F782C2C00C500ECA607 /* VivoTypeRegular.ttf in Resources */,
84126F7A2C2C00C500ECA607 /* OnAir-Regular.ttf in Resources */,
);
Expand Down
Binary file modified MisticaCatalog/Resources/VivoTypeBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified MisticaCatalog/Resources/VivoTypeLight.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed MisticaCatalog/Resources/VivoTypeMedium.otf
View file
Open in desktop
Binary file not shown.
Binary file added MisticaCatalog/Resources/VivoTypeMedium.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified MisticaCatalog/Resources/VivoTypeRegular.ttf
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions MisticaCatalog/Source/Common/Extensions/BrandStyle+FontMapping.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ extension BrandStyle {
switch self {
case .vivoNew:
return FontMapping(
lightFont: "VivoType-Light",
lightFont: "VivoTypeLight",
mediumFont: "VivoTypeMedium",
boldFont: "VivoType-Bold",
defaultFont: "VivoType-Regular"
boldFont: "VivoTypeBold",
defaultFont: "VivoTypeRegular"
)
case .o2, .o2New, .movistar:
return FontMapping(
Expand Down
2 changes: 1 addition & 1 deletion MisticaCatalog/SupportFiles/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<string>OnAir-Regular.ttf</string>
<string>OnAir-Bold.ttf</string>
<string>VivoTypeBold.ttf</string>
<string>VivoTypeMedium.otf</string>
<string>VivoTypeMedium.ttf</string>
<string>VivoTypeLight.ttf</string>
<string>VivoTypeRegular.ttf</string>
<string>Telefonica Sans Light.otf</string>
Expand Down
Loading