Skip to content

Commit fd8594b

Browse files
vladimirleonidovichvladimirleonidovich
authored
apply .widgetAccentedRenderingMode(.fullColor) to avatars (#1478)
* apply `.widgetAccentedRenderingMode(.fullColor)` to avatar image (`FollowersCountWidgetView`) * apply `.widgetAccentedRenderingMode(.fullColor)` to avatar image (`FollowersCountWidgetView`) * apply `.widgetAccentedRenderingMode(.fullColor)` to avatar image (`MultiFollowersCountWidgetView`) * apply `.widgetAccentedRenderingMode(.fullColor)` to avatar image (`MultiFollowersCountWidgetView`) * apply `.widgetAccentedRenderingMode(.fullColor)` to avatar image (`LatestFollowersWidgetView`) * apply `.widgetAccentedRenderingMode(.fullColor)` to avatar image (`LatestFollowersWidgetView`) * apply .widgetAccentedRenderingMode(.fullColor) to logo (LatestFollowersWidgetView)
1 parent 4e46ef6 commit fd8594b

File tree

3 files changed

+79
-26
lines changed

3 files changed

+79
-26
lines changed

‎WidgetExtension/Variants/FollowersCount/FollowersCountWidgetView.swift‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,19 @@ struct FollowersCountWidgetView: View {
4141
private func viewForSmallWidgetNoChart(_ account: FollowersEntryAccountable) -> some View {
4242
HStack {
4343
VStack(alignment: .leading, spacing: 0) {
44-
Image(uiImage: account.avatarImage)
45-
.resizable()
46-
.frame(width: 50, height: 50)
47-
.cornerRadius(12)
48-
.padding(.bottom, 8)
44+
Group {
45+
if #available(iOS 18, *) {
46+
Image(uiImage: account.avatarImage)
47+
.resizable()
48+
.widgetAccentedRenderingMode(.fullColor)
49+
} else {
50+
Image(uiImage: account.avatarImage)
51+
.resizable()
52+
}
53+
}
54+
.frame(width: 50, height: 50)
55+
.cornerRadius(12)
56+
.padding(.bottom, 8)
4957

5058
Text(account.followersCount.asAbbreviatedCountString())
5159
.font(.largeTitle)
@@ -73,10 +81,18 @@ struct FollowersCountWidgetView: View {
7381
private func viewForSmallWidgetYesChart(_ account: FollowersEntryAccountable) -> some View {
7482
VStack(alignment: .leading, spacing: 0) {
7583
HStack {
76-
Image(uiImage: account.avatarImage)
77-
.resizable()
78-
.frame(width: 23, height: 23)
79-
.cornerRadius(5)
84+
Group {
85+
if #available(iOS 18, *) {
86+
Image(uiImage: account.avatarImage)
87+
.resizable()
88+
.widgetAccentedRenderingMode(.fullColor)
89+
} else {
90+
Image(uiImage: account.avatarImage)
91+
.resizable()
92+
}
93+
}
94+
.frame(width: 23, height: 23)
95+
.cornerRadius(5)
8096
VStack(alignment: .leading) {
8197
Text(account.displayNameWithFallback)
8298
.font(.caption)

‎WidgetExtension/Variants/LatestFollowers/LatestFollowersWidgetView.swift‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,18 @@ struct LatestFollowersWidgetView: View {
4545

4646
ForEach(accounts, id: \.acct) { account in
4747
HStack {
48-
Image(uiImage: account.avatarImage)
49-
.resizable()
50-
.frame(width: 32, height: 32)
51-
.cornerRadius(5)
48+
Group {
49+
if #available(iOS 18, *) {
50+
Image(uiImage: account.avatarImage)
51+
.resizable()
52+
.widgetAccentedRenderingMode(.fullColor)
53+
} else {
54+
Image(uiImage: account.avatarImage)
55+
.resizable()
56+
}
57+
}
58+
.frame(width: 32, height: 32)
59+
.cornerRadius(5)
5260
VStack(alignment: .leading) {
5361

5462
Text(account.displayNameWithFallback)
@@ -82,15 +90,28 @@ struct LatestFollowersWidgetView: View {
8290
Text(L10n.Widget.LatestFollowers.title)
8391
.font(.system(size: UIFontMetrics.default.scaledValue(for: 16)))
8492
Spacer()
85-
Image("BrandIconColored")
93+
if #available(iOS 18, *) {
94+
Image("BrandIconColored")
95+
.widgetAccentedRenderingMode(.fullColor)
96+
} else {
97+
Image("BrandIconColored")
98+
}
8699
}
87100

88101
ForEach(accounts, id: \.acct) { account in
89102
HStack {
90-
Image(uiImage: account.avatarImage)
91-
.resizable()
92-
.frame(width: 32, height: 32)
93-
.cornerRadius(5)
103+
Group {
104+
if #available(iOS 18, *) {
105+
Image(uiImage: account.avatarImage)
106+
.resizable()
107+
.widgetAccentedRenderingMode(.fullColor)
108+
} else {
109+
Image(uiImage: account.avatarImage)
110+
.resizable()
111+
}
112+
}
113+
.frame(width: 32, height: 32)
114+
.cornerRadius(5)
94115
VStack(alignment: .leading) {
95116

96117
HStack {

‎WidgetExtension/Variants/MultiFollowersCount/MultiFollowersCountWidgetView.swift‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,18 @@ struct MultiFollowersCountWidgetView: View {
3333
VStack(alignment: .leading, spacing: 0) {
3434
ForEach(accounts, id: \.acct) { account in
3535
HStack {
36-
Image(uiImage: account.avatarImage)
37-
.resizable()
38-
.frame(width: 32, height: 32)
39-
.cornerRadius(5)
36+
Group {
37+
if #available(iOS 18, *) {
38+
Image(uiImage: account.avatarImage)
39+
.resizable()
40+
.widgetAccentedRenderingMode(.fullColor)
41+
} else {
42+
Image(uiImage: account.avatarImage)
43+
.resizable()
44+
}
45+
}
46+
.frame(width: 32, height: 32)
47+
.cornerRadius(5)
4048
VStack(alignment: .leading) {
4149
Text(account.followersCount.asAbbreviatedCountString())
4250
.font(.title2)
@@ -67,10 +75,18 @@ struct MultiFollowersCountWidgetView: View {
6775
]) {
6876
ForEach(accounts, id: \.acct) { account in
6977
HStack {
70-
Image(uiImage: account.avatarImage)
71-
.resizable()
72-
.frame(width: 32, height: 32)
73-
.cornerRadius(5)
78+
Group {
79+
if #available(iOS 18, *) {
80+
Image(uiImage: account.avatarImage)
81+
.resizable()
82+
.widgetAccentedRenderingMode(.fullColor)
83+
} else {
84+
Image(uiImage: account.avatarImage)
85+
.resizable()
86+
}
87+
}
88+
.frame(width: 32, height: 32)
89+
.cornerRadius(5)
7490
VStack(alignment: .leading) {
7591
Text(account.followersCount.asAbbreviatedCountString())
7692
.font(.title2)

0 commit comments

Comments
 (0)