From 356b5905fe250912784bf203163648e9e58a4651 Mon Sep 17 00:00:00 2001
From: CMK <cirno.mainasuk@gmail.com>
Date: Fri, 23 Jul 2021 20:13:44 +0800
Subject: [PATCH] fix: add missing emoji animation for status report scene

---
 Mastodon.xcodeproj/project.pbxproj            |  9 --------
 .../xcshareddata/swiftpm/Package.resolved     |  9 --------
 .../Compose/ComposeViewModel+DataSource.swift |  1 -
 .../Header/ProfileHeaderViewController.swift  |  1 -
 .../Scene/Report/ReportViewController.swift   | 21 ++++++++++++++-----
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index 7f446ce9..f1351b85 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -3198,7 +3198,6 @@
 				DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */,
 				DBB525062611EAC0002F1F29 /* XCRemoteSwiftPackageReference "Tabman" */,
 				DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
-				DB6F5E30264E7410009108F4 /* XCRemoteSwiftPackageReference "TwitterTextEditor" */,
 				DBAC6481267D0B21007FE9FD /* XCRemoteSwiftPackageReference "DifferenceKit" */,
 				DBAC649C267DFE43007FE9FD /* XCRemoteSwiftPackageReference "DiffableDataSources" */,
 				DBAC649F267E6D01007FE9FD /* XCRemoteSwiftPackageReference "Fuzi" */,
@@ -5348,14 +5347,6 @@
 				minimumVersion = 4.2.2;
 			};
 		};
-		DB6F5E30264E7410009108F4 /* XCRemoteSwiftPackageReference "TwitterTextEditor" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/MainasuK/TwitterTextEditor.git";
-			requirement = {
-				branch = "feature/expose-layout";
-				kind = branch;
-			};
-		};
 		DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/MainasuK/UITextView-Placeholder";
diff --git a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 56f675a6..dc848b69 100644
--- a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -190,15 +190,6 @@
           "version": "2.6.0"
         }
       },
-      {
-        "package": "TwitterTextEditor",
-        "repositoryURL": "https://github.com/MainasuK/TwitterTextEditor.git",
-        "state": {
-          "branch": "feature/expose-layout",
-          "revision": "c208329b23dcb3c8c7192de34776440d625a26a4",
-          "version": null
-        }
-      },
       {
         "package": "UITextView+Placeholder",
         "repositoryURL": "https://github.com/MainasuK/UITextView-Placeholder",
diff --git a/Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift b/Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift
index 79fe538d..49406144 100644
--- a/Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift
+++ b/Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift
@@ -9,7 +9,6 @@ import os.log
 import UIKit
 import Combine
 import CoreDataStack
-import TwitterTextEditor
 import MastodonSDK
 import MastodonMeta
 import MetaTextKit
diff --git a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
index f0bf72af..216c8168 100644
--- a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
+++ b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
@@ -11,7 +11,6 @@ import Combine
 import PhotosUI
 import AlamofireImage
 import CropViewController
-import TwitterTextEditor
 import MastodonMeta
 import MetaTextKit
 
diff --git a/Mastodon/Scene/Report/ReportViewController.swift b/Mastodon/Scene/Report/ReportViewController.swift
index ebe1788f..efaa533e 100644
--- a/Mastodon/Scene/Report/ReportViewController.swift
+++ b/Mastodon/Scene/Report/ReportViewController.swift
@@ -11,8 +11,8 @@ import CoreData
 import CoreDataStack
 import os.log
 import UIKit
-import TwitterTextEditor
 import MastodonSDK
+import MastodonMeta
 
 class ReportViewController: UIViewController, NeedsDependency {
     static let kAnimationDuration: TimeInterval = 0.33
@@ -92,6 +92,8 @@ class ReportViewController: UIViewController, NeedsDependency {
     }()
     
     var bottomConstraint: NSLayoutConstraint!
+
+    let titleView = DoubleTitleLabelNavigationBarTitleView()
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -267,10 +269,19 @@ class ReportViewController: UIViewController, NeedsDependency {
                 return nil
             }
         }()
-        
-        navigationItem.title = L10n.Scene.Report.title(
-            beReportedUser?.displayNameWithFallback ?? ""
-        )
+
+        navigationItem.titleView = titleView
+        if let user = beReportedUser {
+            do {
+                let mastodonConent = MastodonContent(content: user.displayNameWithFallback, emojis: user.emojiMeta)
+                let metaContent = try MastodonMetaContent.convert(document: mastodonConent)
+                titleView.update(titleMetaContent: metaContent, subtitle: nil)
+            } catch {
+                let metaContent = PlaintextMetaContent(string: user.displayNameWithFallback)
+                titleView.update(titleMetaContent: metaContent, subtitle: nil)
+            }
+        }
+
     }
     
     private func switchToStep2Content() {