fix: content offset fixed after toggle segmented control issue. resolve #151

Mastodon.xcodeproj/project.pbxproj

@@ -31,7 +31,7 @@
 		164F0EBC267D4FE400249499 /* BoopSound.caf in Resources */ = {isa = PBXBuildFile; fileRef = 164F0EBB267D4FE400249499 /* BoopSound.caf */; };
 		18BC7629F65E6DB12CB8416D /* Pods_Mastodon_MastodonUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C030226D3C73DCC23D67452 /* Pods_Mastodon_MastodonUITests.framework */; };
 		2D04F42525C255B9003F936F /* APIService+PublicTimeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D04F42425C255B9003F936F /* APIService+PublicTimeline.swift */; };
-		2D084B8D26258EA3003AA3AF /* NotificationViewModel+diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D084B8C26258EA3003AA3AF /* NotificationViewModel+diffable.swift */; };
+		2D084B8D26258EA3003AA3AF /* NotificationViewModel+Diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D084B8C26258EA3003AA3AF /* NotificationViewModel+Diffable.swift */; };
 		2D084B9326259545003AA3AF /* NotificationViewModel+LoadLatestState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D084B9226259545003AA3AF /* NotificationViewModel+LoadLatestState.swift */; };
 		2D0B7A1D261D839600B44727 /* SearchHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D0B7A1C261D839600B44727 /* SearchHistory.swift */; };
 		2D152A8C25C295CC009AA50C /* StatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D152A8B25C295CC009AA50C /* StatusView.swift */; };
@@ -68,7 +68,7 @@
 		2D38F1FE25CD481700561493 /* StatusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D38F1FD25CD481700561493 /* StatusProvider.swift */; };
 		2D38F20825CD491300561493 /* DisposeBagCollectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D38F20725CD491300561493 /* DisposeBagCollectable.swift */; };
 		2D3F9E0425DFA133004262D9 /* UITapGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D3F9E0325DFA133004262D9 /* UITapGestureRecognizer.swift */; };
-		2D42FF6125C8177C004A627A /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 2D42FF6025C8177C004A627A /* SwiftPackageProductDependency */; };
+		2D42FF6125C8177C004A627A /* ActiveLabel in Frameworks */ = {isa = PBXBuildFile; productRef = 2D42FF6025C8177C004A627A /* ActiveLabel */; };
 		2D42FF6B25C817D2004A627A /* MastodonStatusContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D42FF6A25C817D2004A627A /* MastodonStatusContent.swift */; };
 		2D42FF7E25C82218004A627A /* ActionToolBarContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D42FF7D25C82218004A627A /* ActionToolBarContainer.swift */; };
 		2D42FF8525C8224F004A627A /* HitTestExpandedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D42FF8425C8224F004A627A /* HitTestExpandedButton.swift */; };
@@ -81,7 +81,7 @@
 		2D571B2F26004EC000540450 /* NavigationBarProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D571B2E26004EC000540450 /* NavigationBarProgressView.swift */; };
 		2D59819B25E4A581000FB903 /* MastodonConfirmEmailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D59819A25E4A581000FB903 /* MastodonConfirmEmailViewController.swift */; };
 		2D5981A125E4A593000FB903 /* MastodonConfirmEmailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5981A025E4A593000FB903 /* MastodonConfirmEmailViewModel.swift */; };
-		2D5981BA25E4D7F8000FB903 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 2D5981B925E4D7F8000FB903 /* SwiftPackageProductDependency */; };
+		2D5981BA25E4D7F8000FB903 /* ThirdPartyMailer in Frameworks */ = {isa = PBXBuildFile; productRef = 2D5981B925E4D7F8000FB903 /* ThirdPartyMailer */; };
 		2D5A3D0325CF8742002347D6 /* ControlContainableScrollViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5A3D0225CF8742002347D6 /* ControlContainableScrollViews.swift */; };
 		2D5A3D2825CF8BC9002347D6 /* HomeTimelineViewModel+Diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5A3D2725CF8BC9002347D6 /* HomeTimelineViewModel+Diffable.swift */; };
 		2D5A3D3825CF8D9F002347D6 /* ScrollViewContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5A3D3725CF8D9F002347D6 /* ScrollViewContainer.swift */; };
@@ -91,7 +91,7 @@
 		2D61254D262547C200299647 /* APIService+Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D61254C262547C200299647 /* APIService+Notification.swift */; };
 		2D61335825C188A000CAE157 /* APIService+Persist+Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D61335725C188A000CAE157 /* APIService+Persist+Status.swift */; };
 		2D61335E25C1894B00CAE157 /* APIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D61335D25C1894B00CAE157 /* APIService.swift */; };
-		2D61336925C18A4F00CAE157 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 2D61336825C18A4F00CAE157 /* SwiftPackageProductDependency */; };
+		2D61336925C18A4F00CAE157 /* AlamofireNetworkActivityIndicator in Frameworks */ = {isa = PBXBuildFile; productRef = 2D61336825C18A4F00CAE157 /* AlamofireNetworkActivityIndicator */; };
 		2D650FAB25ECDC9300851B58 /* Mastodon+Entity+Error+Detail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D650FAA25ECDC9300851B58 /* Mastodon+Entity+Error+Detail.swift */; };
 		2D694A7425F9EB4E0038ADDC /* ContentWarningOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D694A7325F9EB4E0038ADDC /* ContentWarningOverlayView.swift */; };
 		2D69CFF425CA9E2200C3A1B2 /* LoadMoreConfigurableTableViewContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D69CFF325CA9E2200C3A1B2 /* LoadMoreConfigurableTableViewContainer.swift */; };
@@ -117,7 +117,7 @@
 		2D927F0E25C7E9C9004F19B8 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0D25C7E9C9004F19B8 /* History.swift */; };
 		2D927F1425C7EDD9004F19B8 /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F1325C7EDD9004F19B8 /* Emoji.swift */; };
 		2D939AB525EDD8A90076FA61 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D939AB425EDD8A90076FA61 /* String.swift */; };
-		2D939AC825EE14620076FA61 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 2D939AC725EE14620076FA61 /* SwiftPackageProductDependency */; };
+		2D939AC825EE14620076FA61 /* CropViewController in Frameworks */ = {isa = PBXBuildFile; productRef = 2D939AC725EE14620076FA61 /* CropViewController */; };
 		2D939AE825EE1CF80076FA61 /* MastodonRegisterViewController+Avatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D939AE725EE1CF80076FA61 /* MastodonRegisterViewController+Avatar.swift */; };
 		2D9DB967263A76FB007C1D71 /* BlockDomainService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D9DB966263A76FB007C1D71 /* BlockDomainService.swift */; };
 		2D9DB969263A833E007C1D71 /* DomainBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D9DB968263A833E007C1D71 /* DomainBlock.swift */; };
