-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Ios 10314-include custom fonts in mistica catalog app #376
Merged
L-Trujillo26
merged 17 commits into
main
from
IOS-10314-include-custom-fonts-in-Mistica-Catalog-app
Jul 12, 2024
Merged
Changes from 13 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 b9a0cde
Merge branch 'main' into IOS-10314-include-custom-fonts-in-Mistica-Ca…
L-Trujillo26 354921f
Run swiftformat
L-Trujillo26 aa12beb
IOS-10314 included fonts for exhaustive use cases
L-Trujillo26 5e53679
Run swiftformat
L-Trujillo26 d06b2c8
IOS-10314 modified implementacion for brand font style configuration …
L-Trujillo26 7a90965
Run swiftformat
L-Trujillo26 d96e491
IOS-10314 modified implementacion for brand font style configuration …
L-Trujillo26 79abd50
IOS-10314 improve implementation
L-Trujillo26 3c14466
Run swiftformat
L-Trujillo26 397577b
Merge remote-tracking branch 'origin' into IOS-10314-include-custom-f…
L-Trujillo26 375277f
IOS-10314 fix font implementation issues
L-Trujillo26 71777dc
Run swiftformat
L-Trujillo26 826d460
IOS-10314 fix telefonica font name
L-Trujillo26 8c5fe51
IOS-10314 fix path telefonica regular font
L-Trujillo26 b04031f
IOS-10314 changes in comments
L-Trujillo26 68d4e01
Run swiftformat
L-Trujillo26 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
89 changes: 89 additions & 0 deletions
89
MisticaCatalog/Source/Common/Extensions/BrandStyle+FontMapping.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // | ||
| // BrandStyle+FontMapping.swift | ||
| // | ||
| // Made with ❤️ by Novum | ||
| // | ||
| // Copyright © Telefonica. All rights reserved. | ||
| // | ||
|
|
||
| import Mistica | ||
| import SwiftUI | ||
| import UIKit | ||
|
|
||
| extension BrandStyle { | ||
| // A computed property that returns the corresponding FontMapping for the brand style. | ||
| var fontMapping: FontMapping? { | ||
| switch self { | ||
| case .vivoNew: | ||
| return FontMapping( | ||
| lightFont: "VivoType-Light", | ||
| mediumFont: "VivoType-Bold", | ||
| boldFont: "VivoType-Bold", | ||
| defaultFont: "VivoType-Regular" | ||
| ) | ||
| case .o2, .o2New, .movistar: | ||
| return FontMapping( | ||
| lightFont: "OnAir-Light", | ||
| mediumFont: "OnAir", | ||
| boldFont: "OnAir-Bold", | ||
| defaultFont: "OnAir-Regular" | ||
| ) | ||
|
|
||
| case .telefonica, .tu: | ||
| return FontMapping( | ||
| lightFont: "Telefonica Sans Light", | ||
| mediumFont: "Telefonica Sans DemiBold", | ||
| boldFont: "Telefonica Sans DemiBold", | ||
| defaultFont: "Telefonica Sans Regular" | ||
| ) | ||
| case .vivo, .blau, .custom: | ||
| return nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // A struct representing a mapping of font names to different font weights. | ||
| struct FontMapping { | ||
| let lightFont: String | ||
| let mediumFont: String | ||
| let boldFont: String | ||
| let defaultFont: String | ||
|
|
||
| /** | ||
| Returns the font name for the specified weight. | ||
|
|
||
| - Parameter weight: The `Font.Weight` for which to get the font name. | ||
| - Returns: The font name corresponding to the given weight. | ||
| */ | ||
| func fontName(for weight: Font.Weight) -> String { | ||
| switch weight { | ||
| case .light, .ultraLight, .thin: | ||
| return lightFont | ||
| case .medium: | ||
| return mediumFont | ||
| case .bold, .semibold, .black, .heavy: | ||
| return boldFont | ||
| default: | ||
| return defaultFont | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| Returns the font name for the specified weight. | ||
|
|
||
| - Parameter weight: The `UIFont.Weight` for which to get the font name. | ||
| - Returns: The font name corresponding to the given weight. | ||
| */ | ||
| func UIfontName(for weight: UIFont.Weight) -> String { | ||
| switch weight { | ||
| case .light, .ultraLight, .thin: | ||
| return lightFont | ||
| case .medium: | ||
| return mediumFont | ||
| case .bold, .semibold, .black, .heavy: | ||
| return boldFont | ||
| default: | ||
| return defaultFont | ||
| } | ||
| } | ||
| } | ||
yceballost marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't this
OnAir-Boldfont missing inMisticaCatalog/Resources/and in the Info.plistUIAppFontsproperty?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done ! thanks