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 10314-include custom fonts in mistica catalog app #376

Merged
merged 17 commits into from
Jul 12, 2024
Merged

Ios 10314-include custom fonts in mistica catalog app #376

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b9623a3
IOS-10314 include custom fonts in Mistica Catalog app
L-Trujillo26 Jun 28, 2024
b9a0cde
Merge branch 'main' into IOS-10314-include-custom-fonts-in-Mistica-Ca…
L-Trujillo26 Jun 28, 2024
354921f
Run swiftformat
L-Trujillo26 Jun 28, 2024
aa12beb
IOS-10314 included fonts for exhaustive use cases
L-Trujillo26 Jun 28, 2024
5e53679
Run swiftformat
L-Trujillo26 Jun 28, 2024
d06b2c8
IOS-10314 modified implementacion for brand font style configuration …
L-Trujillo26 Jul 5, 2024
7a90965
Run swiftformat
L-Trujillo26 Jul 5, 2024
d96e491
IOS-10314 modified implementacion for brand font style configuration …
L-Trujillo26 Jul 5, 2024
79abd50
IOS-10314 improve implementation
L-Trujillo26 Jul 5, 2024
3c14466
Run swiftformat
L-Trujillo26 Jul 5, 2024
397577b
Merge remote-tracking branch 'origin' into IOS-10314-include-custom-f…
L-Trujillo26 Jul 5, 2024
375277f
IOS-10314 fix font implementation issues
L-Trujillo26 Jul 5, 2024
71777dc
Run swiftformat
L-Trujillo26 Jul 5, 2024
826d460
IOS-10314 fix telefonica font name
L-Trujillo26 Jul 5, 2024
8c5fe51
IOS-10314 fix path telefonica regular font
L-Trujillo26 Jul 5, 2024
b04031f
IOS-10314 changes in comments
L-Trujillo26 Jul 12, 2024
68d4e01
Run swiftformat
L-Trujillo26 Jul 12, 2024
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
32 changes: 32 additions & 0 deletions MisticaCatalog/MisticaCatalog.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@
18E485A6287F19EB0052A6F2 /* UICatalogHeaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18E48577287F19EB0052A6F2 /* UICatalogHeaderViewController.swift */; };
392E03DC28C6153C0081780B /* UICatalogSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392E03DB28C6153C0081780B /* UICatalogSheetViewController.swift */; };
3968C75E28C9E19600561194 /* UIStepperTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3968C75D28C9E19600561194 /* UIStepperTableViewCell.swift */; };
84126F772C2C00C500ECA607 /* VivoTypeLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84126F712C2C00C500ECA607 /* VivoTypeLight.ttf */; };
84126F782C2C00C500ECA607 /* VivoTypeRegular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84126F722C2C00C500ECA607 /* VivoTypeRegular.ttf */; };
84126F792C2C00C500ECA607 /* OnAir-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84126F732C2C00C500ECA607 /* OnAir-Medium.ttf */; };
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 */; };
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 @@ -124,6 +130,12 @@
18E48577287F19EB0052A6F2 /* UICatalogHeaderViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UICatalogHeaderViewController.swift; sourceTree = "<group>"; };
392E03DB28C6153C0081780B /* UICatalogSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UICatalogSheetViewController.swift; sourceTree = "<group>"; };
3968C75D28C9E19600561194 /* UIStepperTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIStepperTableViewCell.swift; sourceTree = "<group>"; };
84126F712C2C00C500ECA607 /* VivoTypeLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeLight.ttf; sourceTree = "<group>"; };
84126F722C2C00C500ECA607 /* VivoTypeRegular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = VivoTypeRegular.ttf; sourceTree = "<group>"; };
84126F732C2C00C500ECA607 /* OnAir-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "OnAir-Medium.ttf"; sourceTree = "<group>"; };
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>"; };
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 @@ -239,6 +251,19 @@
path = Components;
sourceTree = "<group>";
};
84126F702C2C001800ECA607 /* Resources */ = {
isa = PBXGroup;
children = (
84126F762C2C00C500ECA607 /* OnAir-Light.ttf */,
84126F732C2C00C500ECA607 /* OnAir-Medium.ttf */,
84126F742C2C00C500ECA607 /* OnAir-Regular.ttf */,
84126F752C2C00C500ECA607 /* VivoTypeBold.ttf */,
84126F712C2C00C500ECA607 /* VivoTypeLight.ttf */,
84126F722C2C00C500ECA607 /* VivoTypeRegular.ttf */,
);
path = Resources;
sourceTree = "<group>";
};
B8E161F82546EF8300DA3743 /* Packages */ = {
isa = PBXGroup;
children = (
Expand All @@ -252,6 +277,7 @@
children = (
B8F98FFD2546C98600DFBFE9 /* Source */,
B8F990552546C99300DFBFE9 /* SupportFiles */,
84126F702C2C001800ECA607 /* Resources */,
B8E161F82546EF8300DA3743 /* Packages */,
B8F98FEB2546C95600DFBFE9 /* Products */,
B8F990612546CAA500DFBFE9 /* Frameworks */,
Expand Down Expand Up @@ -412,8 +438,14 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
84126F7B2C2C00C500ECA607 /* VivoTypeBold.ttf in Resources */,
84126F7C2C2C00C500ECA607 /* OnAir-Light.ttf in Resources */,
B8F990302546C98700DFBFE9 /* Assets.xcassets in Resources */,
B8F9902C2546C98600DFBFE9 /* LaunchScreen.storyboard in Resources */,
84126F772C2C00C500ECA607 /* VivoTypeLight.ttf in Resources */,
84126F792C2C00C500ECA607 /* OnAir-Medium.ttf in Resources */,
84126F782C2C00C500ECA607 /* VivoTypeRegular.ttf in Resources */,
84126F7A2C2C00C500ECA607 /* OnAir-Regular.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file added MisticaCatalog/Resources/OnAir-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added MisticaCatalog/Resources/OnAir-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added MisticaCatalog/Resources/OnAir-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added MisticaCatalog/Resources/VivoTypeBold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added MisticaCatalog/Resources/VivoTypeLight.ttf
View file
Open in desktop
Binary file not shown.
Binary file added MisticaCatalog/Resources/VivoTypeRegular.ttf
View file
Open in desktop
Binary file not shown.
64 changes: 64 additions & 0 deletions MisticaCatalog/Source/MisticaCatalogApp.swift
View file
Open in desktop
yceballost marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ struct MisticaCatalogApp: App {
}
.onChange(of: selectedBrandIndex, perform: { selectedBrandIndex in
MisticaConfig.brandStyle = brands[selectedBrandIndex]
setUpFont(brandStyle: brands[selectedBrandIndex])
setUpUIFont(brandStyle: brands[selectedBrandIndex])
withAnimation { reloadId = UUID() }
})
.id(reloadId)
Expand Down Expand Up @@ -101,6 +103,68 @@ struct MisticaCatalogApp: App {
UINavigationBar.appearance().scrollEdgeAppearance = appearance
UINavigationBar.appearance().tintColor = .misticaCatalogTint | .white
}

func setUpFont(brandStyle: BrandStyle) {
switch brandStyle {
case .vivoNew:
FontStyle.fontNameForWeight = { weight in
switch weight {
case .light, .ultraLight, .thin:
return "VivoType-Light"
case .medium, .bold, .semibold, .black, .heavy:
return "VivoType-Bold"
default:
return "VivoType-Regular"
}
}
case .o2, .o2New, .movistar:
FontStyle.fontNameForWeight = { weight in
switch weight {
case .light, .ultraLight, .thin:
return "OnAir-Light"
case .medium:
return "OnAir"
case .bold, .semibold, .black, .heavy:
return "OnAir-Bold"
default:
return "OnAir-Regular"
}
}
case .vivo, .blau, .telefonica, .tu, .custom:
FontStyle.fontNameForWeight = nil
}
}

func setUpUIFont(brandStyle: BrandStyle) {
switch brandStyle {
case .vivoNew:
FontStyle.uiFontNameForWeight = { weight in
switch weight {
case .light, .ultraLight, .thin:
return "VivoType-Light"
case .medium, .bold, .semibold, .black, .heavy:
return "VivoType-Bold"
default:
return "VivoType-Regular"
}
}
case .o2, .o2New, .movistar:
FontStyle.uiFontNameForWeight = { weight in
switch weight {
case .light, .ultraLight, .thin:
return "OnAir-Light"
case .medium:
return "OnAir"
case .bold, .semibold, .black, .heavy:
return "OnAir-Bold"
default:
return "OnAir-Regular"
}
}
case .vivo, .blau, .telefonica, .tu, .custom:
FontStyle.uiFontNameForWeight = nil
}
}
}

extension UIColor {
Expand Down
9 changes: 9 additions & 0 deletions MisticaCatalog/SupportFiles/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIAppFonts</key>
<array>
<string>OnAir-Light.ttf</string>
<string>OnAir-Medium.ttf</string>
<string>OnAir-Regular.ttf</string>
<string>VivoTypeBold.ttf</string>
<string>VivoTypeLight.ttf</string>
<string>VivoTypeRegular.ttf</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
Expand Down
Loading