Pixelfed
/
Vernissage
mirror of https://github.com/VernissageApp/Vernissage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable automatic resource generator

This commit is contained in:
Marcin Czachurski 2023-09-19 19:32:27 +02:00
parent 80b2d2f4e9
commit bcff3adbc7
27 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EnvironmentKit/Sources/EnvironmentKit/Extensions/Color+Assets.swift
View File

@ -10,7 +10,7 @@ public extension Color {
// MARK: - Text Colors
static let dangerColor = Color("DangerColor")
static let lightGrayColor = Color("LightGrayColor")
static let customGrayColor = Color("CustomGrayColor")
static let mainTextColor = Color("MainTextColor")
static let selectedRowColor = Color("SelectedRowColor")
static let viewBackgroundColor = Color("ViewBackgroundColor")

1
ServicesKit/Package.swift
View File

@ -20,7 +20,6 @@ let package = Package(
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/omaralbeik/Drops", .upToNextMajor(from: "1.6.1")),
.package(url: "https://github.com/kean/Nuke", .upToNextMajor(from: "12.0.0")),
.package(name: "PixelfedKit", path: "../PixelfedKit"),
.package(name: "EnvironmentKit", path: "../EnvironmentKit")
],
targets: [

0
SharedAssets.xcassets/LightGrayColor.colorset/Contents.json → SharedAssets.xcassets/CustomGrayColor.colorset/Contents.json
View File

36
Vernissage.xcodeproj/project.pbxproj
View File

@ -38,6 +38,7 @@
F84625F829FE2C2F002D3AF4 /* AccountFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84625F729FE2C2F002D3AF4 /* AccountFetcher.swift */; };
F84625FB29FE393B002D3AF4 /* QRCode in Frameworks */ = {isa = PBXBuildFile; productRef = F84625FA29FE393B002D3AF4 /* QRCode */; };
F858906B29E1CC7A00D4BDED /* UIApplication+Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = F858906A29E1CC7A00D4BDED /* UIApplication+Window.swift */; };
F85D0C652ABA08F9002B3577 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F85D0C642ABA08F9002B3577 /* Assets.xcassets */; };
F85D4971296402DC00751DF7 /* AuthorizationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85D4970296402DC00751DF7 /* AuthorizationService.swift */; };
F85D4975296407F100751DF7 /* HomeTimelineService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85D4974296407F100751DF7 /* HomeTimelineService.swift */; };
F85D497729640A5200751DF7 /* ImageRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85D497629640A5200751DF7 /* ImageRow.swift */; };
@ -54,7 +55,6 @@
F864F76129BB91B400B13921 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F864F76029BB91B400B13921 /* SwiftUI.framework */; };
F864F76429BB91B400B13921 /* VernissageWidgetBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = F864F76329BB91B400B13921 /* VernissageWidgetBundle.swift */; };
F864F76629BB91B400B13921 /* PhotoWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F864F76529BB91B400B13921 /* PhotoWidget.swift */; };
F864F76829BB91B600B13921 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F864F76729BB91B600B13921 /* Assets.xcassets */; };
F864F76C29BB91B600B13921 /* VernissageWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = F864F75D29BB91B400B13921 /* VernissageWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
F864F77529BB92CE00B13921 /* PhotoProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F864F77329BB929A00B13921 /* PhotoProvider.swift */; };
F864F77629BB92CE00B13921 /* PhotoWidgetEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F864F77129BB924D00B13921 /* PhotoWidgetEntryView.swift */; };
@ -271,6 +271,7 @@
F84625F729FE2C2F002D3AF4 /* AccountFetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountFetcher.swift; sourceTree = "<group>"; };
F858906A29E1CC7A00D4BDED /* UIApplication+Window.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIApplication+Window.swift"; sourceTree = "<group>"; };
F85B586C29ED169B00A16D12 /* Vernissage-010.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Vernissage-010.xcdatamodel"; sourceTree = "<group>"; };
F85D0C642ABA08F9002B3577 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F85D4970296402DC00751DF7 /* AuthorizationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorizationService.swift; sourceTree = "<group>"; };
F85D4974296407F100751DF7 /* HomeTimelineService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTimelineService.swift; sourceTree = "<group>"; };
F85D497629640A5200751DF7 /* ImageRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageRow.swift; sourceTree = "<group>"; };
@ -288,7 +289,6 @@
F864F76029BB91B400B13921 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
F864F76329BB91B400B13921 /* VernissageWidgetBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VernissageWidgetBundle.swift; sourceTree = "<group>"; };
F864F76529BB91B400B13921 /* PhotoWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoWidget.swift; sourceTree = "<group>"; };
F864F76729BB91B600B13921 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F864F76929BB91B600B13921 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F864F77129BB924D00B13921 /* PhotoWidgetEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoWidgetEntryView.swift; sourceTree = "<group>"; };
F864F77329BB929A00B13921 /* PhotoProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoProvider.swift; sourceTree = "<group>"; };
@ -676,7 +676,7 @@
F84625EE29FE2ABA002D3AF4 /* PhotoWidget */,
F8F6E44F29BCE9030004795E /* Extensions */,
F864F76329BB91B400B13921 /* VernissageWidgetBundle.swift */,
F864F76729BB91B600B13921 /* Assets.xcassets */,
F85D0C642ABA08F9002B3577 /* Assets.xcassets */,
);
path = VernissageWidget;
sourceTree = "<group>";
@ -981,7 +981,6 @@
F88C2465295C37B80006098B /* Frameworks */,
F88C2466295C37B80006098B /* Resources */,
F864F76D29BB91B600B13921 /* Embed Foundation Extensions */,
F8CB3DF129D8267C00CDAE5A /* ShellScript */,
);
buildRules = (
);
@ -1013,7 +1012,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1430;
LastUpgradeCheck = 1420;
LastUpgradeCheck = 1500;
TargetAttributes = {
F864F75C29BB91B400B13921 = {
CreatedOnToolsVersion = 14.2;
@ -1060,7 +1059,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F864F76829BB91B600B13921 /* Assets.xcassets in Resources */,
F85D0C652ABA08F9002B3577 /* Assets.xcassets in Resources */,
F835082429BEF9C400DE3247 /* Localizable.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -1088,27 +1087,6 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
F8CB3DF129D8267C00CDAE5A /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nif which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https: //github.com/realm/SwiftLint\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
F864F75929BB91B400B13921 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@ -1447,6 +1425,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@ -1480,6 +1459,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
@ -1508,6 +1488,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@ -1541,6 +1522,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

4
Vernissage/Views/EditProfileView.swift
View File

@ -142,7 +142,7 @@ struct EditProfileView: View {
Text("@\(account.acct)")
.font(.headline)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
if self.avatarData != nil {
HStack {
@ -151,7 +151,7 @@ struct EditProfileView: View {
.foregroundColor(.accentColor)
Text("editProfile.title.photoInfo")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
.padding(.top, 4)
}

2
Vernissage/Views/FollowRequestsView.swift
View File

@ -71,7 +71,7 @@ struct FollowRequestsView: View {
Text(account.displayName ?? account.username)
.foregroundColor(.mainTextColor)
Text("@\(account.acct)")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
}
.padding(.leading, 8)

4
Vernissage/Views/InstanceView.swift
View File

@ -68,7 +68,7 @@ struct InstanceView: View {
if let shortDescription = instance.shortDescription {
Text(shortDescription)
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
}
@ -119,7 +119,7 @@ struct InstanceView: View {
Text(title, comment: "Title")
Spacer()
Text(value)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.subheadline)
}
}

2
Vernissage/Views/MainView.swift
View File

@ -242,7 +242,7 @@ struct MainView: View {
.frame(width: 16, height: 16)
.foregroundColor(.white)
.padding(8)
.background(Color.lightGrayColor)
.background(Color.customGrayColor)
.clipShape(AvatarShape.circle.shape())
.background(
AvatarShape.circle.shape()

4
Vernissage/Views/NotificationsView/Subviews/NotificationRowView.swift
View File

@ -58,13 +58,13 @@ struct NotificationRowView: View {
if let createdAt = self.notification.createdAt.toDate(.isoDateTimeMilliSec) {
RelativeTime(date: createdAt)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
}
}
Text(self.getTitle(), comment: "Notification type")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
.fontWeight(.light)

12
Vernissage/Views/SettingsView/Subviews/MediaSettingsView.swift
View File

@ -19,7 +19,7 @@ struct MediaSettingsView: View {
Text("settings.title.alwaysShowSensitiveTitle", comment: "Always show NSFW")
Text("settings.title.alwaysShowSensitiveDescription", comment: "Force show all NFSW (sensitive) media without warnings")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
}
.onChange(of: self.applicationState.showSensitive) { newValue in
@ -31,7 +31,7 @@ struct MediaSettingsView: View {
Text("settings.title.alwaysShowAltTitle", comment: "Show alternative text")
Text("settings.title.alwaysShowAltDescription", comment: "Show alternative text if present on status details screen")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
}
.onChange(of: self.applicationState.showPhotoDescription) { newValue in
@ -43,7 +43,7 @@ struct MediaSettingsView: View {
Text("settings.title.showAvatars", comment: "Show avatars")
Text("settings.title.showAvatarsOnTimeline", comment: "Show avatars on timeline")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
}
.onChange(of: self.applicationState.showAvatarsOnTimeline) { newValue in
@ -55,7 +55,7 @@ struct MediaSettingsView: View {
Text("settings.title.showFavourite", comment: "Show favourites")
Text("settings.title.showFavouriteOnTimeline", comment: "Show favourites on timeline")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
}
.onChange(of: self.applicationState.showFavouritesOnTimeline) { newValue in
@ -67,7 +67,7 @@ struct MediaSettingsView: View {
Text("settings.title.showAltText", comment: "Show ALT icon")
Text("settings.title.showAltTextOnTimeline", comment: "ALT icon will be displayed on timelines")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
}
.onChange(of: self.applicationState.showAltIconOnTimeline) { newValue in
@ -79,7 +79,7 @@ struct MediaSettingsView: View {
Text("settings.title.warnAboutMissingAltTitle", comment: "Warn of missing ALT text")
Text("settings.title.warnAboutMissingAltDescription", comment: "A warning about missing ALT texts will be displayed before publishing new post.")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
}
.onChange(of: self.applicationState.warnAboutMissingAlt) { newValue in

6
Vernissage/Views/SettingsView/Subviews/SocialsSectionView.swift
View File

@ -14,7 +14,7 @@ struct SocialsSectionView: View {
Text("settings.title.followVernissage", comment: "Follow Vernissage")
Text("settings.title.mastodonAccount", comment: "Mastodon account")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
Spacer()
@ -27,7 +27,7 @@ struct SocialsSectionView: View {
Text("settings.title.follow", comment: "Follow me")
Text("settings.title.mastodonAccount", comment: "Mastodon account")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
Spacer()
@ -40,7 +40,7 @@ struct SocialsSectionView: View {
Text("settings.title.follow", comment: "Follow me")
Text("settings.title.pixelfedAccount", comment: "Pixelfed account")
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
Spacer()

2
Vernissage/Views/SettingsView/Subviews/SupportView.swift
View File

@ -21,7 +21,7 @@ struct SupportView: View {
Text(product.displayName)
Text(product.description)
.font(.footnote)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
Spacer()
Button(product.displayPrice) {

2
Vernissage/Views/SignInView/Subviews/InstanceRowView.swift
View File

@ -80,7 +80,7 @@ struct InstanceRowView: View {
Spacer()
}
.padding(.top, 4)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.caption)
}
}

4
Vernissage/Views/StatusView/StatusView.swift
View File

@ -134,7 +134,7 @@ struct StatusView: View {
}
}
.padding(.bottom, 2)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
HStack {
Text("status.title.uploaded", comment: "Uploaded")
@ -151,7 +151,7 @@ struct StatusView: View {
Text(String(format: NSLocalizedString("status.title.via", comment: "via"), applicationName))
}
}
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
InteractionRow(statusModel: statusViewModel) {

2
Vernissage/Views/StatusView/Subviews/CommentBodyView.swift
View File

@ -36,7 +36,7 @@ struct CommentBodyView: View {
if let createdAt = self.statusViewModel.createdAt.toDate(.isoDateTimeMilliSec) {
RelativeTime(date: createdAt)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
}
}

2
Vernissage/Views/StatusView/Subviews/CommentsSectionView.swift
View File

@ -41,7 +41,7 @@ struct CommentsSectionView: View {
.padding(.horizontal, 16)
.padding(.vertical, 8)
}
.background(Color.lightGrayColor.opacity(0.5))
.background(Color.customGrayColor.opacity(0.5))
.transition(AnyTransition.move(edge: .top).combined(with: .opacity))
}
}

4
Vernissage/Views/StatusView/Subviews/StatusPlaceholderView.swift
View File

@ -32,10 +32,10 @@ struct StatusPlaceholderView: View {
accountUsername: "@username")
Text("Lorem ispum text something")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
Text("Lorem ispum text something sdf sdfsdf sdfdsfsdfsdf")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
LabelIcon(iconName: "mappin.and.ellipse", value: "Wroclaw, Poland")

4
Vernissage/Views/UserProfileView/Subviews/UserProfileHeaderView.swift
View File

@ -68,7 +68,7 @@ struct UserProfileHeaderView: View {
.font(.title3)
.fontWeight(.bold)
Text("@\(account.acct)")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.subheadline)
}
@ -101,7 +101,7 @@ struct UserProfileHeaderView: View {
self.accountRelationshipPanel()
Text(String(format: NSLocalizedString("userProfile.title.joined", comment: "Joined"), account.createdAt.toRelative(.isoDateTimeMilliSec)))
.foregroundColor(.lightGrayColor.opacity(0.5))
.foregroundColor(.customGrayColor.opacity(0.5))
.font(.footnote)
}
.padding([.top, .leading, .trailing])

4
Vernissage/Views/UserProfileView/Subviews/UserProfileStatusesView.swift
View File

@ -61,7 +61,7 @@ struct UserProfileStatusesView: View {
}
} label: {
Image(systemName: "rectangle.grid.1x2.fill")
.foregroundColor(self.applicationState.showGridOnUserProfile ? .lightGrayColor : .accentColor)
.foregroundColor(self.applicationState.showGridOnUserProfile ? .customGrayColor : .accentColor)
.padding(.trailing, 8)
.padding(.bottom, 8)
}
@ -72,7 +72,7 @@ struct UserProfileStatusesView: View {
}
} label: {
Image(systemName: "rectangle.grid.2x2.fill")
.foregroundColor(self.applicationState.showGridOnUserProfile ? .accentColor : .lightGrayColor)
.foregroundColor(self.applicationState.showGridOnUserProfile ? .accentColor : .customGrayColor)
.padding(.trailing, 16)
.padding(.bottom, 8)
}

9
VernissageWidget/Assets.xcassets/AccentColor.colorset/Contents.json
View File

@ -1,6 +1,15 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.969",
"green" : "0.514",
"red" : "0.204"
}
},
"idiom" : "universal"
}
],

1
VernissageWidget/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@ -1,6 +1,7 @@
{
"images" : [
{
"filename" : "icon.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"

BIN
VernissageWidget/Assets.xcassets/AppIcon.appiconset/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 45 KiB

9
VernissageWidget/Assets.xcassets/WidgetBackground.colorset/Contents.json
View File

@ -1,6 +1,15 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0.267",
"green" : "0.267",
"red" : "0.267"
}
},
"idiom" : "universal"
}
],

6
WidgetsKit/Sources/WidgetsKit/Views/BaseComposeView.swift
View File

@ -400,7 +400,7 @@ public struct BaseComposeView: View {
Image(systemName: "mappin.and.ellipse")
Text("\(name), \(country)")
}
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.padding(.trailing, 8)
}
}
@ -425,7 +425,7 @@ public struct BaseComposeView: View {
Text(account.displayNameWithoutEmojis)
.foregroundColor(.mainTextColor)
Text("@\(account.acct)")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
.padding(.leading, 8)
}
@ -540,7 +540,7 @@ public struct BaseComposeView: View {
Spacer()
Text("\(self.applicationState.statusMaxCharacters - textModel.text.string.utf16.count)")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.system(size: self.keyboardFontTextSize))
}
.padding(8)

2
WidgetsKit/Sources/WidgetsKit/Views/PlaceSelectorView.swift
View File

@ -79,7 +79,7 @@ public struct PlaceSelectorView: View {
.foregroundColor(.mainTextColor)
Text(place.country ?? String.empty())
.font(.subheadline)
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
}
Spacer()

2
WidgetsKit/Sources/WidgetsKit/Widgets/NoDataView.swift
View File

@ -24,7 +24,7 @@ public struct NoDataView: View {
Text(self.text, comment: "No data message")
.font(.title3)
}
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
}
}

2
WidgetsKit/Sources/WidgetsKit/Widgets/UsernameRow.swift
View File

@ -34,7 +34,7 @@ public struct UsernameRow: View {
Text(accountDisplayName ?? accountUsername)
.foregroundColor(.mainTextColor)
Text("@\(accountUsername)")
.foregroundColor(.lightGrayColor)
.foregroundColor(.customGrayColor)
.font(.footnote)
}
.padding(.leading, 8)