@@ -165,7 +165,7 @@
 		5BB04FF5262F0E6D0043BFF6 /* ReportSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BB04FF4262F0E6D0043BFF6 /* ReportSection.swift */; };
 		5D0393902612D259007FE196 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D03938F2612D259007FE196 /* WebViewController.swift */; };
 		5D0393962612D266007FE196 /* WebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D0393952612D266007FE196 /* WebViewModel.swift */; };
-		5D526FE225BE9AC400460CB9 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 5D526FE125BE9AC400460CB9 /* SwiftPackageProductDependency */; };
+		5D526FE225BE9AC400460CB9 /* MastodonSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 5D526FE125BE9AC400460CB9 /* MastodonSDK */; };
 		5DA732CC2629CEF500A92342 /* UIView+Remove.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA732CB2629CEF500A92342 /* UIView+Remove.swift */; };
 		5DDDF1932617442700311060 /* Mastodon+Entity+Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DDDF1922617442700311060 /* Mastodon+Entity+Account.swift */; };
 		5DDDF1992617447F00311060 /* Mastodon+Entity+Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DDDF1982617447F00311060 /* Mastodon+Entity+Tag.swift */; };
@@ -181,8 +181,8 @@
 		5E44BF88AD33646E64727BCF /* Pods_MastodonTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD92E0F10BDE4FE7C4B999F2 /* Pods_MastodonTests.framework */; };
 		87FFDA5D898A5C42ADCB35E7 /* Pods_Mastodon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4ABE34829701A4496C5BB64 /* Pods_Mastodon.framework */; };
 		B914FC6B0B8AF18573C0B291 /* Pods_NotificationService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 374AA339A20E0FAC75BCDA6D /* Pods_NotificationService.framework */; };
-		DB00CA972632DDB600A54956 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB00CA962632DDB600A54956 /* SwiftPackageProductDependency */; };
+		DB00CA972632DDB600A54956 /* CommonOSLog in Frameworks */ = {isa = PBXBuildFile; productRef = DB00CA962632DDB600A54956 /* CommonOSLog */; };
-		DB0140BD25C40D7500F9F3CF /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB0140BC25C40D7500F9F3CF /* SwiftPackageProductDependency */; };
+		DB0140BD25C40D7500F9F3CF /* CommonOSLog in Frameworks */ = {isa = PBXBuildFile; productRef = DB0140BC25C40D7500F9F3CF /* CommonOSLog */; };
 		DB0140CF25C42AEE00F9F3CF /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB0140CE25C42AEE00F9F3CF /* OSLog.swift */; };
 		DB023295267F0AB800031745 /* ASMetaEditableTextNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB023294267F0AB800031745 /* ASMetaEditableTextNode.swift */; };
 		DB029E95266A20430062874E /* MastodonAuthenticationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB029E94266A20430062874E /* MastodonAuthenticationController.swift */; };
@@ -220,7 +220,7 @@
 		DB35FC1F2612F1D9006193C9 /* ProfileRelationshipActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB35FC1E2612F1D9006193C9 /* ProfileRelationshipActionButton.swift */; };
 		DB35FC252612FD7A006193C9 /* ProfileFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB35FC242612FD7A006193C9 /* ProfileFieldView.swift */; };
 		DB35FC2F26130172006193C9 /* MastodonField.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB35FC2E26130172006193C9 /* MastodonField.swift */; };
-		DB3D0FF325BAA61700EAA174 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB3D0FF225BAA61700EAA174 /* SwiftPackageProductDependency */; };
+		DB3D0FF325BAA61700EAA174 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = DB3D0FF225BAA61700EAA174 /* AlamofireImage */; };
 		DB3D100D25BAA75E00EAA174 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = DB3D100F25BAA75E00EAA174 /* Localizable.strings */; };
 		DB427DD625BAA00100D1B89D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB427DD525BAA00100D1B89D /* AppDelegate.swift */; };
 		DB427DD825BAA00100D1B89D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB427DD725BAA00100D1B89D /* SceneDelegate.swift */; };
@@ -261,7 +261,7 @@
 		DB49A63D25FF609300B98345 /* PlayerContainerView+MediaTypeIndicotorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB49A63C25FF609300B98345 /* PlayerContainerView+MediaTypeIndicotorView.swift */; };
 		DB5086A525CC0B7000C2C187 /* AvatarBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB5086A425CC0B7000C2C187 /* AvatarBarButtonItem.swift */; };
 		DB5086AB25CC0BBB00C2C187 /* AvatarConfigurableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB5086AA25CC0BBB00C2C187 /* AvatarConfigurableView.swift */; };
-		DB5086B825CC0D6400C2C187 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB5086B725CC0D6400C2C187 /* SwiftPackageProductDependency */; };
+		DB5086B825CC0D6400C2C187 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = DB5086B725CC0D6400C2C187 /* Kingfisher */; };
 		DB5086BE25CC0D9900C2C187 /* SplashPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB5086BD25CC0D9900C2C187 /* SplashPreference.swift */; };
 		DB51D172262832380062B7A1 /* BlurHashDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB51D170262832380062B7A1 /* BlurHashDecode.swift */; };
 		DB51D173262832380062B7A1 /* BlurHashEncode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB51D171262832380062B7A1 /* BlurHashEncode.swift */; };
@@ -297,7 +297,7 @@
 		DB6804C82637CE2F00430867 /* AppShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB68047F2637CD4C00430867 /* AppShared.framework */; };
 		DB6804D12637CE4700430867 /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6804D02637CE4700430867 /* UserDefaults.swift */; };
 		DB6804FD2637CFEC00430867 /* AppSecret.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6804FC2637CFEC00430867 /* AppSecret.swift */; };
-		DB6805102637D0F800430867 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB68050F2637D0F800430867 /* SwiftPackageProductDependency */; };
+		DB6805102637D0F800430867 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = DB68050F2637D0F800430867 /* KeychainAccess */; };
 		DB6805262637D7DD00430867 /* AppShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB68047F2637CD4C00430867 /* AppShared.framework */; };
 		DB68586425E619B700F0A850 /* NSKeyValueObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB68586325E619B700F0A850 /* NSKeyValueObservation.swift */; };
 		DB68A04A25E9027700CFDF14 /* AdaptiveStatusBarStyleNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB68A04925E9027700CFDF14 /* AdaptiveStatusBarStyleNavigationController.swift */; };
@@ -310,7 +310,7 @@
 		DB6D1B3D2636857500ACB481 /* AppearancePreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D1B3C2636857500ACB481 /* AppearancePreference.swift */; };
 		DB6D1B44263691CF00ACB481 /* Mastodon+API+Subscriptions+Policy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D1B43263691CF00ACB481 /* Mastodon+API+Subscriptions+Policy.swift */; };
 		DB6D9F3526351B7A008423CD /* NotificationService+Decrypt.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D9F3426351B7A008423CD /* NotificationService+Decrypt.swift */; };
