zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

fix: add missing emoji animation for status report scene

This commit is contained in:
CMK 2021-07-23 20:13:44 +08:00
parent d0263ffb61
commit 356b5905fe
5 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mastodon.xcodeproj/project.pbxproj
View File

@ -3198,7 +3198,6 @@
DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */, DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */,
DBB525062611EAC0002F1F29 /* XCRemoteSwiftPackageReference "Tabman" */, DBB525062611EAC0002F1F29 /* XCRemoteSwiftPackageReference "Tabman" */,
DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */, DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
DB6F5E30264E7410009108F4 /* XCRemoteSwiftPackageReference "TwitterTextEditor" */,
DBAC6481267D0B21007FE9FD /* XCRemoteSwiftPackageReference "DifferenceKit" */, DBAC6481267D0B21007FE9FD /* XCRemoteSwiftPackageReference "DifferenceKit" */,
DBAC649C267DFE43007FE9FD /* XCRemoteSwiftPackageReference "DiffableDataSources" */, DBAC649C267DFE43007FE9FD /* XCRemoteSwiftPackageReference "DiffableDataSources" */,
DBAC649F267E6D01007FE9FD /* XCRemoteSwiftPackageReference "Fuzi" */, DBAC649F267E6D01007FE9FD /* XCRemoteSwiftPackageReference "Fuzi" */,
@ -5348,14 +5347,6 @@
minimumVersion = 4.2.2; 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" */ = { DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */ = {
isa = XCRemoteSwiftPackageReference; isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/MainasuK/UITextView-Placeholder"; repositoryURL = "https://github.com/MainasuK/UITextView-Placeholder";

9
Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -190,15 +190,6 @@
"version": "2.6.0" "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", "package": "UITextView+Placeholder",
"repositoryURL": "https://github.com/MainasuK/UITextView-Placeholder", "repositoryURL": "https://github.com/MainasuK/UITextView-Placeholder",

1
Mastodon/Scene/Compose/ComposeViewModel+DataSource.swift
View File

@ -9,7 +9,6 @@ import os.log
import UIKit import UIKit
import Combine import Combine
import CoreDataStack import CoreDataStack
import TwitterTextEditor
import MastodonSDK import MastodonSDK
import MastodonMeta import MastodonMeta
import MetaTextKit import MetaTextKit

1
Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
View File

@ -11,7 +11,6 @@ import Combine
import PhotosUI import PhotosUI
import AlamofireImage import AlamofireImage
import CropViewController import CropViewController
import TwitterTextEditor
import MastodonMeta import MastodonMeta
import MetaTextKit import MetaTextKit

21
Mastodon/Scene/Report/ReportViewController.swift
View File

@ -11,8 +11,8 @@ import CoreData
import CoreDataStack import CoreDataStack
import os.log import os.log
import UIKit import UIKit
import TwitterTextEditor
import MastodonSDK import MastodonSDK
import MastodonMeta
class ReportViewController: UIViewController, NeedsDependency { class ReportViewController: UIViewController, NeedsDependency {
static let kAnimationDuration: TimeInterval = 0.33 static let kAnimationDuration: TimeInterval = 0.33
@ -92,6 +92,8 @@ class ReportViewController: UIViewController, NeedsDependency {
}() }()
var bottomConstraint: NSLayoutConstraint! var bottomConstraint: NSLayoutConstraint!
let titleView = DoubleTitleLabelNavigationBarTitleView()
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
@ -267,10 +269,19 @@ class ReportViewController: UIViewController, NeedsDependency {
return nil return nil
} }
}() }()
navigationItem.title = L10n.Scene.Report.title( navigationItem.titleView = titleView
beReportedUser?.displayNameWithFallback ?? "" 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() { private func switchToStep2Content() {