From 7d55eba3ee3436bf7a224ca2b2f047771169f8d8 Mon Sep 17 00:00:00 2001 From: Marcin Czachursk Date: Sun, 19 Feb 2023 10:32:38 +0100 Subject: [PATCH] Change MastodonKit into PixelfedKit --- {MastodonKit => PixelfedKit}/Package.swift | 12 ++++++------ .../PixelfedKit}/Entities/Account.swift | 0 .../PixelfedKit}/Entities/Application.swift | 0 .../Entities/BaseApplication.swift | 0 .../PixelfedKit}/Entities/Configuration.swift | 0 .../PixelfedKit}/Entities/Contact.swift | 0 .../PixelfedKit}/Entities/Context.swift | 0 .../PixelfedKit}/Entities/CustomEmoji.swift | 0 .../Sources/PixelfedKit}/Entities/Field.swift | 0 .../Sources/PixelfedKit}/Entities/Filter.swift | 0 .../PixelfedKit}/Entities/FilterKeyword.swift | 0 .../PixelfedKit}/Entities/FilterResult.swift | 0 .../PixelfedKit}/Entities/FilterStatus.swift | 0 .../Sources/PixelfedKit}/Entities/Focus.swift | 0 .../PixelfedKit}/Entities/ImageInfo.swift | 0 .../PixelfedKit}/Entities/ImageMetadata.swift | 0 .../PixelfedKit}/Entities/Instance.swift | 0 .../Sources/PixelfedKit}/Entities/Link.swift | 0 .../PixelfedKit}/Entities/Linkable.swift | 0 .../PixelfedKit}/Entities/Markers.swift | 0 .../Entities/MediaAttachment.swift | 0 .../PixelfedKit}/Entities/Mention.swift | 0 .../Sources/PixelfedKit}/Entities/Meta.swift | 0 .../PixelfedKit}/Entities/Notification.swift | 0 .../Sources/PixelfedKit}/Entities/Place.swift | 0 .../Sources/PixelfedKit}/Entities/Poll.swift | 0 .../PixelfedKit}/Entities/PollOption.swift | 0 .../PixelfedKit}/Entities/PreviewCard.swift | 0 .../PixelfedKit}/Entities/Registration.swift | 0 .../PixelfedKit}/Entities/Relationship.swift | 0 .../Sources/PixelfedKit}/Entities/Report.swift | 0 .../Sources/PixelfedKit}/Entities/Rule.swift | 0 .../PixelfedKit}/Entities/SearchResults.swift | 0 .../Sources/PixelfedKit}/Entities/Status.swift | 0 .../Sources/PixelfedKit}/Entities/Tag.swift | 0 .../PixelfedKit}/Entities/Thumbnail.swift | 0 .../Sources/PixelfedKit}/Entities/Types.swift | 0 .../Entities/UploadedAttachment.swift | 0 .../Sources/PixelfedKit}/Entities/Usage.swift | 0 .../PixelfedKit}/Errors/NetworkError.swift | 0 .../Extensions/NSMutableData+String.swift | 0 .../Extensions/Primitive+AsString.swift | 0 .../PixelfedKit}/Extensions/String+AsURL.swift | 0 .../Extensions/URL+OptionalString.swift | 0 .../Extensions/URLResponse+StatusCode.swift | 0 .../PixelfedKit}/MastodonClient+Account.swift | 0 .../PixelfedKit}/MastodonClient+Context.swift | 0 .../MastodonClient+Convenience.swift | 0 .../MastodonClient+Instances.swift | 0 .../PixelfedKit}/MastodonClient+Media.swift | 0 .../MastodonClient+Notifications.swift | 0 .../PixelfedKit}/MastodonClient+Places.swift | 0 .../PixelfedKit}/MastodonClient+Search.swift | 0 .../PixelfedKit}/MastodonClient+Status.swift | 0 .../MastodonClient+StatusActions.swift | 0 .../PixelfedKit}/MastodonClient+Tags.swift | 0 .../MastodonClient+Timelines.swift | 0 .../PixelfedKit}/MastodonClient+Trends.swift | 0 .../Sources/PixelfedKit}/MastodonClient.swift | 0 .../Networking/HTTPStatusCode.swift | 0 .../Networking/MultipartFormData.swift | 0 .../PixelfedKit}/Networking/TargetType.swift | 0 .../PixelfedKit}/Targets/Accounts.swift | 0 .../Sources/PixelfedKit}/Targets/Apps.swift | 0 .../Sources/PixelfedKit}/Targets/Blocks.swift | 0 .../PixelfedKit}/Targets/Bookmarks.swift | 0 .../PixelfedKit}/Targets/Favourites.swift | 0 .../PixelfedKit}/Targets/FollowRequests.swift | 0 .../Sources/PixelfedKit}/Targets/Follows.swift | 0 .../PixelfedKit}/Targets/Instances.swift | 0 .../Sources/PixelfedKit}/Targets/Marker.swift | 0 .../PixelfedKit}/Targets/Mastodon.swift | 0 .../Sources/PixelfedKit}/Targets/Media.swift | 0 .../Sources/PixelfedKit}/Targets/Mutes.swift | 0 .../PixelfedKit}/Targets/Notifications.swift | 0 .../Sources/PixelfedKit}/Targets/OAuth.swift | 0 .../Sources/PixelfedKit}/Targets/Places.swift | 0 .../Sources/PixelfedKit}/Targets/Reports.swift | 0 .../Sources/PixelfedKit}/Targets/Search.swift | 0 .../PixelfedKit}/Targets/Statuses.swift | 0 .../Sources/PixelfedKit}/Targets/Tags.swift | 0 .../PixelfedKit}/Targets/Timelines.swift | 0 .../Sources/PixelfedKit}/Targets/Trends.swift | 0 .../PixelfedKitTests/PixelfedKitTests.swift | 0 Vernissage.xcodeproj/project.pbxproj | 18 +++++++++--------- .../CoreData/AttachmentData+Attachment.swift | 2 +- Vernissage/CoreData/StatusData+Status.swift | 2 +- Vernissage/CoreData/StatusDataHandler.swift | 2 +- .../EnvironmentObjects/ApplicationState.swift | 2 +- .../EnvironmentObjects/Client+Account.swift | 2 +- .../EnvironmentObjects/Client+Instance.swift | 2 +- .../EnvironmentObjects/Client+Media.swift | 2 +- .../Client+Notifications.swift | 4 ++-- .../EnvironmentObjects/Client+Places.swift | 2 +- .../EnvironmentObjects/Client+Search.swift | 2 +- .../EnvironmentObjects/Client+Statuses.swift | 2 +- .../EnvironmentObjects/Client+Tags.swift | 2 +- .../EnvironmentObjects/Client+Timeline.swift | 2 +- .../EnvironmentObjects/Client+Trends.swift | 2 +- Vernissage/EnvironmentObjects/Client.swift | 2 +- .../Status+MediaAttachmentType.swift | 2 +- Vernissage/Models/AttachmentModel.swift | 2 +- Vernissage/Models/PhotoAttachment.swift | 2 +- Vernissage/Models/StatusModel.swift | 2 +- Vernissage/SceneDelegate.swift | 2 +- Vernissage/Services/AuthorizationService.swift | 2 +- Vernissage/Services/HomeTimelineService.swift | 2 +- Vernissage/Services/RemoteFileService.swift | 2 +- Vernissage/Services/RouterPath.swift | 2 +- Vernissage/Views/AccountsView.swift | 2 +- Vernissage/Views/ComposeView.swift | 2 +- Vernissage/Views/MainView.swift | 2 +- Vernissage/Views/NotificationsView.swift | 4 ++-- Vernissage/Views/PaginableStatusesView.swift | 2 +- Vernissage/Views/PlaceSelectorView.swift | 2 +- Vernissage/Views/SignInView.swift | 2 +- Vernissage/Views/StatusView.swift | 2 +- Vernissage/Views/StatusesView.swift | 2 +- Vernissage/Views/TrendStatusesView.swift | 2 +- Vernissage/Views/UserProfileView.swift | 2 +- Vernissage/Widgets/FavouriteTouch.swift | 1 - Vernissage/Widgets/ImageRowAsync.swift | 2 +- Vernissage/Widgets/ImagesCarousel.swift | 2 +- Vernissage/Widgets/InteractionRow.swift | 2 +- .../NotificationsView/NotificationRow.swift | 6 +++--- .../SettingsView/AvatarShapesSection.swift | 1 - .../Widgets/SignInView/InstanceRow.swift | 2 +- .../Widgets/StatusView/CommentBody.swift | 2 +- .../Widgets/StatusView/CommentsSection.swift | 2 +- .../UserProfileView/UserProfileHeader.swift | 2 +- .../UserProfileView/UserProfileStatuses.swift | 2 +- 131 files changed, 63 insertions(+), 65 deletions(-) rename {MastodonKit => PixelfedKit}/Package.swift (83%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Account.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Application.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/BaseApplication.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Configuration.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Contact.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Context.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/CustomEmoji.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Field.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Filter.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/FilterKeyword.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/FilterResult.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/FilterStatus.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Focus.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/ImageInfo.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/ImageMetadata.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Instance.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Link.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Linkable.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Markers.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/MediaAttachment.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Mention.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Meta.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Notification.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Place.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Poll.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/PollOption.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/PreviewCard.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Registration.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Relationship.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Report.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Rule.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/SearchResults.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Status.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Tag.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Thumbnail.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Types.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/UploadedAttachment.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Entities/Usage.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Errors/NetworkError.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Extensions/NSMutableData+String.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Extensions/Primitive+AsString.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Extensions/String+AsURL.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Extensions/URL+OptionalString.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Extensions/URLResponse+StatusCode.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Account.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Context.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Convenience.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Instances.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Media.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Notifications.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Places.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Search.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Status.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+StatusActions.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Tags.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Timelines.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient+Trends.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/MastodonClient.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Networking/HTTPStatusCode.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Networking/MultipartFormData.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Networking/TargetType.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Accounts.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Apps.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Blocks.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Bookmarks.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Favourites.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/FollowRequests.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Follows.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Instances.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Marker.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Mastodon.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Media.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Mutes.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Notifications.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/OAuth.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Places.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Reports.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Search.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Statuses.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Tags.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Timelines.swift (100%) rename {MastodonKit/Sources/MastodonKit => PixelfedKit/Sources/PixelfedKit}/Targets/Trends.swift (100%) rename MastodonKit/Tests/MastodonKitTests/MastodonKitTests.swift => PixelfedKit/Tests/PixelfedKitTests/PixelfedKitTests.swift (100%) diff --git a/MastodonKit/Package.swift b/PixelfedKit/Package.swift similarity index 83% rename from MastodonKit/Package.swift rename to PixelfedKit/Package.swift index 738f0ac..e97c3a7 100644 --- a/MastodonKit/Package.swift +++ b/PixelfedKit/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( - name: "MastodonKit", + name: "PixelfedKit", platforms: [ .iOS(.v16), .macOS(.v12), @@ -13,8 +13,8 @@ let package = Package( products: [ // Products define the executables and libraries a package produces, and make them visible to other packages. .library( - name: "MastodonKit", - targets: ["MastodonKit"]), + name: "PixelfedKit", + targets: ["PixelfedKit"]), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -28,10 +28,10 @@ let package = Package( // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( - name: "MastodonKit", + name: "PixelfedKit", dependencies: ["OAuthSwift"]), .testTarget( - name: "MastodonKitTests", - dependencies: ["MastodonKit"]), + name: "PixelfedKitTests", + dependencies: ["PixelfedKit"]), ] ) diff --git a/MastodonKit/Sources/MastodonKit/Entities/Account.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Account.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Account.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Account.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Application.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Application.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Application.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Application.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/BaseApplication.swift b/PixelfedKit/Sources/PixelfedKit/Entities/BaseApplication.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/BaseApplication.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/BaseApplication.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Configuration.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Configuration.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Configuration.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Configuration.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Contact.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Contact.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Contact.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Contact.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Context.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Context.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Context.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Context.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/CustomEmoji.swift b/PixelfedKit/Sources/PixelfedKit/Entities/CustomEmoji.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/CustomEmoji.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/CustomEmoji.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Field.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Field.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Field.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Field.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Filter.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Filter.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Filter.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Filter.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/FilterKeyword.swift b/PixelfedKit/Sources/PixelfedKit/Entities/FilterKeyword.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/FilterKeyword.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/FilterKeyword.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/FilterResult.swift b/PixelfedKit/Sources/PixelfedKit/Entities/FilterResult.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/FilterResult.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/FilterResult.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/FilterStatus.swift b/PixelfedKit/Sources/PixelfedKit/Entities/FilterStatus.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/FilterStatus.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/FilterStatus.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Focus.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Focus.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Focus.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Focus.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/ImageInfo.swift b/PixelfedKit/Sources/PixelfedKit/Entities/ImageInfo.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/ImageInfo.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/ImageInfo.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/ImageMetadata.swift b/PixelfedKit/Sources/PixelfedKit/Entities/ImageMetadata.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/ImageMetadata.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/ImageMetadata.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Instance.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Instance.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Instance.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Instance.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Link.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Link.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Link.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Link.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Linkable.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Linkable.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Linkable.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Linkable.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Markers.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Markers.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Markers.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Markers.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/MediaAttachment.swift b/PixelfedKit/Sources/PixelfedKit/Entities/MediaAttachment.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/MediaAttachment.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/MediaAttachment.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Mention.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Mention.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Mention.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Mention.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Meta.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Meta.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Meta.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Meta.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Notification.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Notification.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Notification.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Notification.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Place.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Place.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Place.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Place.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Poll.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Poll.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Poll.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Poll.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/PollOption.swift b/PixelfedKit/Sources/PixelfedKit/Entities/PollOption.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/PollOption.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/PollOption.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/PreviewCard.swift b/PixelfedKit/Sources/PixelfedKit/Entities/PreviewCard.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/PreviewCard.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/PreviewCard.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Registration.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Registration.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Registration.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Registration.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Relationship.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Relationship.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Relationship.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Relationship.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Report.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Report.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Report.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Report.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Rule.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Rule.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Rule.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Rule.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/SearchResults.swift b/PixelfedKit/Sources/PixelfedKit/Entities/SearchResults.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/SearchResults.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/SearchResults.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Status.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Status.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Status.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Status.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Tag.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Tag.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Tag.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Tag.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Thumbnail.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Thumbnail.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Thumbnail.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Thumbnail.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Types.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Types.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Types.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Types.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/UploadedAttachment.swift b/PixelfedKit/Sources/PixelfedKit/Entities/UploadedAttachment.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/UploadedAttachment.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/UploadedAttachment.swift diff --git a/MastodonKit/Sources/MastodonKit/Entities/Usage.swift b/PixelfedKit/Sources/PixelfedKit/Entities/Usage.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Entities/Usage.swift rename to PixelfedKit/Sources/PixelfedKit/Entities/Usage.swift diff --git a/MastodonKit/Sources/MastodonKit/Errors/NetworkError.swift b/PixelfedKit/Sources/PixelfedKit/Errors/NetworkError.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Errors/NetworkError.swift rename to PixelfedKit/Sources/PixelfedKit/Errors/NetworkError.swift diff --git a/MastodonKit/Sources/MastodonKit/Extensions/NSMutableData+String.swift b/PixelfedKit/Sources/PixelfedKit/Extensions/NSMutableData+String.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Extensions/NSMutableData+String.swift rename to PixelfedKit/Sources/PixelfedKit/Extensions/NSMutableData+String.swift diff --git a/MastodonKit/Sources/MastodonKit/Extensions/Primitive+AsString.swift b/PixelfedKit/Sources/PixelfedKit/Extensions/Primitive+AsString.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Extensions/Primitive+AsString.swift rename to PixelfedKit/Sources/PixelfedKit/Extensions/Primitive+AsString.swift diff --git a/MastodonKit/Sources/MastodonKit/Extensions/String+AsURL.swift b/PixelfedKit/Sources/PixelfedKit/Extensions/String+AsURL.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Extensions/String+AsURL.swift rename to PixelfedKit/Sources/PixelfedKit/Extensions/String+AsURL.swift diff --git a/MastodonKit/Sources/MastodonKit/Extensions/URL+OptionalString.swift b/PixelfedKit/Sources/PixelfedKit/Extensions/URL+OptionalString.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Extensions/URL+OptionalString.swift rename to PixelfedKit/Sources/PixelfedKit/Extensions/URL+OptionalString.swift diff --git a/MastodonKit/Sources/MastodonKit/Extensions/URLResponse+StatusCode.swift b/PixelfedKit/Sources/PixelfedKit/Extensions/URLResponse+StatusCode.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Extensions/URLResponse+StatusCode.swift rename to PixelfedKit/Sources/PixelfedKit/Extensions/URLResponse+StatusCode.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Account.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Account.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Account.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Account.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Context.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Context.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Context.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Context.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Convenience.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Convenience.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Convenience.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Convenience.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Instances.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Instances.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Instances.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Instances.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Media.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Media.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Media.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Media.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Notifications.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Notifications.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Notifications.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Notifications.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Places.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Places.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Places.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Places.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Search.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Search.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Search.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Search.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Status.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Status.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Status.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Status.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+StatusActions.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+StatusActions.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+StatusActions.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+StatusActions.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Tags.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Tags.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Tags.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Tags.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Timelines.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Timelines.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Timelines.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Timelines.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient+Trends.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient+Trends.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient+Trends.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient+Trends.swift diff --git a/MastodonKit/Sources/MastodonKit/MastodonClient.swift b/PixelfedKit/Sources/PixelfedKit/MastodonClient.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/MastodonClient.swift rename to PixelfedKit/Sources/PixelfedKit/MastodonClient.swift diff --git a/MastodonKit/Sources/MastodonKit/Networking/HTTPStatusCode.swift b/PixelfedKit/Sources/PixelfedKit/Networking/HTTPStatusCode.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Networking/HTTPStatusCode.swift rename to PixelfedKit/Sources/PixelfedKit/Networking/HTTPStatusCode.swift diff --git a/MastodonKit/Sources/MastodonKit/Networking/MultipartFormData.swift b/PixelfedKit/Sources/PixelfedKit/Networking/MultipartFormData.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Networking/MultipartFormData.swift rename to PixelfedKit/Sources/PixelfedKit/Networking/MultipartFormData.swift diff --git a/MastodonKit/Sources/MastodonKit/Networking/TargetType.swift b/PixelfedKit/Sources/PixelfedKit/Networking/TargetType.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Networking/TargetType.swift rename to PixelfedKit/Sources/PixelfedKit/Networking/TargetType.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Accounts.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Accounts.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Accounts.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Accounts.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Apps.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Apps.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Apps.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Apps.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Blocks.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Blocks.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Blocks.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Blocks.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Bookmarks.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Bookmarks.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Bookmarks.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Bookmarks.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Favourites.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Favourites.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Favourites.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Favourites.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/FollowRequests.swift b/PixelfedKit/Sources/PixelfedKit/Targets/FollowRequests.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/FollowRequests.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/FollowRequests.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Follows.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Follows.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Follows.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Follows.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Instances.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Instances.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Instances.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Instances.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Marker.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Marker.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Marker.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Marker.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Mastodon.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Mastodon.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Mastodon.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Mastodon.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Media.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Media.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Media.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Media.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Mutes.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Mutes.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Mutes.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Mutes.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Notifications.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Notifications.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Notifications.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Notifications.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/OAuth.swift b/PixelfedKit/Sources/PixelfedKit/Targets/OAuth.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/OAuth.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/OAuth.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Places.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Places.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Places.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Places.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Reports.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Reports.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Reports.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Reports.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Search.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Search.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Search.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Search.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Statuses.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Statuses.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Statuses.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Statuses.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Tags.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Tags.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Tags.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Tags.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Timelines.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Timelines.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Timelines.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Timelines.swift diff --git a/MastodonKit/Sources/MastodonKit/Targets/Trends.swift b/PixelfedKit/Sources/PixelfedKit/Targets/Trends.swift similarity index 100% rename from MastodonKit/Sources/MastodonKit/Targets/Trends.swift rename to PixelfedKit/Sources/PixelfedKit/Targets/Trends.swift diff --git a/MastodonKit/Tests/MastodonKitTests/MastodonKitTests.swift b/PixelfedKit/Tests/PixelfedKitTests/PixelfedKitTests.swift similarity index 100% rename from MastodonKit/Tests/MastodonKitTests/MastodonKitTests.swift rename to PixelfedKit/Tests/PixelfedKitTests/PixelfedKitTests.swift diff --git a/Vernissage.xcodeproj/project.pbxproj b/Vernissage.xcodeproj/project.pbxproj index 15e7b42..2911fad 100644 --- a/Vernissage.xcodeproj/project.pbxproj +++ b/Vernissage.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ F8341F90295C636C009C8EE6 /* Data+Exif.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8341F8F295C636C009C8EE6 /* Data+Exif.swift */; }; F83901A6295D8EC000456AE2 /* LabelIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = F83901A5295D8EC000456AE2 /* LabelIcon.swift */; }; F83CBEFB298298A1002972C8 /* ImageCarouselPicture.swift in Sources */ = {isa = PBXBuildFile; fileRef = F83CBEFA298298A1002972C8 /* ImageCarouselPicture.swift */; }; + F83E00ED29A2237C005D25A3 /* PixelfedKit in Frameworks */ = {isa = PBXBuildFile; productRef = F83E00EC29A2237C005D25A3 /* PixelfedKit */; }; F857F9FD297D8ED3002C109C /* ActionMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = F857F9FC297D8ED3002C109C /* ActionMenu.swift */; }; F85D4971296402DC00751DF7 /* AuthorizationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85D4970296402DC00751DF7 /* AuthorizationService.swift */; }; F85D4973296406E700751DF7 /* BottomRight.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85D4972296406E700751DF7 /* BottomRight.swift */; }; @@ -107,7 +108,6 @@ F898DE702972868A004B4A6A /* String+Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = F898DE6F2972868A004B4A6A /* String+Empty.swift */; }; F898DE7229728CB2004B4A6A /* CommentModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F898DE7129728CB2004B4A6A /* CommentModel.swift */; }; F8996DEB2971D29D0043EEC6 /* View+Transition.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8996DEA2971D29D0043EEC6 /* View+Transition.swift */; }; - F89992C7296D3DF8005994BF /* MastodonKit in Frameworks */ = {isa = PBXBuildFile; productRef = F89992C6296D3DF8005994BF /* MastodonKit */; }; F89992C9296D6DC7005994BF /* CommentBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89992C8296D6DC7005994BF /* CommentBody.swift */; }; F89992CC296D9231005994BF /* StatusModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89992CB296D9231005994BF /* StatusModel.swift */; }; F89992CE296D92E7005994BF /* AttachmentModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89992CD296D92E7005994BF /* AttachmentModel.swift */; }; @@ -167,6 +167,7 @@ F8210DE92966E4F9001D9973 /* AnimatePlaceholderModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatePlaceholderModifier.swift; sourceTree = ""; }; F829193B2983012400367CE2 /* ImageSizeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageSizeService.swift; sourceTree = ""; }; F8341F8F295C636C009C8EE6 /* Data+Exif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Exif.swift"; sourceTree = ""; }; + F837269429A221420098D3C4 /* PixelfedKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = PixelfedKit; sourceTree = ""; }; F83901A5295D8EC000456AE2 /* LabelIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelIcon.swift; sourceTree = ""; }; F83CBEFA298298A1002972C8 /* ImageCarouselPicture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCarouselPicture.swift; sourceTree = ""; }; F857F9FC297D8ED3002C109C /* ActionMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionMenu.swift; sourceTree = ""; }; @@ -193,7 +194,6 @@ F866F6A829604FFF002E8F88 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; F866F6A929605AFA002E8F88 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; F866F6AD29606367002E8F88 /* ApplicationViewMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationViewMode.swift; sourceTree = ""; }; - F86728AD296D3CE200475EC9 /* MastodonKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = MastodonKit; sourceTree = ""; }; F86A42FC299A8B8E00DF7645 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; F86A42FE299A8C5500DF7645 /* InAppPurchaseStoreKitConfiguration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = InAppPurchaseStoreKitConfiguration.storekit; sourceTree = ""; }; F86A4300299A97F500DF7645 /* ProductIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductIdentifiers.swift; sourceTree = ""; }; @@ -296,10 +296,10 @@ buildActionMask = 2147483647; files = ( F86A42FD299A8B8E00DF7645 /* StoreKit.framework in Frameworks */, - F89992C7296D3DF8005994BF /* MastodonKit in Frameworks */, F8210DD52966BB7E001D9973 /* Nuke in Frameworks */, F88E4D4D297EA4290057491A /* EmojiText in Frameworks */, F8210DD72966BB7E001D9973 /* NukeExtensions in Frameworks */, + F83E00ED29A2237C005D25A3 /* PixelfedKit in Frameworks */, F8210DD92966BB7E001D9973 /* NukeUI in Frameworks */, F85E132529741F05006A051D /* ActivityIndicatorView in Frameworks */, F8B1E64F2973F61400EE0D10 /* Drops in Frameworks */, @@ -481,7 +481,7 @@ F88C245F295C37B80006098B = { isa = PBXGroup; children = ( - F86728AD296D3CE200475EC9 /* MastodonKit */, + F837269429A221420098D3C4 /* PixelfedKit */, F88ABD9529687D4D004EF61E /* README.md */, F88C246A295C37B80006098B /* Vernissage */, F88C2469295C37B80006098B /* Products */, @@ -656,11 +656,11 @@ F8210DD42966BB7E001D9973 /* Nuke */, F8210DD62966BB7E001D9973 /* NukeExtensions */, F8210DD82966BB7E001D9973 /* NukeUI */, - F89992C6296D3DF8005994BF /* MastodonKit */, F8B1E64E2973F61400EE0D10 /* Drops */, F85E132429741F05006A051D /* ActivityIndicatorView */, F88E4D4C297EA4290057491A /* EmojiText */, F88E4D4F297EA5230057491A /* HTML2Markdown */, + F83E00EC29A2237C005D25A3 /* PixelfedKit */, ); productName = Vernissage; productReference = F88C2468295C37B80006098B /* Vernissage.app */; @@ -1128,6 +1128,10 @@ package = F8210DD32966BB7E001D9973 /* XCRemoteSwiftPackageReference "Nuke" */; productName = NukeUI; }; + F83E00EC29A2237C005D25A3 /* PixelfedKit */ = { + isa = XCSwiftPackageProductDependency; + productName = PixelfedKit; + }; F85E132429741F05006A051D /* ActivityIndicatorView */ = { isa = XCSwiftPackageProductDependency; package = F85E132329741F05006A051D /* XCRemoteSwiftPackageReference "ActivityIndicatorView" */; @@ -1143,10 +1147,6 @@ package = F88E4D4E297EA5230057491A /* XCRemoteSwiftPackageReference "HTML2Markdown" */; productName = HTML2Markdown; }; - F89992C6296D3DF8005994BF /* MastodonKit */ = { - isa = XCSwiftPackageProductDependency; - productName = MastodonKit; - }; F8B1E64E2973F61400EE0D10 /* Drops */ = { isa = XCSwiftPackageProductDependency; package = F8B1E64D2973F61400EE0D10 /* XCRemoteSwiftPackageReference "Drops" */; diff --git a/Vernissage/CoreData/AttachmentData+Attachment.swift b/Vernissage/CoreData/AttachmentData+Attachment.swift index 05064b4..38dad67 100644 --- a/Vernissage/CoreData/AttachmentData+Attachment.swift +++ b/Vernissage/CoreData/AttachmentData+Attachment.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit extension AttachmentData { func copyFrom(_ attachment: MediaAttachment) { diff --git a/Vernissage/CoreData/StatusData+Status.swift b/Vernissage/CoreData/StatusData+Status.swift index 9fa94b0..0d7838f 100644 --- a/Vernissage/CoreData/StatusData+Status.swift +++ b/Vernissage/CoreData/StatusData+Status.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit extension StatusData { func copyFrom(_ status: Status) { diff --git a/Vernissage/CoreData/StatusDataHandler.swift b/Vernissage/CoreData/StatusDataHandler.swift index adb3314..b9b23a6 100644 --- a/Vernissage/CoreData/StatusDataHandler.swift +++ b/Vernissage/CoreData/StatusDataHandler.swift @@ -6,7 +6,7 @@ import Foundation import CoreData -import MastodonKit +import PixelfedKit class StatusDataHandler { public static let shared = StatusDataHandler() diff --git a/Vernissage/EnvironmentObjects/ApplicationState.swift b/Vernissage/EnvironmentObjects/ApplicationState.swift index 78a06d3..47ff82e 100644 --- a/Vernissage/EnvironmentObjects/ApplicationState.swift +++ b/Vernissage/EnvironmentObjects/ApplicationState.swift @@ -6,7 +6,7 @@ import Foundation import SwiftUI -import MastodonKit +import PixelfedKit public class ApplicationState: ObservableObject { public static let shared = ApplicationState() diff --git a/Vernissage/EnvironmentObjects/Client+Account.swift b/Vernissage/EnvironmentObjects/Client+Account.swift index 9561195..03eaded 100644 --- a/Vernissage/EnvironmentObjects/Client+Account.swift +++ b/Vernissage/EnvironmentObjects/Client+Account.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Account'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Instance.swift b/Vernissage/EnvironmentObjects/Client+Instance.swift index 59e8226..2efbd19 100644 --- a/Vernissage/EnvironmentObjects/Client+Instance.swift +++ b/Vernissage/EnvironmentObjects/Client+Instance.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Search'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Media.swift b/Vernissage/EnvironmentObjects/Client+Media.swift index bc2567a..48086db 100644 --- a/Vernissage/EnvironmentObjects/Client+Media.swift +++ b/Vernissage/EnvironmentObjects/Client+Media.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Statuses'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Notifications.swift b/Vernissage/EnvironmentObjects/Client+Notifications.swift index 37875fc..14f8755 100644 --- a/Vernissage/EnvironmentObjects/Client+Notifications.swift +++ b/Vernissage/EnvironmentObjects/Client+Notifications.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Notifications'. extension Client { @@ -14,7 +14,7 @@ extension Client { sinceId: SinceId? = nil, minId: MinId? = nil, limit: Int? = nil - ) async throws -> Linkable<[MastodonKit.Notification]> { + ) async throws -> Linkable<[PixelfedKit.Notification]> { return try await mastodonClient.notifications(maxId: maxId, sinceId: sinceId, minId: minId, limit: limit) } } diff --git a/Vernissage/EnvironmentObjects/Client+Places.swift b/Vernissage/EnvironmentObjects/Client+Places.swift index 1e04914..c2c1b55 100644 --- a/Vernissage/EnvironmentObjects/Client+Places.swift +++ b/Vernissage/EnvironmentObjects/Client+Places.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Places'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Search.swift b/Vernissage/EnvironmentObjects/Client+Search.swift index 5bba459..974df23 100644 --- a/Vernissage/EnvironmentObjects/Client+Search.swift +++ b/Vernissage/EnvironmentObjects/Client+Search.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Search'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Statuses.swift b/Vernissage/EnvironmentObjects/Client+Statuses.swift index 748add9..5211c16 100644 --- a/Vernissage/EnvironmentObjects/Client+Statuses.swift +++ b/Vernissage/EnvironmentObjects/Client+Statuses.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Statuses'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Tags.swift b/Vernissage/EnvironmentObjects/Client+Tags.swift index 4cc2eca..6e740c1 100644 --- a/Vernissage/EnvironmentObjects/Client+Tags.swift +++ b/Vernissage/EnvironmentObjects/Client+Tags.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Tags'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Timeline.swift b/Vernissage/EnvironmentObjects/Client+Timeline.swift index 0f02b05..62e74d4 100644 --- a/Vernissage/EnvironmentObjects/Client+Timeline.swift +++ b/Vernissage/EnvironmentObjects/Client+Timeline.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Timeline'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client+Trends.swift b/Vernissage/EnvironmentObjects/Client+Trends.swift index 67ab1ff..69c7ad2 100644 --- a/Vernissage/EnvironmentObjects/Client+Trends.swift +++ b/Vernissage/EnvironmentObjects/Client+Trends.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit /// Mastodon 'Trends'. extension Client { diff --git a/Vernissage/EnvironmentObjects/Client.swift b/Vernissage/EnvironmentObjects/Client.swift index 18675ce..4d247f9 100644 --- a/Vernissage/EnvironmentObjects/Client.swift +++ b/Vernissage/EnvironmentObjects/Client.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit public class Client: ObservableObject { public static let shared = Client() diff --git a/Vernissage/Extensions/Status+MediaAttachmentType.swift b/Vernissage/Extensions/Status+MediaAttachmentType.swift index fad0a30..0ae6396 100644 --- a/Vernissage/Extensions/Status+MediaAttachmentType.swift +++ b/Vernissage/Extensions/Status+MediaAttachmentType.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit extension [Status] { func getStatusesWithImagesOnly() -> [Status] { diff --git a/Vernissage/Models/AttachmentModel.swift b/Vernissage/Models/AttachmentModel.swift index fda32ac..6cd1052 100644 --- a/Vernissage/Models/AttachmentModel.swift +++ b/Vernissage/Models/AttachmentModel.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit public class AttachmentModel: ObservableObject { public let id: String diff --git a/Vernissage/Models/PhotoAttachment.swift b/Vernissage/Models/PhotoAttachment.swift index 79df879..9e0618c 100644 --- a/Vernissage/Models/PhotoAttachment.swift +++ b/Vernissage/Models/PhotoAttachment.swift @@ -7,7 +7,7 @@ import Foundation import PhotosUI import SwiftUI -import MastodonKit +import PixelfedKit public class PhotoAttachment: ObservableObject, Identifiable, Equatable, Hashable { public let id: String diff --git a/Vernissage/Models/StatusModel.swift b/Vernissage/Models/StatusModel.swift index 1001e39..dfe4b23 100644 --- a/Vernissage/Models/StatusModel.swift +++ b/Vernissage/Models/StatusModel.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit public class StatusModel: ObservableObject { diff --git a/Vernissage/SceneDelegate.swift b/Vernissage/SceneDelegate.swift index 201e7c0..a2b22ab 100644 --- a/Vernissage/SceneDelegate.swift +++ b/Vernissage/SceneDelegate.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import OAuthSwift class SceneDelegate: NSObject, UISceneDelegate { diff --git a/Vernissage/Services/AuthorizationService.swift b/Vernissage/Services/AuthorizationService.swift index 591d90b..09d7a54 100644 --- a/Vernissage/Services/AuthorizationService.swift +++ b/Vernissage/Services/AuthorizationService.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit import AuthenticationServices /// Srvice responsible for login user into the Pixelfed account. diff --git a/Vernissage/Services/HomeTimelineService.swift b/Vernissage/Services/HomeTimelineService.swift index fede524..949ad93 100644 --- a/Vernissage/Services/HomeTimelineService.swift +++ b/Vernissage/Services/HomeTimelineService.swift @@ -6,7 +6,7 @@ import Foundation import CoreData -import MastodonKit +import PixelfedKit /// Service responsible for managing home timeline. public class HomeTimelineService { diff --git a/Vernissage/Services/RemoteFileService.swift b/Vernissage/Services/RemoteFileService.swift index 88e7ba9..e21c679 100644 --- a/Vernissage/Services/RemoteFileService.swift +++ b/Vernissage/Services/RemoteFileService.swift @@ -5,7 +5,7 @@ // import Foundation -import MastodonKit +import PixelfedKit import Nuke public class RemoteFileService { diff --git a/Vernissage/Services/RouterPath.swift b/Vernissage/Services/RouterPath.swift index 54be48c..8026663 100644 --- a/Vernissage/Services/RouterPath.swift +++ b/Vernissage/Services/RouterPath.swift @@ -6,7 +6,7 @@ import SwiftUI import Foundation -import MastodonKit +import PixelfedKit enum RouteurDestinations: Hashable { case tag(hashTag: String) diff --git a/Vernissage/Views/AccountsView.swift b/Vernissage/Views/AccountsView.swift index bdc2b2e..078b1dc 100644 --- a/Vernissage/Views/AccountsView.swift +++ b/Vernissage/Views/AccountsView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import Foundation struct AccountsView: View { diff --git a/Vernissage/Views/ComposeView.swift b/Vernissage/Views/ComposeView.swift index a72d9ed..02ae60e 100644 --- a/Vernissage/Views/ComposeView.swift +++ b/Vernissage/Views/ComposeView.swift @@ -6,7 +6,7 @@ import SwiftUI import PhotosUI -import MastodonKit +import PixelfedKit struct ComposeView: View { @EnvironmentObject var applicationState: ApplicationState diff --git a/Vernissage/Views/MainView.swift b/Vernissage/Views/MainView.swift index 86abba5..3252d02 100644 --- a/Vernissage/Views/MainView.swift +++ b/Vernissage/Views/MainView.swift @@ -7,7 +7,7 @@ import SwiftUI import UIKit import CoreData -import MastodonKit +import PixelfedKit struct MainView: View { enum Sheet: String, Identifiable { diff --git a/Vernissage/Views/NotificationsView.swift b/Vernissage/Views/NotificationsView.swift index 6564a2e..58bed38 100644 --- a/Vernissage/Views/NotificationsView.swift +++ b/Vernissage/Views/NotificationsView.swift @@ -5,14 +5,14 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct NotificationsView: View { @EnvironmentObject var applicationState: ApplicationState @EnvironmentObject var client: Client @State var accountId: String - @State private var notifications: [MastodonKit.Notification] = [] + @State private var notifications: [PixelfedKit.Notification] = [] @State private var allItemsLoaded = false @State private var state: ViewState = .loading diff --git a/Vernissage/Views/PaginableStatusesView.swift b/Vernissage/Views/PaginableStatusesView.swift index 4a41336..4591e61 100644 --- a/Vernissage/Views/PaginableStatusesView.swift +++ b/Vernissage/Views/PaginableStatusesView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct PaginableStatusesView: View { public enum ListType: Hashable { diff --git a/Vernissage/Views/PlaceSelectorView.swift b/Vernissage/Views/PlaceSelectorView.swift index 42cf0b5..3f26cbb 100644 --- a/Vernissage/Views/PlaceSelectorView.swift +++ b/Vernissage/Views/PlaceSelectorView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct PlaceSelectorView: View { @EnvironmentObject var applicationState: ApplicationState diff --git a/Vernissage/Views/SignInView.swift b/Vernissage/Views/SignInView.swift index 3d1eb5b..f38e0e4 100644 --- a/Vernissage/Views/SignInView.swift +++ b/Vernissage/Views/SignInView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import AuthenticationServices struct SignInView: View { diff --git a/Vernissage/Views/StatusView.swift b/Vernissage/Views/StatusView.swift index b794782..d258eaf 100644 --- a/Vernissage/Views/StatusView.swift +++ b/Vernissage/Views/StatusView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import AVFoundation struct StatusView: View { diff --git a/Vernissage/Views/StatusesView.swift b/Vernissage/Views/StatusesView.swift index 2a844f9..529c98a 100644 --- a/Vernissage/Views/StatusesView.swift +++ b/Vernissage/Views/StatusesView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct StatusesView: View { public enum ListType: Hashable { diff --git a/Vernissage/Views/TrendStatusesView.swift b/Vernissage/Views/TrendStatusesView.swift index 92ba6f7..2ba7533 100644 --- a/Vernissage/Views/TrendStatusesView.swift +++ b/Vernissage/Views/TrendStatusesView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct TrendStatusesView: View { @EnvironmentObject private var applicationState: ApplicationState diff --git a/Vernissage/Views/UserProfileView.swift b/Vernissage/Views/UserProfileView.swift index c2bb1aa..80f17f7 100644 --- a/Vernissage/Views/UserProfileView.swift +++ b/Vernissage/Views/UserProfileView.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct UserProfileView: View { @EnvironmentObject private var applicationState: ApplicationState diff --git a/Vernissage/Widgets/FavouriteTouch.swift b/Vernissage/Widgets/FavouriteTouch.swift index f4ea8f8..ebfaf14 100644 --- a/Vernissage/Widgets/FavouriteTouch.swift +++ b/Vernissage/Widgets/FavouriteTouch.swift @@ -3,7 +3,6 @@ // Copyright © 2023 Marcin Czachurski and the repository contributors. // Licensed under the MIT License. // - import SwiftUI diff --git a/Vernissage/Widgets/ImageRowAsync.swift b/Vernissage/Widgets/ImageRowAsync.swift index 41bb312..3256eac 100644 --- a/Vernissage/Widgets/ImageRowAsync.swift +++ b/Vernissage/Widgets/ImageRowAsync.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import NukeUI struct ImageRowAsync: View { diff --git a/Vernissage/Widgets/ImagesCarousel.swift b/Vernissage/Widgets/ImagesCarousel.swift index 63b3328..c73a33a 100644 --- a/Vernissage/Widgets/ImagesCarousel.swift +++ b/Vernissage/Widgets/ImagesCarousel.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct ImagesCarousel: View { @State public var attachments: [AttachmentModel] diff --git a/Vernissage/Widgets/InteractionRow.swift b/Vernissage/Widgets/InteractionRow.swift index e490c6c..dbe44d0 100644 --- a/Vernissage/Widgets/InteractionRow.swift +++ b/Vernissage/Widgets/InteractionRow.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import Drops struct InteractionRow: View { diff --git a/Vernissage/Widgets/NotificationsView/NotificationRow.swift b/Vernissage/Widgets/NotificationsView/NotificationRow.swift index 031f3c3..1419de9 100644 --- a/Vernissage/Widgets/NotificationsView/NotificationRow.swift +++ b/Vernissage/Widgets/NotificationsView/NotificationRow.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import NukeUI struct NotificationRow: View { @@ -16,10 +16,10 @@ struct NotificationRow: View { @State private var image: SwiftUI.Image? private var attachment: MediaAttachment? - private var notification: MastodonKit.Notification + private var notification: PixelfedKit.Notification private let contentWidth = Int(UIScreen.main.bounds.width) - 150 - public init(notification: MastodonKit.Notification) { + public init(notification: PixelfedKit.Notification) { self.notification = notification self.attachment = notification.status?.getAllImageMediaAttachments().first diff --git a/Vernissage/Widgets/SettingsView/AvatarShapesSection.swift b/Vernissage/Widgets/SettingsView/AvatarShapesSection.swift index 29cb32f..2987ce9 100644 --- a/Vernissage/Widgets/SettingsView/AvatarShapesSection.swift +++ b/Vernissage/Widgets/SettingsView/AvatarShapesSection.swift @@ -4,7 +4,6 @@ // Licensed under the MIT License. // - import SwiftUI struct AvatarShapesSection: View { diff --git a/Vernissage/Widgets/SignInView/InstanceRow.swift b/Vernissage/Widgets/SignInView/InstanceRow.swift index c179ea2..4af2763 100644 --- a/Vernissage/Widgets/SignInView/InstanceRow.swift +++ b/Vernissage/Widgets/SignInView/InstanceRow.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit import NukeUI struct InstanceRow: View { diff --git a/Vernissage/Widgets/StatusView/CommentBody.swift b/Vernissage/Widgets/StatusView/CommentBody.swift index 331320a..0d6ef2d 100644 --- a/Vernissage/Widgets/StatusView/CommentBody.swift +++ b/Vernissage/Widgets/StatusView/CommentBody.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct CommentBody: View { @EnvironmentObject var applicationState: ApplicationState diff --git a/Vernissage/Widgets/StatusView/CommentsSection.swift b/Vernissage/Widgets/StatusView/CommentsSection.swift index 8f8bd37..f094768 100644 --- a/Vernissage/Widgets/StatusView/CommentsSection.swift +++ b/Vernissage/Widgets/StatusView/CommentsSection.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct CommentsSection: View { @Environment(\.colorScheme) var colorScheme diff --git a/Vernissage/Widgets/UserProfileView/UserProfileHeader.swift b/Vernissage/Widgets/UserProfileView/UserProfileHeader.swift index 749a656..9a434f4 100644 --- a/Vernissage/Widgets/UserProfileView/UserProfileHeader.swift +++ b/Vernissage/Widgets/UserProfileView/UserProfileHeader.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct UserProfileHeader: View { @EnvironmentObject private var applicationState: ApplicationState diff --git a/Vernissage/Widgets/UserProfileView/UserProfileStatuses.swift b/Vernissage/Widgets/UserProfileView/UserProfileStatuses.swift index b1fa101..cca14fb 100644 --- a/Vernissage/Widgets/UserProfileView/UserProfileStatuses.swift +++ b/Vernissage/Widgets/UserProfileView/UserProfileStatuses.swift @@ -5,7 +5,7 @@ // import SwiftUI -import MastodonKit +import PixelfedKit struct UserProfileStatuses: View { @EnvironmentObject private var applicationState: ApplicationState