-		DB6D9F42263527CE008423CD /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB6D9F41263527CE008423CD /* SwiftPackageProductDependency */; };
+		DB6D9F42263527CE008423CD /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = DB6D9F41263527CE008423CD /* AlamofireImage */; };
 		DB6D9F4926353FD7008423CD /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D9F4826353FD6008423CD /* Subscription.swift */; };
 		DB6D9F502635761F008423CD /* SubscriptionAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D9F4F2635761F008423CD /* SubscriptionAlerts.swift */; };
 		DB6D9F57263577D2008423CD /* APIService+CoreData+Setting.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D9F56263577D2008423CD /* APIService+CoreData+Setting.swift */; };
@@ -321,8 +321,8 @@
 		DB6D9F8426358EEC008423CD /* SettingsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D9F8326358EEC008423CD /* SettingsItem.swift */; };
 		DB6D9F9726367249008423CD /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6D9F9626367249008423CD /* SettingsViewController.swift */; };
 		DB6F5E2F264E5518009108F4 /* MastodonRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6F5E2E264E5518009108F4 /* MastodonRegex.swift */; };
-		DB6F5E32264E7410009108F4 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB6F5E31264E7410009108F4 /* SwiftPackageProductDependency */; };
+		DB6F5E32264E7410009108F4 /* TwitterTextEditor in Frameworks */ = {isa = PBXBuildFile; productRef = DB6F5E31264E7410009108F4 /* TwitterTextEditor */; };
-		DB6F5E33264E7410009108F4 /* BuildFile in Embed Frameworks */ = {isa = PBXBuildFile; productRef = DB6F5E31264E7410009108F4 /* SwiftPackageProductDependency */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		DB6F5E33264E7410009108F4 /* TwitterTextEditor in Embed Frameworks */ = {isa = PBXBuildFile; productRef = DB6F5E31264E7410009108F4 /* TwitterTextEditor */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		DB6F5E35264E78E7009108F4 /* AutoCompleteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6F5E34264E78E7009108F4 /* AutoCompleteViewController.swift */; };
 		DB6F5E38264E994A009108F4 /* AutoCompleteTopChevronView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB6F5E37264E994A009108F4 /* AutoCompleteTopChevronView.swift */; };
 		DB71FD2C25F86A5100512AE1 /* AvatarStackContainerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB71FD2B25F86A5100512AE1 /* AvatarStackContainerButton.swift */; };
@@ -387,7 +387,7 @@
 		DB98339C25C96DE600AD9700 /* APIService+Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB98339B25C96DE600AD9700 /* APIService+Account.swift */; };
 		DB9A485C2603010E008B817C /* PHPickerResultLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9A485B2603010E008B817C /* PHPickerResultLoader.swift */; };
 		DB9A486C26032AC1008B817C /* AttachmentContainerView+EmptyStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9A486B26032AC1008B817C /* AttachmentContainerView+EmptyStateView.swift */; };
-		DB9A487E2603456B008B817C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DB9A487D2603456B008B817C /* SwiftPackageProductDependency */; };
+		DB9A487E2603456B008B817C /* UITextView+Placeholder in Frameworks */ = {isa = PBXBuildFile; productRef = DB9A487D2603456B008B817C /* UITextView+Placeholder */; };
 		DB9A488A26034D40008B817C /* ComposeViewModel+PublishState.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9A488926034D40008B817C /* ComposeViewModel+PublishState.swift */; };
 		DB9A489026035963008B817C /* APIService+Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9A488F26035963008B817C /* APIService+Media.swift */; };
 		DB9A48962603685D008B817C /* MastodonAttachmentService+UploadState.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB9A48952603685D008B817C /* MastodonAttachmentService+UploadState.swift */; };
@@ -412,7 +412,7 @@
 		DBA9443E265CFA6400C537E1 /* ProfileFieldCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBA9443D265CFA6400C537E1 /* ProfileFieldCollectionViewCell.swift */; };
 		DBA94440265D137600C537E1 /* Mastodon+Entity+Field.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBA9443F265D137600C537E1 /* Mastodon+Entity+Field.swift */; };
 		DBABE3EC25ECAC4B00879EE5 /* WelcomeIllustrationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBABE3EB25ECAC4B00879EE5 /* WelcomeIllustrationView.swift */; };
-		DBAC6483267D0B21007FE9FD /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DBAC6482267D0B21007FE9FD /* SwiftPackageProductDependency */; };
+		DBAC6483267D0B21007FE9FD /* DifferenceKit in Frameworks */ = {isa = PBXBuildFile; productRef = DBAC6482267D0B21007FE9FD /* DifferenceKit */; };
 		DBAC6485267D0F9E007FE9FD /* StatusNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAC6484267D0F9E007FE9FD /* StatusNode.swift */; };
 		DBAC6488267D388B007FE9FD /* ASTableNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAC6487267D388B007FE9FD /* ASTableNode.swift */; };
 		DBAC648A267DC355007FE9FD /* NSDiffableDataSourceSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAC6489267DC355007FE9FD /* NSDiffableDataSourceSnapshot.swift */; };
@@ -420,8 +420,8 @@
 		DBAC6497267DECCB007FE9FD /* TimelineMiddleLoaderNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAC6496267DECCB007FE9FD /* TimelineMiddleLoaderNode.swift */; };
 		DBAC6499267DF2C4007FE9FD /* TimelineBottomLoaderNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAC6498267DF2C4007FE9FD /* TimelineBottomLoaderNode.swift */; };
 		DBAC649B267DF8C8007FE9FD /* ActivityIndicatorNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAC649A267DF8C8007FE9FD /* ActivityIndicatorNode.swift */; };
-		DBAC649E267DFE43007FE9FD /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DBAC649D267DFE43007FE9FD /* SwiftPackageProductDependency */; };
+		DBAC649E267DFE43007FE9FD /* DiffableDataSources in Frameworks */ = {isa = PBXBuildFile; productRef = DBAC649D267DFE43007FE9FD /* DiffableDataSources */; };
-		DBAC64A1267E6D02007FE9FD /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DBAC64A0267E6D02007FE9FD /* SwiftPackageProductDependency */; };
+		DBAC64A1267E6D02007FE9FD /* Fuzi in Frameworks */ = {isa = PBXBuildFile; productRef = DBAC64A0267E6D02007FE9FD /* Fuzi */; };
 		DBAE3F682615DD60004B8251 /* UserProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAE3F672615DD60004B8251 /* UserProvider.swift */; };
 		DBAE3F822615DDA3004B8251 /* ProfileViewController+UserProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAE3F812615DDA3004B8251 /* ProfileViewController+UserProvider.swift */; };
 		DBAE3F882615DDF4004B8251 /* UserProviderFacade.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAE3F872615DDF4004B8251 /* UserProviderFacade.swift */; };
@@ -431,10 +431,10 @@
 		DBAE3FA92617106E004B8251 /* MastodonMetricFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAE3FA82617106E004B8251 /* MastodonMetricFormatter.swift */; };
 		DBAE3FAF26172FC0004B8251 /* RemoteProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAE3FAE26172FC0004B8251 /* RemoteProfileViewModel.swift */; };
 		DBAEDE5C267A058D00D25FF5 /* BlurhashImageCacheService.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAEDE5B267A058D00D25FF5 /* BlurhashImageCacheService.swift */; };
