Open mergify[bot] opened 2 days ago
Cherry-pick of 242a1a44d3560c2c041c547757818582633bd80e has failed:
On branch mergify/bp/release/v133/pr-23037
Your branch is up to date with 'origin/release/v133'.
You are currently cherry-picking commit 242a1a44d.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
new file: firefox-ios/Client/Assets/easterEggGif.gif
modified: firefox-ios/Client/Extensions/UIImage+Extension.swift
modified: firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
modified: firefox-ios/Client/Frontend/Browser/TabScrollController.swift
new file: firefox-ios/Client/Frontend/Browser/WebView/PullRefreshView.swift
modified: firefox-ios/Client/Frontend/InternalSchemeHandler/AboutHomeHandler.swift
modified: firefox-ios/Client/Frontend/InternalSchemeHandler/ErrorPageHelper.swift
modified: firefox-ios/Client/Frontend/TabContentsScripts/UserScriptManager.swift
renamed: firefox-ios/Client/Frontend/UserContent/UserScripts/MainFrame/AtDocumentStart/NightModeHelper.js -> firefox-ios/Client/Frontend/UserContent/UserScripts/MainFrame/AtDocumentEnd/NightModeHelper.js
modified: firefox-ios/Client/TabManagement/Tab.swift
modified: firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Browser/TabScrollControllerTests.swift
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: firefox-ios/Client.xcodeproj/project.pbxproj
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Messages | |
---|---|
:book: | Project coverage: 32.7% |
:book: | Edited 10 files |
:book: | Created 2 files |
File | Coverage | |
---|---|---|
ErrorPageHelper.swift | 0.0% | ⚠️ |
BrowserViewController.swift | 4.67% | ⚠️ |
AboutHomeHandler.swift | 0.0% | ⚠️ |
UserScriptManager.swift | 98.9% | ✅ |
TabScrollController.swift | 64.34% | ✅ |
Tab.swift | 45.01% | ⚠️ |
UIImage+Extension.swift | 66.67% | ✅ |
PullRefreshView.swift | 50.15% | ✅ |
Generated by :no_entry_sign: Danger Swift against 1c8f05c216f73378970c7dabe9ce493dbf7e4bee
@FilippoZazzeroni this looks like a large change to take in a dot release? Any reason this should not ride the train with Fx134? cc: @afurlan-firefox
Hi @DonalMe the reason we are trying to merge it in the dot release is because we'd like to take advantage of the upcoming DMA in Europe, and going to Fx134 would be probably to late.
:scroll: Tickets
Pull refresh view
Jira ticket Github issue
:bulb: Description
Added new
PullRefreshView
in order to solve flaky old UI refresh control. Added a little easter gif when pulling the refresh view for more then 4 seconds. The easter egg spawn casually on 6 locations on the refresh view, and i landscape for iPhone just in bottom left and bottom right.iPhoneSE 1st gen (smallest device supported)
https://github.com/user-attachments/assets/959f8c35-fa8f-4657-bca5-4e535a9142e6
iPhone15
https://github.com/user-attachments/assets/9f8a07a2-e447-480b-927a-43559fa739df
iPad 13
https://github.com/user-attachments/assets/21b982f3-8a50-4900-b675-3afe0a829208
:pencil: Checklist
You have to check all boxes before merging
@Mergifyio backport release/v120
)This is an automatic backport of pull request #23037 done by Mergify.