chore: update face smiling icon
This commit is contained in:
parent
12a3164a21
commit
83904126dd
|
@ -90,6 +90,9 @@ internal enum Asset {
|
||||||
internal enum Connectivity {
|
internal enum Connectivity {
|
||||||
internal static let photoFillSplit = ImageAsset(name: "Connectivity/photo.fill.split")
|
internal static let photoFillSplit = ImageAsset(name: "Connectivity/photo.fill.split")
|
||||||
}
|
}
|
||||||
|
internal enum Human {
|
||||||
|
internal static let faceSmilingAdaptive = ImageAsset(name: "Human/face.smiling.adaptive")
|
||||||
|
}
|
||||||
internal enum Scene {
|
internal enum Scene {
|
||||||
internal enum Compose {
|
internal enum Compose {
|
||||||
internal static let background = ColorAsset(name: "Scene/Compose/background")
|
internal static let background = ColorAsset(name: "Scene/Compose/background")
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
},
|
||||||
|
"properties" : {
|
||||||
|
"provides-namespace" : true
|
||||||
|
}
|
||||||
|
}
|
25
Mastodon/Resources/Assets.xcassets/Human/face.smiling.adaptive.imageset/Contents.json
vendored
Normal file
25
Mastodon/Resources/Assets.xcassets/Human/face.smiling.adaptive.imageset/Contents.json
vendored
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "emojiIconLight.pdf",
|
||||||
|
"idiom" : "universal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"appearances" : [
|
||||||
|
{
|
||||||
|
"appearance" : "luminosity",
|
||||||
|
"value" : "dark"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"filename" : "emojiIconDark.pdf",
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
},
|
||||||
|
"properties" : {
|
||||||
|
"preserves-vector-representation" : true
|
||||||
|
}
|
||||||
|
}
|
97
Mastodon/Resources/Assets.xcassets/Human/face.smiling.adaptive.imageset/emojiIconDark.pdf
vendored
Normal file
97
Mastodon/Resources/Assets.xcassets/Human/face.smiling.adaptive.imageset/emojiIconDark.pdf
vendored
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
%PDF-1.7
|
||||||
|
|
||||||
|
1 0 obj
|
||||||
|
<< >>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
2 0 obj
|
||||||
|
<< /Length 3 0 R >>
|
||||||
|
stream
|
||||||
|
/DeviceRGB CS
|
||||||
|
/DeviceRGB cs
|
||||||
|
q
|
||||||
|
1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
|
||||||
|
0.225600 0.613812 0.894400 scn
|
||||||
|
48.000000 0.000000 m
|
||||||
|
74.509674 0.000000 96.000000 21.490326 96.000000 48.000000 c
|
||||||
|
96.000000 74.509666 74.509674 96.000000 48.000000 96.000000 c
|
||||||
|
21.490332 96.000000 0.000000 74.509666 0.000000 48.000000 c
|
||||||
|
0.000000 21.490326 21.490332 0.000000 48.000000 0.000000 c
|
||||||
|
h
|
||||||
|
48.000023 39.999962 m
|
||||||
|
38.338688 39.999962 31.928020 41.125294 24.000021 42.666630 c
|
||||||
|
22.189354 43.015961 18.666687 42.666630 18.666687 37.333294 c
|
||||||
|
18.666687 26.666626 30.920021 13.333298 48.000023 13.333298 c
|
||||||
|
65.077354 13.333298 77.333359 26.666626 77.333359 37.333294 c
|
||||||
|
77.333359 42.666630 73.810692 43.018627 72.000023 42.666630 c
|
||||||
|
64.072021 41.125294 57.661354 39.999962 48.000023 39.999962 c
|
||||||
|
h
|
||||||
|
38.666645 59.999981 m
|
||||||
|
38.666645 54.845322 35.681877 50.666649 31.999979 50.666649 c
|
||||||
|
28.318081 50.666649 25.333313 54.845322 25.333313 59.999981 c
|
||||||
|
25.333313 65.154640 28.318081 69.333313 31.999979 69.333313 c
|
||||||
|
35.681877 69.333313 38.666645 65.154640 38.666645 59.999981 c
|
||||||
|
h
|
||||||
|
63.999977 50.666649 m
|
||||||
|
67.681877 50.666649 70.666641 54.845322 70.666641 59.999981 c
|
||||||
|
70.666641 65.154640 67.681877 69.333313 63.999977 69.333313 c
|
||||||
|
60.318081 69.333313 57.333313 65.154640 57.333313 59.999981 c
|
||||||
|
57.333313 54.845322 60.318081 50.666649 63.999977 50.666649 c
|
||||||
|
h
|
||||||
|
48.000000 34.666645 m
|
||||||
|
32.000000 34.666645 24.000000 37.333313 24.000000 37.333313 c
|
||||||
|
24.000000 37.333313 29.333334 26.666649 48.000000 26.666649 c
|
||||||
|
66.666672 26.666649 72.000000 37.333313 72.000000 37.333313 c
|
||||||
|
72.000000 37.333313 64.000000 34.666645 48.000000 34.666645 c
|
||||||
|
h
|
||||||
|
f*
|
||||||
|
n
|
||||||
|
Q
|
||||||
|
|
||||||
|
endstream
|
||||||
|
endobj
|
||||||
|
|
||||||
|
3 0 obj
|
||||||
|
1603
|
||||||
|
endobj
|
||||||
|
|
||||||
|
4 0 obj
|
||||||
|
<< /Annots []
|
||||||
|
/Type /Page
|
||||||
|
/MediaBox [ 0.000000 0.000000 96.000000 96.000000 ]
|
||||||
|
/Resources 1 0 R
|
||||||
|
/Contents 2 0 R
|
||||||
|
/Parent 5 0 R
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
5 0 obj
|
||||||
|
<< /Kids [ 4 0 R ]
|
||||||
|
/Count 1
|
||||||
|
/Type /Pages
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
6 0 obj
|
||||||
|
<< /Type /Catalog
|
||||||
|
/Pages 5 0 R
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
xref
|
||||||
|
0 7
|
||||||
|
0000000000 65535 f
|
||||||
|
0000000010 00000 n
|
||||||
|
0000000034 00000 n
|
||||||
|
0000001693 00000 n
|
||||||
|
0000001716 00000 n
|
||||||
|
0000001889 00000 n
|
||||||
|
0000001963 00000 n
|
||||||
|
trailer
|
||||||
|
<< /ID [ (some) (id) ]
|
||||||
|
/Root 6 0 R
|
||||||
|
/Size 7
|
||||||
|
>>
|
||||||
|
startxref
|
||||||
|
2022
|
||||||
|
%%EOF
|
103
Mastodon/Resources/Assets.xcassets/Human/face.smiling.adaptive.imageset/emojiIconLight.pdf
vendored
Normal file
103
Mastodon/Resources/Assets.xcassets/Human/face.smiling.adaptive.imageset/emojiIconLight.pdf
vendored
Normal file
|
@ -0,0 +1,103 @@
|
||||||
|
%PDF-1.7
|
||||||
|
|
||||||
|
1 0 obj
|
||||||
|
<< >>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
2 0 obj
|
||||||
|
<< /Length 3 0 R >>
|
||||||
|
stream
|
||||||
|
/DeviceRGB CS
|
||||||
|
/DeviceRGB cs
|
||||||
|
q
|
||||||
|
1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
|
||||||
|
0.168627 0.564706 0.850980 scn
|
||||||
|
90.000000 48.000000 m
|
||||||
|
90.000000 24.804031 71.195969 6.000000 48.000000 6.000000 c
|
||||||
|
24.804039 6.000000 6.000000 24.804031 6.000000 48.000000 c
|
||||||
|
6.000000 71.195961 24.804041 90.000000 48.000000 90.000000 c
|
||||||
|
71.195969 90.000000 90.000000 71.195961 90.000000 48.000000 c
|
||||||
|
h
|
||||||
|
48.000000 0.000000 m
|
||||||
|
74.509674 0.000000 96.000000 21.490326 96.000000 48.000000 c
|
||||||
|
96.000000 74.509666 74.509674 96.000000 48.000000 96.000000 c
|
||||||
|
21.490332 96.000000 0.000000 74.509666 0.000000 48.000000 c
|
||||||
|
0.000000 21.490326 21.490332 0.000000 48.000000 0.000000 c
|
||||||
|
h
|
||||||
|
38.666645 59.999981 m
|
||||||
|
38.666645 54.845322 35.681877 50.666649 31.999979 50.666649 c
|
||||||
|
28.318081 50.666649 25.333313 54.845322 25.333313 59.999981 c
|
||||||
|
25.333313 65.154640 28.318081 69.333313 31.999979 69.333313 c
|
||||||
|
35.681877 69.333313 38.666645 65.154640 38.666645 59.999981 c
|
||||||
|
h
|
||||||
|
63.999977 50.666649 m
|
||||||
|
67.681877 50.666649 70.666641 54.845322 70.666641 59.999981 c
|
||||||
|
70.666641 65.154640 67.681877 69.333313 63.999977 69.333313 c
|
||||||
|
60.318081 69.333313 57.333313 65.154640 57.333313 59.999981 c
|
||||||
|
57.333313 54.845322 60.318081 50.666649 63.999977 50.666649 c
|
||||||
|
h
|
||||||
|
48.000023 39.999962 m
|
||||||
|
38.338688 39.999962 31.928020 41.125294 24.000021 42.666630 c
|
||||||
|
22.189354 43.015961 18.666687 42.666630 18.666687 37.333294 c
|
||||||
|
18.666687 26.666626 30.920021 13.333298 48.000023 13.333298 c
|
||||||
|
65.077354 13.333298 77.333359 26.666626 77.333359 37.333294 c
|
||||||
|
77.333359 42.666630 73.810684 43.018627 72.000023 42.666630 c
|
||||||
|
64.072021 41.125294 57.661354 39.999962 48.000023 39.999962 c
|
||||||
|
h
|
||||||
|
24.000000 37.333313 m
|
||||||
|
24.000000 37.333313 32.000000 34.666645 48.000000 34.666645 c
|
||||||
|
64.000000 34.666645 72.000000 37.333313 72.000000 37.333313 c
|
||||||
|
72.000000 37.333313 66.666672 26.666649 48.000000 26.666649 c
|
||||||
|
29.333334 26.666649 24.000000 37.333313 24.000000 37.333313 c
|
||||||
|
h
|
||||||
|
f*
|
||||||
|
n
|
||||||
|
Q
|
||||||
|
|
||||||
|
endstream
|
||||||
|
endobj
|
||||||
|
|
||||||
|
3 0 obj
|
||||||
|
1869
|
||||||
|
endobj
|
||||||
|
|
||||||
|
4 0 obj
|
||||||
|
<< /Annots []
|
||||||
|
/Type /Page
|
||||||
|
/MediaBox [ 0.000000 0.000000 96.000000 96.000000 ]
|
||||||
|
/Resources 1 0 R
|
||||||
|
/Contents 2 0 R
|
||||||
|
/Parent 5 0 R
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
5 0 obj
|
||||||
|
<< /Kids [ 4 0 R ]
|
||||||
|
/Count 1
|
||||||
|
/Type /Pages
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
6 0 obj
|
||||||
|
<< /Type /Catalog
|
||||||
|
/Pages 5 0 R
|
||||||
|
>>
|
||||||
|
endobj
|
||||||
|
|
||||||
|
xref
|
||||||
|
0 7
|
||||||
|
0000000000 65535 f
|
||||||
|
0000000010 00000 n
|
||||||
|
0000000034 00000 n
|
||||||
|
0000001959 00000 n
|
||||||
|
0000001982 00000 n
|
||||||
|
0000002155 00000 n
|
||||||
|
0000002229 00000 n
|
||||||
|
trailer
|
||||||
|
<< /ID [ (some) (id) ]
|
||||||
|
/Root 6 0 R
|
||||||
|
/Size 7
|
||||||
|
>>
|
||||||
|
startxref
|
||||||
|
2288
|
||||||
|
%%EOF
|
|
@ -41,7 +41,10 @@ final class ComposeToolbarView: UIView {
|
||||||
let emojiButton: UIButton = {
|
let emojiButton: UIButton = {
|
||||||
let button = HighlightDimmableButton()
|
let button = HighlightDimmableButton()
|
||||||
ComposeToolbarView.configureToolbarButtonAppearance(button: button)
|
ComposeToolbarView.configureToolbarButtonAppearance(button: button)
|
||||||
button.setImage(UIImage(systemName: "face.smiling", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular)), for: .normal)
|
let image = Asset.Human.faceSmilingAdaptive.image
|
||||||
|
.af.imageScaled(to: CGSize(width: 20, height: 20))
|
||||||
|
.withRenderingMode(.alwaysTemplate)
|
||||||
|
button.setImage(image, for: .normal)
|
||||||
return button
|
return button
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
@ -203,12 +206,10 @@ extension ComposeToolbarView {
|
||||||
switch traitCollection.userInterfaceStyle {
|
switch traitCollection.userInterfaceStyle {
|
||||||
case .light:
|
case .light:
|
||||||
mediaButton.setImage(UIImage(systemName: "photo", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
mediaButton.setImage(UIImage(systemName: "photo", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
||||||
emojiButton.setImage(UIImage(systemName: "face.smiling", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
|
||||||
contentWarningButton.setImage(UIImage(systemName: "exclamationmark.shield", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
contentWarningButton.setImage(UIImage(systemName: "exclamationmark.shield", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
||||||
|
|
||||||
case .dark:
|
case .dark:
|
||||||
mediaButton.setImage(UIImage(systemName: "photo.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
mediaButton.setImage(UIImage(systemName: "photo.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
||||||
emojiButton.setImage(UIImage(systemName: "face.smiling.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
|
||||||
contentWarningButton.setImage(UIImage(systemName: "exclamationmark.shield.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
contentWarningButton.setImage(UIImage(systemName: "exclamationmark.shield.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular))!, for: .normal)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue