Skip to content

Commit

Permalink
Merge branch 'trunk' into fix/unnecessary-thumbnails
Browse files Browse the repository at this point in the history
  • Loading branch information
kean authored Nov 28, 2023
2 parents 1ea9d09 + 9f6925e commit 2693a99
Show file tree
Hide file tree
Showing 17 changed files with 280 additions and 148 deletions.
16 changes: 8 additions & 8 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ PODS:
- OHHTTPStubs/Swift (9.1.0):
- OHHTTPStubs/Default
- Reachability (3.2)
- Sentry (8.15.2):
- Sentry/Core (= 8.15.2)
- SentryPrivate (= 8.15.2)
- Sentry/Core (8.15.2):
- SentryPrivate (= 8.15.2)
- SentryPrivate (8.15.2)
- Sentry (8.16.1):
- Sentry/Core (= 8.16.1)
- SentryPrivate (= 8.16.1)
- Sentry/Core (8.16.1):
- SentryPrivate (= 8.16.1)
- SentryPrivate (8.16.1)
- Sodium (0.9.1)
- Starscream (3.0.6)
- SVProgressHUD (2.2.5)
Expand Down Expand Up @@ -203,8 +203,8 @@ SPEC CHECKSUMS:
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
OHHTTPStubs: 90eac6d8f2c18317baeca36698523dc67c513831
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
Sentry: 6f5742b4c47c17c9adcf265f6f328cf4a0ed1923
SentryPrivate: b2f7996f37781080f04a946eb4e377ff63c64195
Sentry: fcd7073d05654d9f0214d0226fca3d56d6530379
SentryPrivate: 1cf54bae8be81dee04672b4c14ad5de52efb909f
Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
Expand Down
6 changes: 3 additions & 3 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
23.9
----
-----
* [**] Add media fitlers to the Site Media screen [#22096]
* [*] The "aspect ratio" mode on the Site Media screen is now also available on iPhone via the new title menu [#22096]
* [**] Update the classic editor to use the new Photos and Site Media pickers [#22060]
* [**] [internal] Remove WPMediaPicker dependency [#22103]
* [*] [internal] Remove WPMediaPicker dependency from Tenor and Stock Photos pickers [#22066, #22074]
* [*] [internal] Remove MediaThumbnailService [#22106]
* [*] [internal] Rework Tenor (Free GIF) and Stock Photos (Free Photos) pickers [#22066, #22074]
* [*] [internal] Remove MediaThumbnailService and reduce the size of the large thumbnails, reducing disk usage [#22106]

23.8
-----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ final class GutenbergMediaPickerHelper: NSObject {
context.present(picker, animated: true)
}

func presentSiteMediaPickere(filter: WPMediaType, allowMultipleSelection: Bool, completion: @escaping GutenbergMediaPickerHelperCallback) {
func presentSiteMediaPicker(filter: WPMediaType, allowMultipleSelection: Bool, completion: @escaping GutenbergMediaPickerHelperCallback) {
didPickMediaCallback = completion
MediaPickerMenu(viewController: context, filter: .init(filter), isMultipleSelectionEnabled: allowMultipleSelection)
.showSiteMediaPicker(blog: post.blog, delegate: self)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
}

func gutenbergDidRequestMediaFromSiteMediaLibrary(filter: WPMediaType, allowMultipleSelection: Bool, with callback: @escaping MediaPickerDidPickMediaCallback) {
mediaPickerHelper.presentSiteMediaPickere(filter: filter, allowMultipleSelection: allowMultipleSelection) { [weak self] assets in
mediaPickerHelper.presentSiteMediaPicker(filter: filter, allowMultipleSelection: allowMultipleSelection) { [weak self] assets in
guard let self, let media = assets as? [Media] else {
callback(nil)
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,8 @@ private extension AppSettingsViewController {
let imageOptimization = SwitchRow(
title: NSLocalizedString("appSettings.media.imageOptimizationRow", value: "Optimize Images", comment: "Option to enable the optimization of images when uploading."),
value: imageOptimizationValue,
onChange: imageOptimizationChanged()
onChange: imageOptimizationChanged(),
accessibilityIdentifier: "imageOptimizationSwitch"
)

let imageSizingRow = ImageSizingRow(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ extension AbstractPostHelper {
}

private enum Strings {
static let swipeActionView = NSLocalizedString("postList.swipeActionView", value: "View", comment: "Swipe action title")
static let swipeActionShare = NSLocalizedString("postList.swipeActionShare", value: "Share", comment: "Swipe action title")
static let swipeActionTrash = NSLocalizedString("postList.swipeActionDelete", value: "Trash", comment: "Swipe action title")
static let swipeActionDeletePermanently = NSLocalizedString("postList.swipeActionDelete", value: "Delete", comment: "Swipe action title")
static let swipeActionView = NSLocalizedString("postList.swipeActionView", value: "View", comment: "Title for the 'View' post list row swipe action")
static let swipeActionShare = NSLocalizedString("postList.swipeActionShare", value: "Share", comment: "Title for the 'Share' post list row swipe action")
static let swipeActionTrash = NSLocalizedString("postList.swipeActionDelete", value: "Trash", comment: "Title for the 'Trash' post list row swipe action")
static let swipeActionDeletePermanently = NSLocalizedString("postList.swipeActionDeletePermanently", value: "Delete", comment: "Title for the 'Delete' post list row swipe action")
}
43 changes: 17 additions & 26 deletions WordPress/Jetpack/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
Buckle up, this update’s a doozy.
* [**] Add Optimize Images setting for image uploads and enable it by default [#21981]
* [*] Fix the media item details screen layout on iPad [#22042]
* [*] Improve the performance of loading thumbnails and original images in the Site Media screen [#22043]
* [*] Integrate native photos picker (`PHPickerViewController`) in Story Editor [#22059]
* [*] Fix an issue [#21959] where WordPress → Jetpack migration was not working for accounts with no sites. These users are now presented with a shortened migration flow. The "Uninstall WordPress" prompt will now also appear only as a card on the Dashboard. [#22064]
* [*] Add Select and Deselect button to previews in Site Media picker [#22078]
* [*] [internal] Fix an issue with scheduling of posts not working on iOS 17 with Xcode 15 [#22012]
* [*] [internal] Remove SDWebImage dependency from the app and improve cache cost calculation for GIFs [#21285]
* [*] Stats: Fix an issue where sites for clicked URLs do not open [#22061]
* [*] Improve pages list performance when there are hundreds of pages in the site [#22070]
* [*] Fix an issue with local thumbnails for GIFs inserted to Site Media not being animated [#22083]
* [*] [internal] Make Reader web views inspectable on iOS 16.4 and higher [#22077]
* [*] [internal] Add workarounds for large emoji on P2. [#22080]
* [*] Block Editor: Ensure text is always visible within Contact Info block [https://github.com/Automattic/jetpack/pull/33873]
* [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627]
* [*] Block Editor: In the deeply nested block warning, only display the ungroup option for blocks that support it [https://github.com/WordPress/gutenberg/pull/56445]
* [**] Refactor deleting media [#21748]

First off, we added the All Domains screen so you can manage all your domains in one place within the app. There’s no place like home.

Next, we made updates to Site Media.

- The Site Media screen design has better menus, file selection and sharing, and more. It even runs faster—no more jerky GIFs or stalled-out videos.
- You can use the pan gesture to select multiple media files at once. It’s also easier to swipe from one photo to another, change metadata, and delete items.
- On iPad, you can switch between square image previews and aspect ratio.
- We fixed issues with blank placeholder images, incorrect messages, document sharing, and occasional crashes.

We’re not done yet. We also made big changes to Posts & Pages.

- The Posts & Pages screen got a facelift with clean, simple display options.
- Use more advanced search features, like author and tag filters, to find the content you’d like to edit. Search also works across all authors (unless, of course, you want content from one specific person.)
- Use swipe actions to view, share, or delete posts and pages. Sweet.
- The context menu now lets you access comments, settings, and other actions for a post or page.
- We fixed issues with page refreshes and visibility, as well as a handful of crashes.

Finally, we fixed a handful of pesky problems across the app.

- The app now recognizes when you’ve finished uploading a GIF. (monty-burns-excellent.gif)
- “Hidden” posts now have a better description for their privacy status.
- The reader now scrolls to the top when you tap the status bar. Up, up, and away.
- The Menus screen properly creates menu items based on top-level pages.
- We fixed a block editor crash related to using text colors in older site themes.
- You shouldn’t run into any errors when you paste deeply nested content in the block editor. Much like onions, ogres, cakes, or parfaits, your content can have many layers.
Loading

0 comments on commit 2693a99

Please sign in to comment.