-		DBAEDE5F267A0B1500D25FF5 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DBAEDE5E267A0B1500D25FF5 /* SwiftPackageProductDependency */; };
+		DBAEDE5F267A0B1500D25FF5 /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = DBAEDE5E267A0B1500D25FF5 /* Nuke */; };
 		DBAEDE61267B342D00D25FF5 /* StatusContentCacheService.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAEDE60267B342D00D25FF5 /* StatusContentCacheService.swift */; };
 		DBAFB7352645463500371D5F /* Emojis.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBAFB7342645463500371D5F /* Emojis.swift */; };
-		DBB525082611EAC0002F1F29 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = DBB525072611EAC0002F1F29 /* SwiftPackageProductDependency */; };
+		DBB525082611EAC0002F1F29 /* Tabman in Frameworks */ = {isa = PBXBuildFile; productRef = DBB525072611EAC0002F1F29 /* Tabman */; };
 		DBB5250E2611EBAF002F1F29 /* ProfileSegmentedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBB5250D2611EBAF002F1F29 /* ProfileSegmentedViewController.swift */; };
 		DBB525212611EBD6002F1F29 /* ProfilePagingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBB525202611EBD6002F1F29 /* ProfilePagingViewController.swift */; };
 		DBB525302611EBF3002F1F29 /* ProfilePagingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBB5252F2611EBF3002F1F29 /* ProfilePagingViewModel.swift */; };
@@ -579,7 +579,7 @@
 			files = (
 				DB6804872637CD4C00430867 /* AppShared.framework in Embed Frameworks */,
 				DB89BA0425C10FD0008580ED /* CoreDataStack.framework in Embed Frameworks */,
-				DB6F5E33264E7410009108F4 /* BuildFile in Embed Frameworks */,
+				DB6F5E33264E7410009108F4 /* TwitterTextEditor in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -622,7 +622,7 @@
 		164F0EBB267D4FE400249499 /* BoopSound.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = BoopSound.caf; sourceTree = "<group>"; };
 		1D6D967E77A5357E2C6110D9 /* Pods-Mastodon.asdk - debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon.asdk - debug.xcconfig"; path = "Target Support Files/Pods-Mastodon/Pods-Mastodon.asdk - debug.xcconfig"; sourceTree = "<group>"; };
 		2D04F42425C255B9003F936F /* APIService+PublicTimeline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "APIService+PublicTimeline.swift"; sourceTree = "<group>"; };
-		2D084B8C26258EA3003AA3AF /* NotificationViewModel+diffable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NotificationViewModel+diffable.swift"; sourceTree = "<group>"; };
+		2D084B8C26258EA3003AA3AF /* NotificationViewModel+Diffable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NotificationViewModel+Diffable.swift"; sourceTree = "<group>"; };
 		2D084B9226259545003AA3AF /* NotificationViewModel+LoadLatestState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NotificationViewModel+LoadLatestState.swift"; sourceTree = "<group>"; };
 		2D0B7A1C261D839600B44727 /* SearchHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistory.swift; sourceTree = "<group>"; };
 		2D152A8B25C295CC009AA50C /* StatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusView.swift; sourceTree = "<group>"; };
@@ -1113,24 +1113,24 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DBAEDE5F267A0B1500D25FF5 /* BuildFile in Frameworks */,
+				DBAEDE5F267A0B1500D25FF5 /* Nuke in Frameworks */,
-				DB6F5E32264E7410009108F4 /* BuildFile in Frameworks */,
+				DB6F5E32264E7410009108F4 /* TwitterTextEditor in Frameworks */,
-				DB0140BD25C40D7500F9F3CF /* BuildFile in Frameworks */,
+				DB0140BD25C40D7500F9F3CF /* CommonOSLog in Frameworks */,
 				DB89BA0325C10FD0008580ED /* CoreDataStack.framework in Frameworks */,
-				2D42FF6125C8177C004A627A /* BuildFile in Frameworks */,
+				2D42FF6125C8177C004A627A /* ActiveLabel in Frameworks */,
-				DB9A487E2603456B008B817C /* BuildFile in Frameworks */,
+				DB9A487E2603456B008B817C /* UITextView+Placeholder in Frameworks */,
-				2D939AC825EE14620076FA61 /* BuildFile in Frameworks */,
+				2D939AC825EE14620076FA61 /* CropViewController in Frameworks */,
-				DBB525082611EAC0002F1F29 /* BuildFile in Frameworks */,
+				DBB525082611EAC0002F1F29 /* Tabman in Frameworks */,
-				5D526FE225BE9AC400460CB9 /* BuildFile in Frameworks */,
+				5D526FE225BE9AC400460CB9 /* MastodonSDK in Frameworks */,
 				DB6804862637CD4C00430867 /* AppShared.framework in Frameworks */,
-				DB5086B825CC0D6400C2C187 /* BuildFile in Frameworks */,
+				DB5086B825CC0D6400C2C187 /* Kingfisher in Frameworks */,
 				DBF96326262EC0A6001D8D25 /* AuthenticationServices.framework in Frameworks */,
-				DBAC6483267D0B21007FE9FD /* BuildFile in Frameworks */,
+				DBAC6483267D0B21007FE9FD /* DifferenceKit in Frameworks */,
-				2D61336925C18A4F00CAE157 /* BuildFile in Frameworks */,
+				2D61336925C18A4F00CAE157 /* AlamofireNetworkActivityIndicator in Frameworks */,
-				DBAC64A1267E6D02007FE9FD /* BuildFile in Frameworks */,
+				DBAC64A1267E6D02007FE9FD /* Fuzi in Frameworks */,
-				DB3D0FF325BAA61700EAA174 /* BuildFile in Frameworks */,
+				DB3D0FF325BAA61700EAA174 /* AlamofireImage in Frameworks */,
-				DBAC649E267DFE43007FE9FD /* BuildFile in Frameworks */,
+				DBAC649E267DFE43007FE9FD /* DiffableDataSources in Frameworks */,
-				2D5981BA25E4D7F8000FB903 /* BuildFile in Frameworks */,
+				2D5981BA25E4D7F8000FB903 /* ThirdPartyMailer in Frameworks */,
 				87FFDA5D898A5C42ADCB35E7 /* Pods_Mastodon.framework in Frameworks */,
 				DB6804C82637CE2F00430867 /* AppShared.framework in Frameworks */,
 			);
@@ -1157,7 +1157,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DB6805102637D0F800430867 /* BuildFile in Frameworks */,
+				DB6805102637D0F800430867 /* KeychainAccess in Frameworks */,
 				EE93E8E8F9E0C39EAAEBD92F /* Pods_AppShared.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1182,8 +1182,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DB00CA972632DDB600A54956 /* BuildFile in Frameworks */,
