diff --git a/MisticaCatalog/MisticaCatalog.xcodeproj/project.pbxproj b/MisticaCatalog/MisticaCatalog.xcodeproj/project.pbxproj index 7d3d2981..ff2a1c0f 100644 --- a/MisticaCatalog/MisticaCatalog.xcodeproj/project.pbxproj +++ b/MisticaCatalog/MisticaCatalog.xcodeproj/project.pbxproj @@ -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 */; }; @@ -147,11 +147,11 @@ 84126F742C2C00C500ECA607 /* OnAir-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OnAir-Regular.ttf"; sourceTree = ""; }; 84126F752C2C00C500ECA607 /* VivoTypeBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeBold.ttf; sourceTree = ""; }; 84126F762C2C00C500ECA607 /* OnAir-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OnAir-Light.ttf"; sourceTree = ""; }; + 842854E92CD911E500F007AB /* VivoTypeMedium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeMedium.ttf; sourceTree = ""; }; 843681FD2C36E48B007B30C4 /* BrandStyle+FontMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BrandStyle+FontMapping.swift"; sourceTree = ""; wrapsLines = 0; }; 84388C202C380B78007606B3 /* OnAir-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OnAir-Bold.ttf"; sourceTree = ""; }; 84388C222C380E0D007606B3 /* Telefonica Sans DemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Telefonica Sans DemiBold.otf"; sourceTree = ""; }; 8462A7A32C34176400BE8E96 /* Telefonica Sans Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Telefonica Sans Light.otf"; sourceTree = ""; }; - 84A4D95A2CC9153700993950 /* VivoTypeMedium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeMedium.otf; sourceTree = ""; }; B8E161F92546EF9500DA3743 /* mistica-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "mistica-ios"; path = ..; sourceTree = ""; }; 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 = ""; }; @@ -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 */, @@ -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 */, ); diff --git a/MisticaCatalog/Resources/VivoTypeBold.ttf b/MisticaCatalog/Resources/VivoTypeBold.ttf index a4c8b017..10ee6e15 100644 Binary files a/MisticaCatalog/Resources/VivoTypeBold.ttf and b/MisticaCatalog/Resources/VivoTypeBold.ttf differ diff --git a/MisticaCatalog/Resources/VivoTypeLight.ttf b/MisticaCatalog/Resources/VivoTypeLight.ttf index 2f7c700c..b31c06d8 100644 Binary files a/MisticaCatalog/Resources/VivoTypeLight.ttf and b/MisticaCatalog/Resources/VivoTypeLight.ttf differ diff --git a/MisticaCatalog/Resources/VivoTypeMedium.otf b/MisticaCatalog/Resources/VivoTypeMedium.otf deleted file mode 100644 index 005a61d4..00000000 Binary files a/MisticaCatalog/Resources/VivoTypeMedium.otf and /dev/null differ diff --git a/MisticaCatalog/Resources/VivoTypeMedium.ttf b/MisticaCatalog/Resources/VivoTypeMedium.ttf new file mode 100644 index 00000000..8b7f7ee7 Binary files /dev/null and b/MisticaCatalog/Resources/VivoTypeMedium.ttf differ diff --git a/MisticaCatalog/Resources/VivoTypeRegular.ttf b/MisticaCatalog/Resources/VivoTypeRegular.ttf index c236d307..8ca0f292 100644 Binary files a/MisticaCatalog/Resources/VivoTypeRegular.ttf and b/MisticaCatalog/Resources/VivoTypeRegular.ttf differ diff --git a/MisticaCatalog/Source/Common/Extensions/BrandStyle+FontMapping.swift b/MisticaCatalog/Source/Common/Extensions/BrandStyle+FontMapping.swift index 8161fc7f..34a33ba6 100644 --- a/MisticaCatalog/Source/Common/Extensions/BrandStyle+FontMapping.swift +++ b/MisticaCatalog/Source/Common/Extensions/BrandStyle+FontMapping.swift @@ -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( diff --git a/MisticaCatalog/SupportFiles/Info.plist b/MisticaCatalog/SupportFiles/Info.plist index 529832be..756f07ec 100644 --- a/MisticaCatalog/SupportFiles/Info.plist +++ b/MisticaCatalog/SupportFiles/Info.plist @@ -42,7 +42,7 @@ OnAir-Regular.ttf OnAir-Bold.ttf VivoTypeBold.ttf - VivoTypeMedium.otf + VivoTypeMedium.ttf VivoTypeLight.ttf VivoTypeRegular.ttf Telefonica Sans Light.otf