Skip to content

Commit f915c18

Browse files
mariuskatcontentfulmariuskatcontentful
authored
Merge pull request #60 from contentful/styling_update
Styling update
2 parents a1dc1db + 92ad89d commit f915c18

36 files changed

+436
-311
lines changed

‎Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 213 additions & 213 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RichTextRenderer.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
6DB2F40924C02BA500A07D9B /* UIColor+DarkAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3B624C02BA300A07D9B /* UIColor+DarkAppearance.swift */; };
2525
6DB2F40A24C02BA500A07D9B /* NSAttributedString+FullRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3B724C02BA300A07D9B /* NSAttributedString+FullRange.swift */; };
2626
6DB2F40B24C02BA500A07D9B /* CodingUserInfoKey+CustomKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3B824C02BA300A07D9B /* CodingUserInfoKey+CustomKeys.swift */; };
27-
6DB2F40C24C02BA500A07D9B /* FontProviding+Marks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3B924C02BA300A07D9B /* FontProviding+Marks.swift */; };
27+
6DB2F40C24C02BA500A07D9B /* StyleProviding+Marks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3B924C02BA300A07D9B /* StyleProviding+Marks.swift */; };
2828
6DB2F40D24C02BA500A07D9B /* DecorationRendering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3BC24C02BA300A07D9B /* DecorationRendering.swift */; };
2929
6DB2F40E24C02BA500A07D9B /* DefaultLayoutManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3BD24C02BA300A07D9B /* DefaultLayoutManager.swift */; };
3030
6DB2F40F24C02BA500A07D9B /* BlockQuoteDecorationRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3BE24C02BA300A07D9B /* BlockQuoteDecorationRenderer.swift */; };
@@ -66,13 +66,13 @@
6666
6DB2F43324C02BA500A07D9B /* RichTextDocumentRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3F324C02BA500A07D9B /* RichTextDocumentRenderer.swift */; };
6767
6DB2F43424C02BA500A07D9B /* NodeRenderersProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3F424C02BA500A07D9B /* NodeRenderersProviding.swift */; };
6868
6DB2F43524C02BA500A07D9B /* DefaultRendererConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3F624C02BA500A07D9B /* DefaultRendererConfiguration.swift */; };
69-
6DB2F43624C02BA500A07D9B /* DefaultFontProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3F724C02BA500A07D9B /* DefaultFontProvider.swift */; };
69+
6DB2F43624C02BA500A07D9B /* DefaultStyleProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3F724C02BA500A07D9B /* DefaultStyleProvider.swift */; };
7070
6DB2F43724C02BA500A07D9B /* DefaultRenderersProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3F824C02BA500A07D9B /* DefaultRenderersProvider.swift */; };
7171
6DB2F43824C02BA500A07D9B /* RendererConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3F924C02BA500A07D9B /* RendererConfiguration.swift */; };
7272
6DB2F43924C02BA500A07D9B /* RichTextDocumentRendering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3FA24C02BA500A07D9B /* RichTextDocumentRendering.swift */; };
7373
6DB2F43A24C02BA500A07D9B /* TextListConfiguration+Default.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3FC24C02BA500A07D9B /* TextListConfiguration+Default.swift */; };
7474
6DB2F43B24C02BA500A07D9B /* TextConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3FD24C02BA500A07D9B /* TextConfiguration.swift */; };
75-
6DB2F43C24C02BA500A07D9B /* FontProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3FE24C02BA500A07D9B /* FontProviding.swift */; };
75+
6DB2F43C24C02BA500A07D9B /* StyleProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3FE24C02BA500A07D9B /* StyleProviding.swift */; };
7676
6DB2F43D24C02BA500A07D9B /* TextListConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F3FF24C02BA500A07D9B /* TextListConfiguration.swift */; };
7777
6DB2F43E24C02BA500A07D9B /* BlockQuoteConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F40024C02BA500A07D9B /* BlockQuoteConfiguration.swift */; };
7878
6DB2F43F24C02BA500A07D9B /* TextConfiguration+Default.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB2F40124C02BA500A07D9B /* TextConfiguration+Default.swift */; };
@@ -103,7 +103,7 @@
103103
6DB2F3B624C02BA300A07D9B /* UIColor+DarkAppearance.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+DarkAppearance.swift"; sourceTree = "<group>"; };
104104
6DB2F3B724C02BA300A07D9B /* NSAttributedString+FullRange.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+FullRange.swift"; sourceTree = "<group>"; };
105105
6DB2F3B824C02BA300A07D9B /* CodingUserInfoKey+CustomKeys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CodingUserInfoKey+CustomKeys.swift"; sourceTree = "<group>"; };
106-
6DB2F3B924C02BA300A07D9B /* FontProviding+Marks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FontProviding+Marks.swift"; sourceTree = "<group>"; };
106+
6DB2F3B924C02BA300A07D9B /* StyleProviding+Marks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StyleProviding+Marks.swift"; sourceTree = "<group>"; };
107107
6DB2F3BC24C02BA300A07D9B /* DecorationRendering.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DecorationRendering.swift; sourceTree = "<group>"; };
108108
6DB2F3BD24C02BA300A07D9B /* DefaultLayoutManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultLayoutManager.swift; sourceTree = "<group>"; };
109109
6DB2F3BE24C02BA300A07D9B /* BlockQuoteDecorationRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockQuoteDecorationRenderer.swift; sourceTree = "<group>"; };
@@ -145,13 +145,13 @@
145145
6DB2F3F324C02BA500A07D9B /* RichTextDocumentRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RichTextDocumentRenderer.swift; sourceTree = "<group>"; };
146146
6DB2F3F424C02BA500A07D9B /* NodeRenderersProviding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodeRenderersProviding.swift; sourceTree = "<group>"; };
147147
6DB2F3F624C02BA500A07D9B /* DefaultRendererConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultRendererConfiguration.swift; sourceTree = "<group>"; };
148-
6DB2F3F724C02BA500A07D9B /* DefaultFontProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultFontProvider.swift; sourceTree = "<group>"; };
148+
6DB2F3F724C02BA500A07D9B /* DefaultStyleProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultStyleProvider.swift; sourceTree = "<group>"; };
149149
6DB2F3F824C02BA500A07D9B /* DefaultRenderersProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultRenderersProvider.swift; sourceTree = "<group>"; };
150150
6DB2F3F924C02BA500A07D9B /* RendererConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RendererConfiguration.swift; sourceTree = "<group>"; };
151151
6DB2F3FA24C02BA500A07D9B /* RichTextDocumentRendering.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RichTextDocumentRendering.swift; sourceTree = "<group>"; };
152152
6DB2F3FC24C02BA500A07D9B /* TextListConfiguration+Default.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TextListConfiguration+Default.swift"; sourceTree = "<group>"; };
153153
6DB2F3FD24C02BA500A07D9B /* TextConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextConfiguration.swift; sourceTree = "<group>"; };
154-
6DB2F3FE24C02BA500A07D9B /* FontProviding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FontProviding.swift; sourceTree = "<group>"; };
154+
6DB2F3FE24C02BA500A07D9B /* StyleProviding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StyleProviding.swift; sourceTree = "<group>"; };
155155
6DB2F3FF24C02BA500A07D9B /* TextListConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextListConfiguration.swift; sourceTree = "<group>"; };
156156
6DB2F40024C02BA500A07D9B /* BlockQuoteConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockQuoteConfiguration.swift; sourceTree = "<group>"; };
157157
6DB2F40124C02BA500A07D9B /* TextConfiguration+Default.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TextConfiguration+Default.swift"; sourceTree = "<group>"; };
@@ -249,7 +249,7 @@
249249
6DB2F3B724C02BA300A07D9B /* NSAttributedString+FullRange.swift */,
250250
B1C680A627D94A1D00467934 /* NSAttributedString+Trim.swift */,
251251
6DB2F3B824C02BA300A07D9B /* CodingUserInfoKey+CustomKeys.swift */,
252-
6DB2F3B924C02BA300A07D9B /* FontProviding+Marks.swift */,
252+
6DB2F3B924C02BA300A07D9B /* StyleProviding+Marks.swift */,
253253
);
254254
path = Extensions;
255255
sourceTree = "<group>";
@@ -449,7 +449,7 @@
449449
isa = PBXGroup;
450450
children = (
451451
6DB2F3F624C02BA500A07D9B /* DefaultRendererConfiguration.swift */,
452-
6DB2F3F724C02BA500A07D9B /* DefaultFontProvider.swift */,
452+
6DB2F3F724C02BA500A07D9B /* DefaultStyleProvider.swift */,
453453
6DB2F3F824C02BA500A07D9B /* DefaultRenderersProvider.swift */,
454454
);
455455
path = Default;
@@ -460,7 +460,7 @@
460460
children = (
461461
6DB2F3FC24C02BA500A07D9B /* TextListConfiguration+Default.swift */,
462462
6DB2F3FD24C02BA500A07D9B /* TextConfiguration.swift */,
463-
6DB2F3FE24C02BA500A07D9B /* FontProviding.swift */,
463+
6DB2F3FE24C02BA500A07D9B /* StyleProviding.swift */,
464464
6DB2F3FF24C02BA500A07D9B /* TextListConfiguration.swift */,
465465
6DB2F40024C02BA500A07D9B /* BlockQuoteConfiguration.swift */,
466466
6DB2F40124C02BA500A07D9B /* TextConfiguration+Default.swift */,
@@ -620,7 +620,7 @@
620620
6DB2F43324C02BA500A07D9B /* RichTextDocumentRenderer.swift in Sources */,
621621
6DB2F41824C02BA500A07D9B /* OrderedListRenderer.swift in Sources */,
622622
6DB2F40B24C02BA500A07D9B /* CodingUserInfoKey+CustomKeys.swift in Sources */,
623-
6DB2F43624C02BA500A07D9B /* DefaultFontProvider.swift in Sources */,
623+
6DB2F43624C02BA500A07D9B /* DefaultStyleProvider.swift in Sources */,
624624
6DB2F43424C02BA500A07D9B /* NodeRenderersProviding.swift in Sources */,
625625
402EE6FD29B8EA27004084BD /* TableRowRenderer.swift in Sources */,
626626
6DB2F41F24C02BA500A07D9B /* ResourceLinkBlockViewRepresentable.swift in Sources */,
@@ -629,7 +629,7 @@
629629
6DB2F40724C02BA500A07D9B /* NSTextStorage+Attachments.swift in Sources */,
630630
6DB2F42024C02BA500A07D9B /* ListItemRenderer.swift in Sources */,
631631
6DB2F41B24C02BA500A07D9B /* NodeRendering.swift in Sources */,
632-
6DB2F43C24C02BA500A07D9B /* FontProviding.swift in Sources */,
632+
6DB2F43C24C02BA500A07D9B /* StyleProviding.swift in Sources */,
633633
6DB2F43824C02BA500A07D9B /* RendererConfiguration.swift in Sources */,
634634
6DB2F43D24C02BA500A07D9B /* TextListConfiguration.swift in Sources */,
635635
402EE6FE29B8EA27004084BD /* SimpleTableView.swift in Sources */,
@@ -669,7 +669,7 @@
669669
402EE6FC29B8EA27004084BD /* TableRenderer.swift in Sources */,
670670
6DB2F41024C02BA500A07D9B /* RichTextViewController.swift in Sources */,
671671
6DB2F43524C02BA500A07D9B /* DefaultRendererConfiguration.swift in Sources */,
672-
6DB2F40C24C02BA500A07D9B /* FontProviding+Marks.swift in Sources */,
672+
6DB2F40C24C02BA500A07D9B /* StyleProviding+Marks.swift in Sources */,
673673
6DB2F43F24C02BA500A07D9B /* TextConfiguration+Default.swift in Sources */,
674674
6DB2F42E24C02BA500A07D9B /* OrderedListIndicator.swift in Sources */,
675675
6DB2F40324C02BA500A07D9B /* Node+RenderableNodeProviding.swift in Sources */,

‎Sources/RichTextRenderer/Configuration/BlockQuoteConfiguration+Default.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// RichTextRenderer
2+
import Foundation
23

34
public extension BlockQuoteConfiguration {
45
static var `default`: BlockQuoteConfiguration {

‎Sources/RichTextRenderer/Configuration/FontProviding.swift‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Sources/RichTextRenderer/Configuration/StyleProviding.swift‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import UIKit
2+
3+
public protocol StyleProviding {
4+
5+
/// Base version of the font.
6+
var regular: UIFont { get }
7+
var regularColor: UIColor { get }
8+
9+
var bold: UIFont { get }
10+
var boldColor: UIColor { get }
11+
12+
var italic: UIFont { get }
13+
var italicColor: UIColor { get }
14+
15+
var boldItalic: UIFont { get }
16+
var boldItalicColor: UIColor { get }
17+
18+
/// Base hyperlink color
19+
var hyperlinkColor: UIColor { get }
20+
21+
/// Fonts and their colors used in heading nodes.
22+
var headingStyles: HeadingStyles { get }
23+
24+
/// Font and its color used to render code snippets (monospace).
25+
var monospaced: UIFont { get }
26+
var monospacedColor: UIColor { get }
27+
}

‎Sources/RichTextRenderer/Configuration/TextConfiguration+Default.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RichTextRenderer
22

3+
import Foundation
4+
35
public extension TextConfiguration {
46
static var `default`: TextConfiguration {
57
.init(

‎Sources/RichTextRenderer/Configuration/TextConfiguration.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// RichTextRenderer
22

33
import CoreGraphics
4+
import Foundation
45

56
/// Configuration for rendering `Text` node.
67
public struct TextConfiguration {

‎Sources/RichTextRenderer/Configuration/TextListConfiguration+Default.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// RichTextRenderer
2+
import Foundation
23

34
public extension TextListConfiguration {
45
static var `default`: TextListConfiguration {

‎Sources/RichTextRenderer/Configuration/TextListConfiguration.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// RichTextRenderer
22

33
import CoreGraphics
4+
import Foundation
45

56
/// Configuration for rendering ordered/unordered text lists.
67
public struct TextListConfiguration {

‎Sources/RichTextRenderer/Contentful/Heading+HeadingLevel.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// RichTextRenderer
22

33
import Contentful
4+
import Foundation
45

56
extension Heading {
67
var headingLevel: HeadingLevel {

0 commit comments

Comments
 (0)