+				DB00CA972632DDB600A54956 /* CommonOSLog in Frameworks */,
-				DB6D9F42263527CE008423CD /* BuildFile in Frameworks */,
+				DB6D9F42263527CE008423CD /* AlamofireImage in Frameworks */,
 				DB6804A52637CDCC00430867 /* AppShared.framework in Frameworks */,
 				B914FC6B0B8AF18573C0B291 /* Pods_NotificationService.framework in Frameworks */,
 			);
@@ -2330,7 +2330,7 @@
 			children = (
 				DB9D6BF725E4F5690051B173 /* NotificationViewController.swift */,
 				2D607AD726242FC500B70763 /* NotificationViewModel.swift */,
-				2D084B8C26258EA3003AA3AF /* NotificationViewModel+diffable.swift */,
+				2D084B8C26258EA3003AA3AF /* NotificationViewModel+Diffable.swift */,
 				2D084B9226259545003AA3AF /* NotificationViewModel+LoadLatestState.swift */,
 				2D24E12C2626FD2E00A59D4F /* NotificationViewModel+LoadOldestState.swift */,
 				2D35237F26256F470031AF25 /* TableViewCell */,
@@ -2629,21 +2629,21 @@
 			);
 			name = Mastodon;
 			packageProductDependencies = (
-				DB3D0FF225BAA61700EAA174 /* SwiftPackageProductDependency */,
+				DB3D0FF225BAA61700EAA174 /* AlamofireImage */,
-				5D526FE125BE9AC400460CB9 /* SwiftPackageProductDependency */,
+				5D526FE125BE9AC400460CB9 /* MastodonSDK */,
-				2D61336825C18A4F00CAE157 /* SwiftPackageProductDependency */,
+				2D61336825C18A4F00CAE157 /* AlamofireNetworkActivityIndicator */,
-				2D42FF6025C8177C004A627A /* SwiftPackageProductDependency */,
+				2D42FF6025C8177C004A627A /* ActiveLabel */,
-				DB0140BC25C40D7500F9F3CF /* SwiftPackageProductDependency */,
+				DB0140BC25C40D7500F9F3CF /* CommonOSLog */,
-				DB5086B725CC0D6400C2C187 /* SwiftPackageProductDependency */,
+				DB5086B725CC0D6400C2C187 /* Kingfisher */,
-				2D5981B925E4D7F8000FB903 /* SwiftPackageProductDependency */,
+				2D5981B925E4D7F8000FB903 /* ThirdPartyMailer */,
-				2D939AC725EE14620076FA61 /* SwiftPackageProductDependency */,
+				2D939AC725EE14620076FA61 /* CropViewController */,
-				DB9A487D2603456B008B817C /* SwiftPackageProductDependency */,
+				DB9A487D2603456B008B817C /* UITextView+Placeholder */,
-				DBB525072611EAC0002F1F29 /* SwiftPackageProductDependency */,
+				DBB525072611EAC0002F1F29 /* Tabman */,
-				DB6F5E31264E7410009108F4 /* SwiftPackageProductDependency */,
+				DB6F5E31264E7410009108F4 /* TwitterTextEditor */,
-				DBAEDE5E267A0B1500D25FF5 /* SwiftPackageProductDependency */,
+				DBAEDE5E267A0B1500D25FF5 /* Nuke */,
-				DBAC6482267D0B21007FE9FD /* SwiftPackageProductDependency */,
+				DBAC6482267D0B21007FE9FD /* DifferenceKit */,
-				DBAC649D267DFE43007FE9FD /* SwiftPackageProductDependency */,
+				DBAC649D267DFE43007FE9FD /* DiffableDataSources */,
-				DBAC64A0267E6D02007FE9FD /* SwiftPackageProductDependency */,
+				DBAC64A0267E6D02007FE9FD /* Fuzi */,
 			);
 			productName = Mastodon;
 			productReference = DB427DD225BAA00100D1B89D /* Mastodon.app */;
@@ -2704,7 +2704,7 @@
 			);
 			name = AppShared;
 			packageProductDependencies = (
-				DB68050F2637D0F800430867 /* SwiftPackageProductDependency */,
+				DB68050F2637D0F800430867 /* KeychainAccess */,
 			);
 			productName = AppShared;
 			productReference = DB68047F2637CD4C00430867 /* AppShared.framework */;
@@ -2764,8 +2764,8 @@
 			);
 			name = NotificationService;
 			packageProductDependencies = (
-				DB00CA962632DDB600A54956 /* SwiftPackageProductDependency */,
+				DB00CA962632DDB600A54956 /* CommonOSLog */,
-				DB6D9F41263527CE008423CD /* SwiftPackageProductDependency */,
+				DB6D9F41263527CE008423CD /* AlamofireImage */,
 			);
 			productName = NotificationService;
 			productReference = DBF8AE13263293E400C9C23C /* NotificationService.appex */;
@@ -2820,21 +2820,21 @@
 			);
 			mainGroup = DB427DC925BAA00100D1B89D;
 			packageReferences = (
-				DB3D0FF125BAA61700EAA174 /* RemoteSwiftPackageReference */,
+				DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */,
-				2D61336725C18A4F00CAE157 /* RemoteSwiftPackageReference */,
+				2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */,
-				2D42FF5F25C8177C004A627A /* RemoteSwiftPackageReference */,
+				2D42FF5F25C8177C004A627A /* XCRemoteSwiftPackageReference "ActiveLabel" */,
-				DB0140BB25C40D7500F9F3CF /* RemoteSwiftPackageReference */,
+				DB0140BB25C40D7500F9F3CF /* XCRemoteSwiftPackageReference "CommonOSLog" */,
-				DB5086B625CC0D6400C2C187 /* RemoteSwiftPackageReference */,
+				DB5086B625CC0D6400C2C187 /* XCRemoteSwiftPackageReference "Kingfisher" */,
-				2D5981B825E4D7F8000FB903 /* RemoteSwiftPackageReference */,
+				2D5981B825E4D7F8000FB903 /* XCRemoteSwiftPackageReference "ThirdPartyMailer" */,
-				2D939AC625EE14620076FA61 /* RemoteSwiftPackageReference */,
+				2D939AC625EE14620076FA61 /* XCRemoteSwiftPackageReference "TOCropViewController" */,
-				DB9A487C2603456B008B817C /* RemoteSwiftPackageReference */,
+				DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */,
-				DBB525062611EAC0002F1F29 /* RemoteSwiftPackageReference */,
+				DBB525062611EAC0002F1F29 /* XCRemoteSwiftPackageReference "Tabman" */,
-				DB6804722637CC1200430867 /* RemoteSwiftPackageReference */,
+				DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
-				DB6F5E30264E7410009108F4 /* RemoteSwiftPackageReference */,
+				DB6F5E30264E7410009108F4 /* XCRemoteSwiftPackageReference "TwitterTextEditor" */,
-				DBAEDE5D267A0B1500D25FF5 /* RemoteSwiftPackageReference */,
+				DBAEDE5D267A0B1500D25FF5 /* XCRemoteSwiftPackageReference "Nuke" */,
-				DBAC6481267D0B21007FE9FD /* RemoteSwiftPackageReference */,
+				DBAC6481267D0B21007FE9FD /* XCRemoteSwiftPackageReference "DifferenceKit" */,
-				DBAC649C267DFE43007FE9FD /* RemoteSwiftPackageReference */,
+				DBAC649C267DFE43007FE9FD /* XCRemoteSwiftPackageReference "DiffableDataSources" */,
-				DBAC649F267E6D01007FE9FD /* RemoteSwiftPackageReference */,
+				DBAC649F267E6D01007FE9FD /* XCRemoteSwiftPackageReference "Fuzi" */,
 			);
 			productRefGroup = DB427DD325BAA00100D1B89D /* Products */;
 			projectDirPath = "";
