Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert auto-formatter changes to file

This commit is contained in:
Jed Fox 2022-11-21 08:46:49 -05:00
parent 788bdb14f8
commit 228a9a1798
No known key found for this signature in database
GPG Key ID: 0B61D18EA54B47E1
2 changed files with 281 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
MastodonSDK/Package.resolved
View File

@ -1,241 +1,257 @@
{ {
"object": {
"pins" : [ "pins" : [
{ {
"package": "Alamofire", "identity" : "alamofire",
"repositoryURL": "https://github.com/Alamofire/Alamofire.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/Alamofire.git",
"state" : { "state" : {
"branch": null,
"revision" : "8dd85aee02e39dd280c75eef88ffdb86eed4b07b", "revision" : "8dd85aee02e39dd280c75eef88ffdb86eed4b07b",
"version" : "5.6.2" "version" : "5.6.2"
} }
}, },
{ {
"package": "AlamofireImage", "identity" : "alamofireimage",
"repositoryURL": "https://github.com/Alamofire/AlamofireImage.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/AlamofireImage.git",
"state" : { "state" : {
"branch": null,
"revision" : "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10", "revision" : "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10",
"version" : "4.2.0" "version" : "4.2.0"
} }
}, },
{ {
"package": "CommonOSLog", "identity" : "commonoslog",
"repositoryURL": "https://github.com/MainasuK/CommonOSLog", "kind" : "remoteSourceControl",
"location" : "https://github.com/MainasuK/CommonOSLog",
"state" : { "state" : {
"branch": null,
"revision" : "c121624a30698e9886efe38aebb36ff51c01b6c2", "revision" : "c121624a30698e9886efe38aebb36ff51c01b6c2",
"version" : "0.1.1" "version" : "0.1.1"
} }
}, },
{ {
"package": "FaviconFinder", "identity" : "faviconfinder",
"repositoryURL": "https://github.com/will-lumley/FaviconFinder.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/will-lumley/FaviconFinder.git",
"state" : { "state" : {
"branch": null,
"revision" : "1f74844f77f79b95c0bb0130b3a87d4f340e6d3a", "revision" : "1f74844f77f79b95c0bb0130b3a87d4f340e6d3a",
"version" : "3.3.0" "version" : "3.3.0"
} }
}, },
{ {
"package": "FLAnimatedImage", "identity" : "flanimatedimage",
"repositoryURL": "https://github.com/Flipboard/FLAnimatedImage.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/Flipboard/FLAnimatedImage.git",
"state" : { "state" : {
"branch": null,
"revision" : "d4f07b6f164d53c1212c3e54d6460738b1981e9f", "revision" : "d4f07b6f164d53c1212c3e54d6460738b1981e9f",
"version" : "1.0.17" "version" : "1.0.17"
} }
}, },
{ {
"package": "FPSIndicator", "identity" : "fpsindicator",
"repositoryURL": "https://github.com/MainasuK/FPSIndicator.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/MainasuK/FPSIndicator.git",
"state" : { "state" : {
"branch": null,
"revision" : "e4a5067ccd5293b024c767f09e51056afd4a4796", "revision" : "e4a5067ccd5293b024c767f09e51056afd4a4796",
"version" : "1.1.0" "version" : "1.1.0"
} }
}, },
{ {
"package": "Fuzi", "identity" : "fuzi",
"repositoryURL": "https://github.com/cezheng/Fuzi.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/cezheng/Fuzi.git",
"state" : { "state" : {
"branch": null,
"revision" : "f08c8323da21e985f3772610753bcfc652c2103f", "revision" : "f08c8323da21e985f3772610753bcfc652c2103f",
"version" : "3.1.3" "version" : "3.1.3"
} }
}, },
{ {
"package": "KeychainAccess", "identity" : "keychainaccess",
"repositoryURL": "https://github.com/kishikawakatsumi/KeychainAccess.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/kishikawakatsumi/KeychainAccess.git",
"state" : { "state" : {
"branch": null,
"revision" : "84e546727d66f1adc5439debad16270d0fdd04e7", "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7",
"version" : "4.2.2" "version" : "4.2.2"
} }
}, },
{ {
"package": "MetaTextKit", "identity" : "kingfisher",
"repositoryURL": "https://github.com/TwidereProject/MetaTextKit.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Kingfisher.git",
"state" : {
"revision" : "44e891bdb61426a95e31492a67c7c0dfad1f87c5",
"version" : "7.4.1"
}
},
{
"identity" : "metatextkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/TwidereProject/MetaTextKit.git",
"state" : { "state" : {
"branch": null,
"revision" : "dcd5255d6930c2fab408dc8562c577547e477624", "revision" : "dcd5255d6930c2fab408dc8562c577547e477624",
"version" : "2.2.5" "version" : "2.2.5"
} }
}, },
{ {
"package": "Nuke", "identity" : "nextlevelsessionexporter",
"repositoryURL": "https://github.com/kean/Nuke.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/NextLevel/NextLevelSessionExporter.git",
"state" : {
"revision" : "b6c0cce1aa37fe1547d694f958fac3c3524b74da",
"version" : "0.4.6"
}
},
{
"identity" : "nuke",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kean/Nuke.git",
"state" : { "state" : {
"branch": null,
"revision" : "a002b7fd786f2df2ed4333fe73a9727499fd9d97", "revision" : "a002b7fd786f2df2ed4333fe73a9727499fd9d97",
"version" : "10.11.2" "version" : "10.11.2"
} }
}, },
{ {
"package": "NukeFLAnimatedImagePlugin", "identity" : "nuke-flanimatedimage-plugin",
"repositoryURL": "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git",
"state" : { "state" : {
"branch": null,
"revision" : "b59c346a7d536336db3b0f12c72c6e53ee709e16", "revision" : "b59c346a7d536336db3b0f12c72c6e53ee709e16",
"version" : "8.0.0" "version" : "8.0.0"
} }
}, },
{ {
"package": "Pageboy", "identity" : "pageboy",
"repositoryURL": "https://github.com/uias/Pageboy", "kind" : "remoteSourceControl",
"location" : "https://github.com/uias/Pageboy",
"state" : { "state" : {
"branch": null,
"revision" : "af8fa81788b893205e1ff42ddd88c5b0b315d7c5", "revision" : "af8fa81788b893205e1ff42ddd88c5b0b315d7c5",
"version" : "3.7.0" "version" : "3.7.0"
} }
}, },
{ {
"package": "PanModal", "identity" : "panmodal",
"repositoryURL": "https://github.com/slackhq/PanModal.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/slackhq/PanModal.git",
"state" : { "state" : {
"branch": null,
"revision" : "b012aecb6b67a8e46369227f893c12544846613f", "revision" : "b012aecb6b67a8e46369227f893c12544846613f",
"version" : "1.2.7" "version" : "1.2.7"
} }
}, },
{ {
"package": "SDWebImage", "identity" : "sdwebimage",
"repositoryURL": "https://github.com/SDWebImage/SDWebImage.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/SDWebImage/SDWebImage.git",
"state" : { "state" : {
"branch": null,
"revision" : "9248fe561a2a153916fb9597e3af4434784c6d32", "revision" : "9248fe561a2a153916fb9597e3af4434784c6d32",
"version" : "5.13.4" "version" : "5.13.4"
} }
}, },
{ {
"package": "swift-collections", "identity" : "stripes",
"repositoryURL": "https://github.com/apple/swift-collections.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/eneko/Stripes.git",
"state" : {
"revision" : "d533fd44b8043a3abbf523e733599173d6f98c11",
"version" : "0.2.0"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"state" : { "state" : {
"branch": null,
"revision" : "f504716c27d2e5d4144fa4794b12129301d17729", "revision" : "f504716c27d2e5d4144fa4794b12129301d17729",
"version" : "1.0.3" "version" : "1.0.3"
} }
}, },
{ {
"package": "swift-nio", "identity" : "swift-nio",
"repositoryURL": "https://github.com/apple/swift-nio.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio.git",
"state" : { "state" : {
"branch": null,
"revision" : "546610d52b19be3e19935e0880bb06b9c03f5cef", "revision" : "546610d52b19be3e19935e0880bb06b9c03f5cef",
"version" : "1.14.4" "version" : "1.14.4"
} }
}, },
{ {
"package": "swift-nio-zlib-support", "identity" : "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-zlib-support.git",
"state" : { "state" : {
"branch": null,
"revision" : "37760e9a52030bb9011972c5213c3350fa9d41fd", "revision" : "37760e9a52030bb9011972c5213c3350fa9d41fd",
"version" : "1.0.0" "version" : "1.0.0"
} }
}, },
{ {
"package": "SwiftSoup", "identity" : "swiftsoup",
"repositoryURL": "https://github.com/scinfu/SwiftSoup.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/scinfu/SwiftSoup.git",
"state" : { "state" : {
"branch": null,
"revision" : "6778575285177365cbad3e5b8a72f2a20583cfec", "revision" : "6778575285177365cbad3e5b8a72f2a20583cfec",
"version" : "2.4.3" "version" : "2.4.3"
} }
}, },
{ {
"package": "Introspect", "identity" : "swiftui-introspect",
"repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/siteline/SwiftUI-Introspect.git",
"state" : { "state" : {
"branch": null,
"revision" : "f2616860a41f9d9932da412a8978fec79c06fe24", "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24",
"version" : "0.1.4" "version" : "0.1.4"
} }
}, },
{ {
"package": "SwiftyJSON", "identity" : "tabbarpager",
"repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/TwidereProject/TabBarPager.git",
"state" : { "state" : {
"branch": null,
"revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07",
"version": "5.0.1"
}
},
{
"package": "TabBarPager",
"repositoryURL": "https://github.com/TwidereProject/TabBarPager.git",
"state": {
"branch": null,
"revision" : "488aa66d157a648901b61721212c0dec23d27ee5", "revision" : "488aa66d157a648901b61721212c0dec23d27ee5",
"version" : "0.1.0" "version" : "0.1.0"
} }
}, },
{ {
"package": "Tabman", "identity" : "tabman",
"repositoryURL": "https://github.com/uias/Tabman", "kind" : "remoteSourceControl",
"location" : "https://github.com/uias/Tabman",
"state" : { "state" : {
"branch": null,
"revision" : "4a4f7c755b875ffd4f9ef10d67a67883669d2465", "revision" : "4a4f7c755b875ffd4f9ef10d67a67883669d2465",
"version" : "2.13.0" "version" : "2.13.0"
} }
}, },
{ {
"package": "ThirdPartyMailer", "identity" : "thirdpartymailer",
"repositoryURL": "https://github.com/vtourraine/ThirdPartyMailer.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/vtourraine/ThirdPartyMailer.git",
"state" : { "state" : {
"branch": null,
"revision" : "44c1cfaa6969963f22691aa67f88a69e3b6d651f", "revision" : "44c1cfaa6969963f22691aa67f88a69e3b6d651f",
"version" : "2.1.0" "version" : "2.1.0"
} }
}, },
{ {
"package": "TOCropViewController", "identity" : "tocropviewcontroller",
"repositoryURL": "https://github.com/TimOliver/TOCropViewController.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/TimOliver/TOCropViewController.git",
"state" : { "state" : {
"branch": null,
"revision" : "d0470491f56e734731bbf77991944c0dfdee3e0e", "revision" : "d0470491f56e734731bbf77991944c0dfdee3e0e",
"version" : "2.6.1" "version" : "2.6.1"
} }
}, },
{ {
"package": "UIHostingConfigurationBackport", "identity" : "uihostingconfigurationbackport",
"repositoryURL": "https://github.com/woxtu/UIHostingConfigurationBackport.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/woxtu/UIHostingConfigurationBackport.git",
"state" : { "state" : {
"branch": null,
"revision" : "6091f2d38faa4b24fc2ca0389c651e2f666624a3", "revision" : "6091f2d38faa4b24fc2ca0389c651e2f666624a3",
"version" : "0.1.0" "version" : "0.1.0"
} }
}, },
{ {
"package": "UITextView+Placeholder", "identity" : "uitextview-placeholder",
"repositoryURL": "https://github.com/MainasuK/UITextView-Placeholder.git", "kind" : "remoteSourceControl",
"location" : "https://github.com/MainasuK/UITextView-Placeholder.git",
"state" : { "state" : {
"branch": null,
"revision" : "20f513ded04a040cdf5467f0891849b1763ede3b", "revision" : "20f513ded04a040cdf5467f0891849b1763ede3b",
"version" : "1.4.1" "version" : "1.4.1"
} }
} }
] ],
}, "version" : 2
"version": 1
} }

25
MastodonSDK/Sources/MastodonUI/View/Content/NotificationView+ViewModel.swift
View File

@ -5,20 +5,20 @@
// Created by MainasuK on 2022-1-21. // Created by MainasuK on 2022-1-21.
// //
import Combine
import CoreData
import CoreDataStack
import MastodonAsset
import MastodonCore
import MastodonExtension
import MastodonLocalization
import MastodonSDK
import Meta
import os.log import os.log
import UIKit import UIKit
import Combine
import Meta
import MastodonSDK
import MastodonAsset
import MastodonLocalization
import MastodonExtension
import MastodonCore
import CoreData
import CoreDataStack
public extension NotificationView { extension NotificationView {
final class ViewModel: ObservableObject { public final class ViewModel: ObservableObject {
public var disposeBag = Set<AnyCancellable>() public var disposeBag = Set<AnyCancellable>()
public var objects = Set<NSManagedObject>() public var objects = Set<NSManagedObject>()
@ -137,7 +137,7 @@ extension NotificationView.ViewModel {
notificationView.accessibilityLabel = [ notificationView.accessibilityLabel = [
"\(name?.string ?? "") \(type?.string ?? "")", "\(name?.string ?? "") \(type?.string ?? "")",
username.map { "@\($0)" } ?? "", username.map { "@\($0)" } ?? "",
timestamp, timestamp
].joined(separator: ", ") ].joined(separator: ", ")
if !notificationView.statusView.isHidden { if !notificationView.statusView.isHidden {
notificationView.accessibilityLabel! += ", " + (notificationView.statusView.accessibilityLabel ?? "") notificationView.accessibilityLabel! += ", " + (notificationView.statusView.accessibilityLabel ?? "")
@ -280,4 +280,5 @@ extension NotificationView.ViewModel {
} }
.store(in: &disposeBag) .store(in: &disposeBag)
} }
} }