Merge branch 'develop' into feature-compose-media

Mastodon.xcodeproj/project.pbxproj

@@ -1328,7 +1328,7 @@
 			path = Protocol;
 			sourceTree = "<group>";
 		};
-		2D76319C25C151DE00929FB9 /* Diffiable */ = {
+		2D76319C25C151DE00929FB9 /* Diffable */ = {
 			isa = PBXGroup;
 			children = (
 				DB4F097826A039B400D62E92 /* Onboarding */,
@@ -1343,7 +1343,7 @@
 				DB3E6FE52806A5BA00B035AE /* Discovery */,
 				DB0617FA27855B660030EE79 /* Settings */,
 			);
-			path = Diffiable;
+			path = Diffable;
 			sourceTree = "<group>";
 		};
 		2D7631A425C1532200929FB9 /* Share */ = {
@@ -1748,7 +1748,7 @@
 			children = (
 				DB89BA1025C10FF5008580ED /* Mastodon.entitlements */,
 				DB427DE325BAA00100D1B89D /* Info.plist */,
-				2D76319C25C151DE00929FB9 /* Diffiable */,
+				2D76319C25C151DE00929FB9 /* Diffable */,
 				DB8AF55525C1379F002E6C99 /* Scene */,
 				DB8AF54125C13647002E6C99 /* Coordinator */,
 				DB8AF56225C138BC002E6C99 /* Extension */,

Mastodon/Scene/Profile/Follower/FollowerListViewModel.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 import Combine
-import Combine
 import CoreData
 import CoreDataStack
 import GameplayKit

Mastodon/Scene/Report/ReportResult/ReportResultView.swift

@@ -8,7 +8,6 @@
 import UIKit
 import SwiftUI
 import MastodonSDK
-import MastodonUI
 import MastodonAsset
 import MastodonCore
 import MastodonUI

MastodonSDK/Package.swift

@@ -25,9 +25,9 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "ArkanaKeys", path: "../dependencies/ArkanaKeys"),
-        .package(name: "FaviconFinder", url: "https://github.com/will-lumley/FaviconFinder.git", from: "3.2.2"),
+        .package(url: "https://github.com/will-lumley/FaviconFinder.git", from: "3.2.2"),
-        .package(name: "Introspect", url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.3"),
+        .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.3"),
-        .package(name: "UITextView+Placeholder", url: "https://github.com/MainasuK/UITextView-Placeholder.git", from: "1.4.1"),
+        .package(url: "https://github.com/MainasuK/UITextView-Placeholder.git", from: "1.4.1"),
         .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.4.0"),
         .package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "4.1.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.0.3"),
@@ -113,8 +113,8 @@ let package = Package(
                 .product(name: "FLAnimatedImage", package: "FLAnimatedImage"),
                 .product(name: "FaviconFinder", package: "FaviconFinder"),
                 .product(name: "Nuke", package: "Nuke"),
-                .product(name: "Introspect", package: "Introspect"),
+                .product(name: "Introspect", package: "SwiftUI-Introspect"),
-                .product(name: "UITextView+Placeholder", package: "UITextView+Placeholder"),
+                .product(name: "UITextView+Placeholder", package: "UITextView-Placeholder"),
                 .product(name: "UIHostingConfigurationBackport", package: "UIHostingConfigurationBackport"),
                 .product(name: "TabBarPager", package: "TabBarPager"),
                 .product(name: "ThirdPartyMailer", package: "ThirdPartyMailer"),

Podfile

@@ -8,7 +8,6 @@ target 'Mastodon' do
   # Pods for Mastodon
 
   # UI
-  pod 'UITextField+Shake', '~> 1.2'
   pod 'XLPagerTabStrip', '~> 9.0.0'
 
   # misc

Podfile.lock

@@ -6,7 +6,6 @@ PODS:
     - Sourcery/CLI-Only (= 1.6.1)
   - Sourcery/CLI-Only (1.6.1)
   - SwiftGen (6.4.0)
-  - "UITextField+Shake (1.2.1)"
   - XLPagerTabStrip (9.0.0)
 
 DEPENDENCIES:
@@ -15,7 +14,6 @@ DEPENDENCIES:
   - Kanna (~> 5.2.2)
   - Sourcery (~> 1.6.1)
   - SwiftGen (~> 6.4.0)
-  - "UITextField+Shake (~> 1.2)"
   - XLPagerTabStrip (~> 9.0.0)
 
 SPEC REPOS:
@@ -25,7 +23,6 @@ SPEC REPOS:
     - Kanna
     - Sourcery
     - SwiftGen
-    - "UITextField+Shake"
     - XLPagerTabStrip
 
 SPEC CHECKSUMS:
@@ -34,9 +31,8 @@ SPEC CHECKSUMS:
   Kanna: 01cfbddc127f5ff0963692f285fcbc8a9d62d234
   Sourcery: f3759f803bd0739f74fc92a4341eed0473ce61ac
   SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
-  "UITextField+Shake": 298ac5a0f239d731bdab999b19b628c956ca0ac3
   XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5
 
-PODFILE CHECKSUM: 8b15fb6d4e801b7a7e7761a2e2fe40a89b1da4ff
+PODFILE CHECKSUM: a60ecee06525582c010e270ac7a17024e441a0da
 
 COCOAPODS: 1.11.3

README.md

@@ -1,4 +1,5 @@
 # Mastodon
+
 [![CI](https://github.com/mastodon/mastodon-ios/actions/workflows/main.yml/badge.svg)](https://github.com/mastodon/mastodon-ios/actions/workflows/main.yml) [![Crowdin](https://badges.crowdin.net/mastodon-for-ios/localized.svg)](https://crowdin.com/project/mastodon-for-ios)
 
 
@@ -11,12 +12,14 @@ This is the repository for the official iOS App for Mastodon. You can install it
 Read this blog post for this app to learn more. 
 > [Developing an official iOS app for Mastodon](https://blog.joinmastodon.org/2021/02/developing-an-official-ios-app-for-mastodon/)
 
-## Getting Start
+## Getting Started
+
 - Read the setup guide [here](./Documentation/Setup.md)
 - About [contributing](./Documentation/CONTRIBUTING.md)
 - [Documentation folder](./Documentation/)
 
 ## Acknowledgments
+
 Thanks to these open-sources projects listed [here](./Documentation/Acknowledgments.md).
 
 ## License

ShareActionExtension/Scene/ComposeViewController.swift

@@ -8,7 +8,6 @@
 import os.log
 import UIKit
 import Combine
-import MastodonUI
 import SwiftUI
 import MastodonAsset
 import MastodonLocalization

ShareActionExtension/Scene/ComposeViewModel.swift

@@ -11,7 +11,6 @@ import Combine
 import CoreData
 import CoreDataStack
 import MastodonSDK
-import MastodonUI
 import SwiftUI
 import UniformTypeIdentifiers
 import MastodonAsset

ShareActionExtension/Scene/View/ComposeToolbarView.swift

@@ -9,7 +9,6 @@ import os.log
 import UIKit
 import Combine
 import MastodonSDK
-import MastodonUI
 import MastodonAsset
 import MastodonLocalization
 import MastodonCore