@@ -3301,7 +3301,7 @@
 				DB789A1C25F9F76A0071ACA0 /* ComposeStatusContentCollectionViewCell.swift in Sources */,
 				DB1FD43625F26899004CFCFC /* MastodonPickServerViewModel+LoadIndexedServerState.swift in Sources */,
 				2D939AE825EE1CF80076FA61 /* MastodonRegisterViewController+Avatar.swift in Sources */,
-				2D084B8D26258EA3003AA3AF /* NotificationViewModel+diffable.swift in Sources */,
+				2D084B8D26258EA3003AA3AF /* NotificationViewModel+Diffable.swift in Sources */,
 				DB6D1B24263684C600ACB481 /* UserDefaults.swift in Sources */,
 				DB1D186C25EF5BA7003F1F23 /* PollTableView.swift in Sources */,
 				DBA94434265CBB5300C537E1 /* ProfileFieldSection.swift in Sources */,
@@ -4678,7 +4678,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		2D42FF5F25C8177C004A627A /* RemoteSwiftPackageReference */ = {
+		2D42FF5F25C8177C004A627A /* XCRemoteSwiftPackageReference "ActiveLabel" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/TwidereProject/ActiveLabel.swift";
 			requirement = {
@@ -4686,7 +4686,7 @@
 				version = 5.0.3;
 			};
 		};
-		2D5981B825E4D7F8000FB903 /* RemoteSwiftPackageReference */ = {
+		2D5981B825E4D7F8000FB903 /* XCRemoteSwiftPackageReference "ThirdPartyMailer" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/vtourraine/ThirdPartyMailer.git";
 			requirement = {
@@ -4694,7 +4694,7 @@
 				minimumVersion = 1.7.1;
 			};
 		};
-		2D61336725C18A4F00CAE157 /* RemoteSwiftPackageReference */ = {
+		2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Alamofire/AlamofireNetworkActivityIndicator";
 			requirement = {
@@ -4702,7 +4702,7 @@
 				minimumVersion = 3.1.0;
 			};
 		};
-		2D939AC625EE14620076FA61 /* RemoteSwiftPackageReference */ = {
+		2D939AC625EE14620076FA61 /* XCRemoteSwiftPackageReference "TOCropViewController" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/TimOliver/TOCropViewController.git";
 			requirement = {
@@ -4710,7 +4710,7 @@
 				minimumVersion = 2.6.0;
 			};
 		};
-		DB0140BB25C40D7500F9F3CF /* RemoteSwiftPackageReference */ = {
+		DB0140BB25C40D7500F9F3CF /* XCRemoteSwiftPackageReference "CommonOSLog" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/MainasuK/CommonOSLog";
 			requirement = {
@@ -4718,7 +4718,7 @@
 				minimumVersion = 0.1.1;
 			};
 		};
-		DB3D0FF125BAA61700EAA174 /* RemoteSwiftPackageReference */ = {
+		DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Alamofire/AlamofireImage.git";
 			requirement = {
@@ -4726,7 +4726,7 @@
 				minimumVersion = 4.1.0;
 			};
 		};
-		DB5086B625CC0D6400C2C187 /* RemoteSwiftPackageReference */ = {
+		DB5086B625CC0D6400C2C187 /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/onevcat/Kingfisher.git";
 			requirement = {
@@ -4734,7 +4734,7 @@
 				minimumVersion = 6.1.0;
 			};
 		};
-		DB6804722637CC1200430867 /* RemoteSwiftPackageReference */ = {
+		DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git";
 			requirement = {
@@ -4742,7 +4742,7 @@
 				minimumVersion = 4.2.2;
 			};
 		};
-		DB6F5E30264E7410009108F4 /* RemoteSwiftPackageReference */ = {
+		DB6F5E30264E7410009108F4 /* XCRemoteSwiftPackageReference "TwitterTextEditor" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/MainasuK/TwitterTextEditor.git";
 			requirement = {
@@ -4750,7 +4750,7 @@
 				kind = branch;
 			};
 		};
-		DB9A487C2603456B008B817C /* RemoteSwiftPackageReference */ = {
+		DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/MainasuK/UITextView-Placeholder";
 			requirement = {
@@ -4758,7 +4758,7 @@
 				minimumVersion = 1.4.1;
 			};
 		};
-		DBAC6481267D0B21007FE9FD /* RemoteSwiftPackageReference */ = {
+		DBAC6481267D0B21007FE9FD /* XCRemoteSwiftPackageReference "DifferenceKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/ra1028/DifferenceKit.git";
 			requirement = {
@@ -4766,7 +4766,7 @@
 				version = 1.2.0;
 			};
 		};
-		DBAC649C267DFE43007FE9FD /* RemoteSwiftPackageReference */ = {
+		DBAC649C267DFE43007FE9FD /* XCRemoteSwiftPackageReference "DiffableDataSources" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/MainasuK/DiffableDataSources.git";
 			requirement = {
@@ -4774,7 +4774,7 @@
 				kind = branch;
 			};
 		};
-		DBAC649F267E6D01007FE9FD /* RemoteSwiftPackageReference */ = {
+		DBAC649F267E6D01007FE9FD /* XCRemoteSwiftPackageReference "Fuzi" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/cezheng/Fuzi.git";
 			requirement = {
@@ -4782,7 +4782,7 @@
 				minimumVersion = 3.1.3;
 			};
 		};
-		DBAEDE5D267A0B1500D25FF5 /* RemoteSwiftPackageReference */ = {
+		DBAEDE5D267A0B1500D25FF5 /* XCRemoteSwiftPackageReference "Nuke" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/kean/Nuke.git";
 			requirement = {
@@ -4790,7 +4790,7 @@
 				minimumVersion = 10.3.0;
 			};
 		};
-		DBB525062611EAC0002F1F29 /* RemoteSwiftPackageReference */ = {
+		DBB525062611EAC0002F1F29 /* XCRemoteSwiftPackageReference "Tabman" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/uias/Tabman";
 			requirement = {
@@ -4801,93 +4801,93 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		2D42FF6025C8177C004A627A /* SwiftPackageProductDependency */ = {
+		2D42FF6025C8177C004A627A /* ActiveLabel */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 2D42FF5F25C8177C004A627A /* RemoteSwiftPackageReference */;
+			package = 2D42FF5F25C8177C004A627A /* XCRemoteSwiftPackageReference "ActiveLabel" */;
 			productName = ActiveLabel;
 		};
-		2D5981B925E4D7F8000FB903 /* SwiftPackageProductDependency */ = {
+		2D5981B925E4D7F8000FB903 /* ThirdPartyMailer */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 2D5981B825E4D7F8000FB903 /* RemoteSwiftPackageReference */;
+			package = 2D5981B825E4D7F8000FB903 /* XCRemoteSwiftPackageReference "ThirdPartyMailer" */;
 			productName = ThirdPartyMailer;
 		};
-		2D61336825C18A4F00CAE157 /* SwiftPackageProductDependency */ = {
+		2D61336825C18A4F00CAE157 /* AlamofireNetworkActivityIndicator */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 2D61336725C18A4F00CAE157 /* RemoteSwiftPackageReference */;
+			package = 2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */;
 			productName = AlamofireNetworkActivityIndicator;
 		};
-		2D939AC725EE14620076FA61 /* SwiftPackageProductDependency */ = {
+		2D939AC725EE14620076FA61 /* CropViewController */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 2D939AC625EE14620076FA61 /* RemoteSwiftPackageReference */;
+			package = 2D939AC625EE14620076FA61 /* XCRemoteSwiftPackageReference "TOCropViewController" */;
 			productName = CropViewController;
 		};
-		5D526FE125BE9AC400460CB9 /* SwiftPackageProductDependency */ = {
+		5D526FE125BE9AC400460CB9 /* MastodonSDK */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = MastodonSDK;
 		};
-		DB00CA962632DDB600A54956 /* SwiftPackageProductDependency */ = {
+		DB00CA962632DDB600A54956 /* CommonOSLog */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB0140BB25C40D7500F9F3CF /* RemoteSwiftPackageReference */;
+			package = DB0140BB25C40D7500F9F3CF /* XCRemoteSwiftPackageReference "CommonOSLog" */;
 			productName = CommonOSLog;
 		};
-		DB0140BC25C40D7500F9F3CF /* SwiftPackageProductDependency */ = {
+		DB0140BC25C40D7500F9F3CF /* CommonOSLog */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB0140BB25C40D7500F9F3CF /* RemoteSwiftPackageReference */;
+			package = DB0140BB25C40D7500F9F3CF /* XCRemoteSwiftPackageReference "CommonOSLog" */;
 			productName = CommonOSLog;
 		};
-		DB3D0FF225BAA61700EAA174 /* SwiftPackageProductDependency */ = {
+		DB3D0FF225BAA61700EAA174 /* AlamofireImage */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB3D0FF125BAA61700EAA174 /* RemoteSwiftPackageReference */;
+			package = DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
 			productName = AlamofireImage;
 		};
-		DB5086B725CC0D6400C2C187 /* SwiftPackageProductDependency */ = {
+		DB5086B725CC0D6400C2C187 /* Kingfisher */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB5086B625CC0D6400C2C187 /* RemoteSwiftPackageReference */;
+			package = DB5086B625CC0D6400C2C187 /* XCRemoteSwiftPackageReference "Kingfisher" */;
 			productName = Kingfisher;
 		};
-		DB68050F2637D0F800430867 /* SwiftPackageProductDependency */ = {
+		DB68050F2637D0F800430867 /* KeychainAccess */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB6804722637CC1200430867 /* RemoteSwiftPackageReference */;
+			package = DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */;
 			productName = KeychainAccess;
 		};
-		DB6D9F41263527CE008423CD /* SwiftPackageProductDependency */ = {
+		DB6D9F41263527CE008423CD /* AlamofireImage */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB3D0FF125BAA61700EAA174 /* RemoteSwiftPackageReference */;
+			package = DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
 			productName = AlamofireImage;
 		};
-		DB6F5E31264E7410009108F4 /* SwiftPackageProductDependency */ = {
+		DB6F5E31264E7410009108F4 /* TwitterTextEditor */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB6F5E30264E7410009108F4 /* RemoteSwiftPackageReference */;
+			package = DB6F5E30264E7410009108F4 /* XCRemoteSwiftPackageReference "TwitterTextEditor" */;
 			productName = TwitterTextEditor;
 		};
-		DB9A487D2603456B008B817C /* SwiftPackageProductDependency */ = {
+		DB9A487D2603456B008B817C /* UITextView+Placeholder */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DB9A487C2603456B008B817C /* RemoteSwiftPackageReference */;
+			package = DB9A487C2603456B008B817C /* XCRemoteSwiftPackageReference "UITextView-Placeholder" */;
 			productName = "UITextView+Placeholder";
 		};
-		DBAC6482267D0B21007FE9FD /* SwiftPackageProductDependency */ = {
+		DBAC6482267D0B21007FE9FD /* DifferenceKit */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DBAC6481267D0B21007FE9FD /* RemoteSwiftPackageReference */;
+			package = DBAC6481267D0B21007FE9FD /* XCRemoteSwiftPackageReference "DifferenceKit" */;
 			productName = DifferenceKit;
 		};
-		DBAC649D267DFE43007FE9FD /* SwiftPackageProductDependency */ = {
+		DBAC649D267DFE43007FE9FD /* DiffableDataSources */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DBAC649C267DFE43007FE9FD /* RemoteSwiftPackageReference */;
+			package = DBAC649C267DFE43007FE9FD /* XCRemoteSwiftPackageReference "DiffableDataSources" */;
 			productName = DiffableDataSources;
 		};
-		DBAC64A0267E6D02007FE9FD /* SwiftPackageProductDependency */ = {
+		DBAC64A0267E6D02007FE9FD /* Fuzi */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DBAC649F267E6D01007FE9FD /* RemoteSwiftPackageReference */;
+			package = DBAC649F267E6D01007FE9FD /* XCRemoteSwiftPackageReference "Fuzi" */;
 			productName = Fuzi;
 		};
-		DBAEDE5E267A0B1500D25FF5 /* SwiftPackageProductDependency */ = {
+		DBAEDE5E267A0B1500D25FF5 /* Nuke */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DBAEDE5D267A0B1500D25FF5 /* RemoteSwiftPackageReference */;
+			package = DBAEDE5D267A0B1500D25FF5 /* XCRemoteSwiftPackageReference "Nuke" */;
 			productName = Nuke;
 		};
-		DBB525072611EAC0002F1F29 /* SwiftPackageProductDependency */ = {
+		DBB525072611EAC0002F1F29 /* Tabman */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = DBB525062611EAC0002F1F29 /* RemoteSwiftPackageReference */;
+			package = DBB525062611EAC0002F1F29 /* XCRemoteSwiftPackageReference "Tabman" */;
 			productName = Tabman;
 		};
 /* End XCSwiftPackageProductDependency section */

Mastodon/Diffiable/Section/NotificationSection.swift

@@ -65,7 +65,7 @@ extension NotificationSection {
                     timestampUpdatePublisher
                         .sink { [weak cell] _ in
                             guard let cell = cell else { return }
-                            let timeText = createAt.slowedTimeAgoSinceNow
+                            let timeText = createAt.timeAgoSinceNow
                             cell.actionLabel.text = actionText + " · " + timeText
                         }
                         .store(in: &cell.disposeBag)
@@ -91,7 +91,7 @@ extension NotificationSection {
                     timestampUpdatePublisher
                         .sink { [weak cell] _ in
                             guard let cell = cell else { return }
-                            let timeText = createAt.slowedTimeAgoSinceNow
+                            let timeText = createAt.timeAgoSinceNow
                             cell.actionLabel.text = actionText + " · " + timeText
                         }
                         .store(in: &cell.disposeBag)

Mastodon/Scene/Notification/NotificationViewController.swift

@@ -87,6 +87,17 @@ extension NotificationViewController {
             }
             .store(in: &disposeBag)
 
+        viewModel.dataSourceDidUpdated
+            .receive(on: RunLoop.main)
+            .sink { [weak self] in
+                guard let self = self else { return }
+                self.viewModel.needsScrollToTopAfterDataSourceUpdate = false
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.33) {
+                    self.scrollToTop(animated: true)
+                }
+            }
+            .store(in: &disposeBag)
+        
         viewModel.selectedIndex
             .removeDuplicates()
             .receive(on: DispatchQueue.main)
@@ -97,6 +108,9 @@ extension NotificationViewController {
                 guard let domain = self.viewModel.activeMastodonAuthenticationBox.value?.domain, let userID = self.viewModel.activeMastodonAuthenticationBox.value?.userID else {
                     return
                 }
+
+                self.viewModel.needsScrollToTopAfterDataSourceUpdate = true
+
                 switch segment {
                 case .EveryThing:
                     self.viewModel.notificationPredicate.value = MastodonNotification.predicate(domain: domain, userID: userID)
@@ -282,6 +296,18 @@ extension NotificationViewController {
     }
 }
 
+// MARK: - ScrollViewContainer
+extension NotificationViewController: ScrollViewContainer {
+
+    var scrollView: UIScrollView { tableView }
+
+    func scrollToTop(animated: Bool) {
+        let indexPath = IndexPath(row: 0, section: 0)
+        guard viewModel.diffableDataSource?.itemIdentifier(for: indexPath) != nil else { return }
+        tableView.scrollToRow(at: indexPath, at: .top, animated: true)
+    }
+}
+
 extension NotificationViewController: LoadMoreConfigurableTableViewContainer {
     typealias BottomLoaderTableViewCell = TimelineBottomLoaderTableViewCell
     typealias LoadingState = NotificationViewModel.LoadOldestState.Loading

Mastodon/Scene/Notification/NotificationViewModel+Diffable.swift

@@ -1,5 +1,5 @@
 //
-//  NotificationViewModel+diffable.swift
+//  NotificationViewModel+Diffable.swift
 //  Mastodon
 //
 //  Created by sxiaojian on 2021/4/13.
@@ -95,55 +95,15 @@ extension NotificationViewModel: NSFetchedResultsControllerDelegate {
                 if !notifications.isEmpty, self.noMoreNotification.value == false {
                     newSnapshot.appendItems([.bottomLoader], toSection: .main)
                 }
-                guard let difference = self.calculateReloadSnapshotDifference(navigationBar: navigationBar, tableView: tableView, oldSnapshot: oldSnapshot, newSnapshot: newSnapshot) else {
-                    diffableDataSource.apply(newSnapshot, animatingDifferences: false)
-                    self.isFetchingLatestNotification.value = false
-                    tableView.reloadData()
-                    return
-                }
 
-                diffableDataSource.apply(newSnapshot, animatingDifferences: false) {
+                self.isFetchingLatestNotification.value = false
-                    tableView.scrollToRow(at: difference.targetIndexPath, at: .top, animated: false)
+
-                    tableView.contentOffset.y = tableView.contentOffset.y - difference.offset
+                diffableDataSource.apply(newSnapshot, animatingDifferences: false) { [weak self] in
-                    self.isFetchingLatestNotification.value = false
+                    guard let self = self else { return }
+                    self.dataSourceDidUpdated.send()
                 }
             }
         }
     }
 
-    private struct Difference<T> {
-        let item: T
-        let sourceIndexPath: IndexPath
-        let targetIndexPath: IndexPath
-        let offset: CGFloat
-    }
-    
-    private func calculateReloadSnapshotDifference<T: Hashable>(
-        navigationBar: UINavigationBar,
-        tableView: UITableView,
-        oldSnapshot: NSDiffableDataSourceSnapshot<NotificationSection, T>,
-        newSnapshot: NSDiffableDataSourceSnapshot<NotificationSection, T>
-    ) -> Difference<T>? {
-        guard oldSnapshot.numberOfItems != 0 else { return nil }
-        
-        // old snapshot not empty. set source index path to first item if not match
-        let sourceIndexPath = UIViewController.topVisibleTableViewCellIndexPath(in: tableView, navigationBar: navigationBar) ?? IndexPath(row: 0, section: 0)
-        
-        guard sourceIndexPath.row < oldSnapshot.itemIdentifiers(inSection: .main).count else { return nil }
-        
-        if oldSnapshot.itemIdentifiers.elementsEqual(newSnapshot.itemIdentifiers) {
-            return nil
-        }
-        let timelineItem = oldSnapshot.itemIdentifiers(inSection: .main)[sourceIndexPath.row]
-        guard let itemIndex = newSnapshot.itemIdentifiers(inSection: .main).firstIndex(of: timelineItem) else { return nil }
-        let targetIndexPath = IndexPath(row: itemIndex, section: 0)
-        
-        let offset = UIViewController.tableViewCellOriginOffsetToWindowTop(in: tableView, at: sourceIndexPath, navigationBar: navigationBar)
-        return Difference(
-            item: timelineItem,
-            sourceIndexPath: sourceIndexPath,
-            targetIndexPath: targetIndexPath,
-            offset: offset
-        )
-    }
 }

Mastodon/Scene/Notification/NotificationViewModel.swift

@@ -31,6 +31,8 @@ final class NotificationViewModel: NSObject {
     let notificationPredicate = CurrentValueSubject<NSPredicate?, Never>(nil)
     let cellFrameCache = NSCache<NSNumber, NSValue>()
     
+    var needsScrollToTopAfterDataSourceUpdate = false
+    let dataSourceDidUpdated = PassthroughSubject<Void, Never>()
     let isFetchingLatestNotification = CurrentValueSubject<Bool, Never>(false)
     
     // output