Merge be01db62b7 into ae02dd2994

Fix CI badge (#1264 )
This PR fixes the CI badge in README. It seems that main.yml has been renamed to build-only.yml.
2024-04-24 14:03:20 +02:00 · 2024-04-24 10:42:20 +02:00 · 2024-04-23 09:39:33 +02:00 · 2024-04-21 20:43:04 +02:00 · 2024-03-29 19:37:32 +09:00
4 changed files with 15 additions and 7 deletions
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/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 = "";
--- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift
+++ b/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
--- a/Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift
+++ b/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
                }

--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Mastodon

-[![CI](https://github.com/mastodon/mastodon-ios/actions/workflows/main.yml/badge.svg)](https://github.com/mastodon/mastodon-ios/actions/workflows/main.yml) [![Crowdin](https://badges.crowdin.net/mastodon-for-ios/localized.svg)](https://crowdin.com/project/mastodon-for-ios)
+[![CI](https://github.com/mastodon/mastodon-ios/actions/workflows/build-only.yml/badge.svg)](https://github.com/mastodon/mastodon-ios/actions/workflows/build-only.yml) [![Crowdin](https://badges.crowdin.net/mastodon-for-ios/localized.svg)](https://crowdin.com/project/mastodon-for-ios)

 <a href="https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974?itsct=apps_box_badge&amp;itscg=30200" style="display: inline-block; overflow: hidden; border-top-left-radius: 13px; border-top-right-radius: 13px; border-bottom-right-radius: 13px; border-bottom-left-radius: 13px; width: 250px; height: 83px;"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-us?size=250x83&amp;releaseDate=1627603200&h=72b0c8495c2c0af1291efef280c4c2c1" alt="Download on the App Store" style="border-top-left-radius: 13px; border-top-right-radius: 13px; border-bottom-right-radius: 13px; border-bottom-left-radius: 13px; width: 250px; height: 83px;"></a>
Author	SHA1	Message	Date
Nathan Mattes	b68cc07909	Merge `be01db62b7` into `ae02dd2994`	2024-04-24 14:03:20 +02:00
Renaud Chaput	ae02dd2994	Fix CI badge (#1264 ) This PR fixes the CI badge in README. It seems that main.yml has been renamed to build-only.yml.	2024-04-24 10:42:20 +02:00
Nathan Mattes	cdced03c27	Fix 💊-Issues (#1278 ) * Remove pill after scrolling to top (#1275) * Don't show pill after switching timelines (#1275)	2024-04-23 09:39:33 +02:00
Nathan Mattes	235499ec10	Bump version	2024-04-21 20:43:04 +02:00
woxtu	6c9ce0de88	Fix CI badge	2024-03-29 19:37:32 +09:00