Skip to content

Commit 37ecea5

Browse files
Geri-BorbasGeri-Borbas
committed
Merge branch 'Features/Label_Styles' into main
2 parents 39660a3 + 865b628 commit 37ecea5

29 files changed

Lines changed: 484 additions & 26 deletions

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@
44

55
+ (May) lookup baseline reset issue with overflowing text
66

7+
* Feature/Label_Styles/0.1.5
8+
9+
+ Moved constants into `UI`
10+
+ Added `MockupViewController`
11+
12+
13+
* Feature/Label_Styles/0.1.3 - 0.1.4
14+
15+
+ Added scroll view to `PlanetViewController`
16+
+ Matched inspection border to Figma
17+
18+
* Feature/Label_Styles/0.1.2
19+
20+
+ UI from design specs (label styles, assets, stack)
21+
+ `baselineOffset` adjustemt for small line heigh values
22+
23+
* Feature/Label_Styles/0.1.0
24+
25+
+ Added `PlanetViewController` with labels and (inline) styles
26+
+ Renaming, warning cleanup
27+
728
* 0.9.0
829

930
+ Cleanup, renamings

‎UILabel_Typography_Extensions.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313
5501DB9727D8240E009E0FDA /* UIButton+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5501DB9627D8240E009E0FDA /* UIButton+Styles.swift */; };
1414
551B425F259BCE40001310A9 /* UIFont+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551B425E259BCE40001310A9 /* UIFont+Extensions.swift */; };
1515
554AF31825961B6200A23E41 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 554AF31725961B6200A23E41 /* README.md */; };
16+
5558DA4627DA1FA900A4A178 /* MockupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5558DA4527DA1FA900A4A178 /* MockupViewController.swift */; };
1617
559795E525A259E400A757A3 /* UIColor+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559795E425A259E400A757A3 /* UIColor+Styles.swift */; };
18+
559E70FD27D90D0E00C00AD7 /* PlanetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559E70FC27D90D0E00C00AD7 /* PlanetViewController.swift */; };
1719
559FB34E25A4B1A200CE795D /* LineHeightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559FB34D25A4B1A200CE795D /* LineHeightViewController.swift */; };
1820
55A3EECE27D7F24C0002193A /* UIFont+Inspection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55A3EECD27D7F24C0002193A /* UIFont+Inspection.swift */; };
21+
55BB9AD127D9685700599A5E /* Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BB9AD027D9685700599A5E /* Styles.swift */; };
1922
55F236A225912BBE0007BC69 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236A125912BBE0007BC69 /* AppDelegate.swift */; };
2023
55F236A425912BBE0007BC69 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236A325912BBE0007BC69 /* SceneDelegate.swift */; };
2124
55F236A825912BC30007BC69 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 55F236A725912BC30007BC69 /* Assets.xcassets */; };
@@ -41,9 +44,12 @@
4144
551B425E259BCE40001310A9 /* UIFont+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extensions.swift"; sourceTree = "<group>"; };
4245
554A2DCF27D67B66008A4AE4 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
4346
554AF31725961B6200A23E41 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
47+
5558DA4527DA1FA900A4A178 /* MockupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockupViewController.swift; sourceTree = "<group>"; };
4448
559795E425A259E400A757A3 /* UIColor+Styles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Styles.swift"; sourceTree = "<group>"; };
49+
559E70FC27D90D0E00C00AD7 /* PlanetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanetViewController.swift; sourceTree = "<group>"; };
4550
559FB34D25A4B1A200CE795D /* LineHeightViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineHeightViewController.swift; sourceTree = "<group>"; };
4651
55A3EECD27D7F24C0002193A /* UIFont+Inspection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Inspection.swift"; sourceTree = "<group>"; };
52+
55BB9AD027D9685700599A5E /* Styles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Styles.swift; sourceTree = "<group>"; };
4753
55F2369E25912BBE0007BC69 /* UILabel_Typography_Extensions.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UILabel_Typography_Extensions.app; sourceTree = BUILT_PRODUCTS_DIR; };
4854
55F236A125912BBE0007BC69 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4955
55F236A325912BBE0007BC69 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -99,7 +105,17 @@
99105
path = Deprecated;
100106
sourceTree = "<group>";
101107
};
102-
55A3EECF27D7F32E0002193A /* View */ = {
108+
559E70FE27D90D1200C00AD7 /* Planet */ = {
109+
isa = PBXGroup;
110+
children = (
111+
5558DA4527DA1FA900A4A178 /* MockupViewController.swift */,
112+
559E70FC27D90D0E00C00AD7 /* PlanetViewController.swift */,
113+
55BB9AD027D9685700599A5E /* Styles.swift */,
114+
);
115+
path = Planet;
116+
sourceTree = "<group>";
117+
};
118+
55A3EECF27D7F32E0002193A /* Menu */ = {
103119
isa = PBXGroup;
104120
children = (
105121
55F236B625912BF20007BC69 /* MenuViewController.swift */,
@@ -111,8 +127,9 @@
111127
55F7E34025A0A91E00E7F48B /* LoremIpsumViewController.swift */,
112128
5501DB9427D82099009E0FDA /* UIButton+Extensions.swift */,
113129
5501DB9627D8240E009E0FDA /* UIButton+Styles.swift */,
130+
559E70FE27D90D1200C00AD7 /* Planet */,
114131
);
115-
path = View;
132+
path = Menu;
116133
sourceTree = "<group>";
117134
};
118135
55F2369525912BBE0007BC69 = {
@@ -138,7 +155,7 @@
138155
children = (
139156
55F236A125912BBE0007BC69 /* AppDelegate.swift */,
140157
55F236A325912BBE0007BC69 /* SceneDelegate.swift */,
141-
55A3EECF27D7F32E0002193A /* View */,
158+
55A3EECF27D7F32E0002193A /* Menu */,
142159
554AF31C25961F2400A23E41 /* Typography */,
143160
55F236C225912C780007BC69 /* Extensions */,
144161
558D107725A15277005DB3DA /* Deprecated */,
@@ -244,9 +261,12 @@
244261
55A3EECE27D7F24C0002193A /* UIFont+Inspection.swift in Sources */,
245262
55F236A425912BBE0007BC69 /* SceneDelegate.swift in Sources */,
246263
551B425F259BCE40001310A9 /* UIFont+Extensions.swift in Sources */,
264+
559E70FD27D90D0E00C00AD7 /* PlanetViewController.swift in Sources */,
247265
5501DB9527D82099009E0FDA /* UIButton+Extensions.swift in Sources */,
248266
55F7E34125A0A91E00E7F48B /* LoremIpsumViewController.swift in Sources */,
249267
559795E525A259E400A757A3 /* UIColor+Styles.swift in Sources */,
268+
55BB9AD127D9685700599A5E /* Styles.swift in Sources */,
269+
5558DA4627DA1FA900A4A178 /* MockupViewController.swift in Sources */,
250270
55F7E34825A0AD7F00E7F48B /* AttributesViewController.swift in Sources */,
251271
55F236B725912BF20007BC69 /* MenuViewController.swift in Sources */,
252272
55F7E33E25A051FE00E7F48B /* UILabel+Grid.swift in Sources */,

‎UILabel_Typography_Extensions/Assets.xcassets/Colors/Background.colorset/Contents.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "1.000",
9+
"green" : "1.000",
10+
"red" : "1.000"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0.000",
27+
"green" : "0.000",
28+
"red" : "0.000"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎UILabel_Typography_Extensions/Assets.xcassets/Colors/Label.colorset/Contents.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0.000",
9+
"green" : "0.000",
10+
"red" : "0.000"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "1.000",
27+
"green" : "1.000",
28+
"red" : "1.000"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎UILabel_Typography_Extensions/Assets.xcassets/Colors/Mars.colorset/Contents.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0x35",
9+
"green" : "0x74",
10+
"red" : "0xE0"
11+
}
12+
},
13+
"idiom" : "universal"
14+
},
15+
{
16+
"appearances" : [
17+
{
18+
"appearance" : "luminosity",
19+
"value" : "dark"
20+
}
21+
],
22+
"color" : {
23+
"color-space" : "srgb",
24+
"components" : {
25+
"alpha" : "1.000",
26+
"blue" : "0x35",
27+
"green" : "0x74",
28+
"red" : "0xE0"
29+
}
30+
},
31+
"idiom" : "universal"
32+
}
33+
],
34+
"info" : {
35+
"author" : "xcode",
36+
"version" : 1
37+
}
38+
}

‎UILabel_Typography_Extensions/Assets.xcassets/Mars.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Mars.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "Mars@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "Mars@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

‎UILabel_Typography_Extensions/Assets.xcassets/Mars.imageset/Mars.png‎

112 KB
Loading

‎UILabel_Typography_Extensions/Assets.xcassets/Mars.imageset/Mars@2x.png‎

399 KB
Loading

‎UILabel_Typography_Extensions/Assets.xcassets/Mars.imageset/Mars@3x.png‎

786 KB
Loading

‎UILabel_Typography_Extensions/Assets.xcassets/Placeholder.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Placeholder.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "Placeholder@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "Placeholder@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

0 commit comments

Comments
 (0)