Merge be01db62b7 into cdced03c27

* Remove pill after scrolling to top (#1275)

* Don't show pill after switching timelines (#1275)

Mastodon.xcodeproj/project.pbxproj

@@ -4477,7 +4477,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2024.4;
+				MARKETING_VERSION = 2024.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4507,7 +4507,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2024.4;
+				MARKETING_VERSION = 2024.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4692,7 +4692,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2024.4;
+				MARKETING_VERSION = 2024.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4985,7 +4985,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2024.4;
+				MARKETING_VERSION = 2024.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift

@@ -590,7 +590,15 @@ extension HomeTimelineViewController {
             return true
         }
     }
-    
+
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        guard (scrollView.safeAreaInsets.top + scrollView.contentOffset.y) == 0 else {
+            return
+        }
+
+        hideTimelinePill()
+    }
+
     private func savePositionBeforeScrollToTop() {
         // check save action interval
         // should not fast than 0.5s to prevent save when scrollToTop on-flying

Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift

@@ -160,7 +160,7 @@ extension HomeTimelineViewModel.LoadLatestState {
                     FeedbackGenerator.shared.generate(.impact(.light))
                 }
 
-                if newStatuses.isNotEmpty {
+                if newStatuses.isNotEmpty && (previousState is HomeTimelineViewModel.LoadLatestState.ContextSwitch) == false {
                     viewModel.hasNewPosts.value = true
                 }