From d1441aee8c52645c508d1674db1bd78dd5c8e776 Mon Sep 17 00:00:00 2001
From: CMK <cirno.mainasuk@gmail.com>
Date: Thu, 10 Feb 2022 14:21:19 +0800
Subject: [PATCH] fix: text strip wrong color in the Dark Mode issue

---
 Mastodon.xcodeproj/project.pbxproj                          | 2 +-
 .../mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist | 6 +++---
 Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved  | 4 ++--
 .../Video/MediaPreviewVideoViewController.swift             | 1 -
 .../Scene/Share/View/Content/StatusView+Configuration.swift | 4 +---
 MastodonSDK/Package.swift                                   | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index 120de75af..b7ede3f24 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -5066,7 +5066,7 @@
 			repositoryURL = "https://github.com/TwidereProject/MetaTextKit.git";
 			requirement = {
 				kind = exactVersion;
-				version = 2.2.0;
+				version = 2.2.1;
 			};
 		};
 		DB0E2D2C26833FF600865C3C /* XCRemoteSwiftPackageReference "Nuke-FLAnimatedImage-Plugin" */ = {
diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
index f3ed5eb92..c27b4d95a 100644
--- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>AppShared.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>30</integer>
 		</dict>
 		<key>CoreDataStack.xcscheme_^#shared#^_</key>
 		<dict>
@@ -97,7 +97,7 @@
 		<key>MastodonIntent.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>31</integer>
 		</dict>
 		<key>MastodonIntents.xcscheme_^#shared#^_</key>
 		<dict>
@@ -117,7 +117,7 @@
 		<key>ShareActionExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>29</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6b20b0e1d..a10344881 100644
--- a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -87,8 +87,8 @@
         "repositoryURL": "https://github.com/TwidereProject/MetaTextKit.git",
         "state": {
           "branch": null,
-          "revision": "2e91906221ee154656a34513604c6d3349dced4c",
-          "version": "2.2.0"
+          "revision": "3ea336d3de7938dc112084c596a646e697b0feee",
+          "version": "2.2.1"
         }
       },
       {
diff --git a/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift b/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift
index 5d5dec84f..7bdbbfed2 100644
--- a/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift
+++ b/Mastodon/Scene/MediaPreview/Video/MediaPreviewVideoViewController.swift
@@ -19,7 +19,6 @@ final class MediaPreviewVideoViewController: UIViewController {
     var viewModel: MediaPreviewVideoViewModel!
     
     let playerViewController = AVPlayerViewController()
-//    var pictureInPictureController: AVPictureInPictureController?
     
     let previewImageView = UIImageView()
     
diff --git a/Mastodon/Scene/Share/View/Content/StatusView+Configuration.swift b/Mastodon/Scene/Share/View/Content/StatusView+Configuration.swift
index d3a39ccd6..6854ffc77 100644
--- a/Mastodon/Scene/Share/View/Content/StatusView+Configuration.swift
+++ b/Mastodon/Scene/Share/View/Content/StatusView+Configuration.swift
@@ -273,9 +273,7 @@ extension StatusView {
         viewModel.isMediaSensitive = status.sensitive && !status.attachments.isEmpty        // some servers set media sensitive even empty attachments
         
         let configurations = MediaView.configuration(status: status)
-        if viewModel.mediaViewConfigurations != configurations {
-            viewModel.mediaViewConfigurations = configurations
-        }
+        viewModel.mediaViewConfigurations = configurations
         
         status.publisher(for: \.isMediaSensitiveToggled)
             .assign(to: \.isMediaSensitiveToggled, on: viewModel)
diff --git a/MastodonSDK/Package.swift b/MastodonSDK/Package.swift
index 42c24c2b6..af27091fa 100644
--- a/MastodonSDK/Package.swift
+++ b/MastodonSDK/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-nio.git", from: "1.0.0"),
         .package(url: "https://github.com/kean/Nuke.git", from: "10.3.1"),
         .package(url: "https://github.com/Flipboard/FLAnimatedImage.git", from: "1.0.0"),
-        .package(url: "https://github.com/TwidereProject/MetaTextKit.git", .exact("2.2.0")),
+        .package(url: "https://github.com/TwidereProject/MetaTextKit.git", .exact("2.2.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(name: "NukeFLAnimatedImagePlugin", url: "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git", from: "8.0.0"),