Add "File Size" to Site Media Details (#24947)

* Add missing localization

* Add File Size to Media Details

* Show filesize only when available

Author: kean

RELEASE-NOTES.txt

@@ -1,9 +1,10 @@
 26.5
 -----
-* [**] Add "Status" field to the "Post Settings" screen to make it easier to move posts from one state to another [#24939]
+* [*] Add "Status" field to the "Post Settings" screen to make it easier to move posts from one state to another [#24939]
 * [*] Add "Publish Date" back to "Post Settings" for draft and pending posts [#24939]
 * [*] Use "Menlo" font for the password field to make it easier to distinguish between characters like `0` and `0`  [#24939]
 * [*] Add "Access" section to "Post Settings" [#24942]
+* [*] Add "File Size" to Site Media Details [#24947]
 * [*] Add "Email to Subscribers" row to "Publishing" sheet [#24946]
 
 26.4

WordPress/Classes/ViewRelated/Media/MediaItemViewController.swift

@@ -57,16 +57,16 @@ final class MediaItemViewController: UITableViewController {
     }
 
     private func updateViewModel() {
-        let titleRow = editableRowIfSupported(title: NSLocalizedString("Title", comment: "Noun. Label for the title of a media asset (image / video)"),
+        let titleRow = editableRowIfSupported(title: Strings.title,
                                               value: mediaMetadata.title,
                                               action: editTitle())
-        let captionRow = editableRowIfSupported(title: NSLocalizedString("Caption", comment: "Noun. Label for the caption for a media asset (image / video)"),
+        let captionRow = editableRowIfSupported(title: Strings.caption,
                                                 value: mediaMetadata.caption,
                                                 action: editCaption())
-        let descRow = editableRowIfSupported(title: NSLocalizedString("Description", comment: "Label for the description for a media asset (image / video)"),
+        let descRow = editableRowIfSupported(title: Strings.description,
                                              value: mediaMetadata.desc,
                                              action: editDescription())
-        let altRow = editableRowIfSupported(title: NSLocalizedString("Alt Text", comment: "Label for the alt for a media asset (image)"),
+        let altRow = editableRowIfSupported(title: Strings.altText,
                                             value: mediaMetadata.alt,
                                             action: editAlt())
 
@@ -103,16 +103,19 @@ final class MediaItemViewController: UITableViewController {
 
         var rows = [ImmuTableRow]()
         rows.append(TextViewRow(title: Strings.url, details: media.remoteURL ?? ""))
-        rows.append(TextRow(title: NSLocalizedString("File name", comment: "Label for the file name for a media asset (image / video)"), value: media.filename ?? ""))
-        rows.append(TextRow(title: NSLocalizedString("File type", comment: "Label for the file type (.JPG, .PNG, etc) for a media asset (image / video)"), value: presenter.fileType ?? ""))
+        rows.append(TextRow(title: Strings.fileName, value: media.filename ?? ""))
+        rows.append(TextRow(title: Strings.fileType, value: presenter.fileType ?? ""))
+        if let size = media.formattedSize {
+            rows.append(TextRow(title: Strings.fileSize, value: size))
+        }
 
         switch media.mediaType {
         case .image, .video:
-            rows.append(TextRow(title: NSLocalizedString("Dimensions", comment: "Label for the dimensions in pixels for a media asset (image / video)"), value: presenter.dimensions))
+            rows.append(TextRow(title: Strings.dimensions, value: presenter.dimensions))
         default: break
         }
 
-        rows.append(TextRow(title: NSLocalizedString("Uploaded", comment: "Label for the date a media asset (image / video) was uploaded"), value: media.creationDate?.toMediumString() ?? ""))
+        rows.append(TextRow(title: Strings.uploaded, value: media.creationDate?.toMediumString() ?? ""))
 
         return rows
     }
@@ -142,7 +145,7 @@ final class MediaItemViewController: UITableViewController {
     private func handleDeletedMedia() {
         SVProgressHUD.setDefaultMaskType(.clear)
         SVProgressHUD.setMinimumDismissTimeInterval(1.0)
-        SVProgressHUD.showError(withStatus: NSLocalizedString("This media item has been deleted.", comment: "Message displayed in Media Library if the user attempts to edit a media asset (image / video) after it has been deleted."))
+        SVProgressHUD.showError(withStatus: Strings.mediaDeleted)
         navigationController?.popViewController(animated: true)
     }
 
@@ -157,7 +160,7 @@ final class MediaItemViewController: UITableViewController {
                                         style: .plain,
                                         target: self,
                                         action: #selector(trashTapped))
-        trashItem.accessibilityLabel = NSLocalizedString("Trash", comment: "Accessibility label for trash buttons in nav bars")
+        trashItem.accessibilityLabel = Strings.trash
 
         if media.blog.supports(.mediaDeletion) {
             navigationItem.rightBarButtonItems = [ shareItem, trashItem ]
@@ -197,7 +200,7 @@ final class MediaItemViewController: UITableViewController {
                     controller.player?.play()
                 })
             } else if let _ = error {
-                SVProgressHUD.showError(withStatus: NSLocalizedString("Unable to load video.", comment: "Error shown when the app fails to load a video from the user's media library."))
+                SVProgressHUD.showError(withStatus: Strings.unableToLoadVideo)
             }
         }
     }
@@ -263,9 +266,9 @@ final class MediaItemViewController: UITableViewController {
         }
 
         let alertController = UIAlertController(title: nil,
-                                                message: NSLocalizedString("Are you sure you want to permanently delete this item?", comment: "Message prompting the user to confirm that they want to permanently delete a media item. Should match Calypso."), preferredStyle: .alert)
-        alertController.addCancelActionWithTitle(NSLocalizedString("Cancel", comment: "Verb. Button title. Tapping cancels an action."))
-        alertController.addDestructiveActionWithTitle(NSLocalizedString("Delete", comment: "Title for button that permanently deletes a media item (photo / video)"), handler: { action in
+                                                message: Strings.deleteConfirmation, preferredStyle: .alert)
+        alertController.addCancelActionWithTitle(Strings.cancel)
+        alertController.addDestructiveActionWithTitle(Strings.delete, handler: { action in
             self.deleteMediaItem()
         })
 
@@ -280,7 +283,7 @@ final class MediaItemViewController: UITableViewController {
 
         SVProgressHUD.setDefaultMaskType(.clear)
         SVProgressHUD.setMinimumDismissTimeInterval(1.0)
-        SVProgressHUD.show(withStatus: NSLocalizedString("Deleting...", comment: "Text displayed in HUD while a media item is being deleted."))
+        SVProgressHUD.show(withStatus: Strings.deleting)
 
         let repository = MediaRepository(coreDataStack: ContextManager.shared)
         let mediaID = TaggedManagedObjectID(media)
@@ -289,9 +292,9 @@ final class MediaItemViewController: UITableViewController {
                 try await repository.delete(mediaID)
 
                 WPAppAnalytics.track(.mediaLibraryDeletedItems, properties: ["number_of_items_deleted": 1], blog: self.media.blog)
-                SVProgressHUD.showSuccess(withStatus: NSLocalizedString("Deleted!", comment: "Text displayed in HUD after successfully deleting a media item"))
+                SVProgressHUD.showSuccess(withStatus: Strings.deleted)
             } catch {
-                SVProgressHUD.showError(withStatus: NSLocalizedString("Unable to delete media item.", comment: "Text displayed in HUD if there was an error attempting to delete a media item."))
+                SVProgressHUD.showError(withStatus: Strings.unableToDeleteMedia)
             }
         }
     }
@@ -304,14 +307,14 @@ final class MediaItemViewController: UITableViewController {
             guard let blog = self?.media.blog else { return }
             WPAppAnalytics.track(.mediaLibraryEditedItemMetadata, blog: blog)
         }, failure: { _ in
-            SVProgressHUD.showError(withStatus: NSLocalizedString("Unable to save media item.", comment: "Text displayed in HUD when a media item's metadata (title, etc) couldn't be saved."))
+            SVProgressHUD.showError(withStatus: Strings.unableToSaveMedia)
         })
     }
 
     private func editTitle() -> ((ImmuTableRow) -> ()) {
         return { [weak self] row in
             let editableRow = row as! EditableTextRow
-            self?.pushSettingsController(for: editableRow, hint: NSLocalizedString("Image title", comment: "Hint for image title on image settings."),
+            self?.pushSettingsController(for: editableRow, hint: Strings.Hints.imageTitle,
                                         onValueChanged: { value in
                 self?.title = value
                 (self?.parent as? SiteMediaPageViewController)?.title = value
@@ -324,7 +327,7 @@ final class MediaItemViewController: UITableViewController {
     private func editCaption() -> ((ImmuTableRow) -> ()) {
         return { [weak self] row in
             let editableRow = row as! EditableTextRow
-            self?.pushSettingsController(for: editableRow, hint: NSLocalizedString("Image Caption", comment: "Hint for image caption on image settings."),
+            self?.pushSettingsController(for: editableRow, hint: Strings.Hints.imageCaption,
                                         onValueChanged: { value in
                 self?.mediaMetadata.caption = value
                 self?.reloadViewModel()
@@ -335,7 +338,7 @@ final class MediaItemViewController: UITableViewController {
     private func editDescription() -> ((ImmuTableRow) -> ()) {
         return { [weak self] row in
             let editableRow = row as! EditableTextRow
-            self?.pushSettingsController(for: editableRow, hint: NSLocalizedString("Image Description", comment: "Hint for image description on image settings."),
+            self?.pushSettingsController(for: editableRow, hint: Strings.Hints.imageDescription,
                                         onValueChanged: { value in
                 self?.mediaMetadata.desc = value
                 self?.reloadViewModel()
@@ -346,7 +349,7 @@ final class MediaItemViewController: UITableViewController {
     private func editAlt() -> ((ImmuTableRow) -> ()) {
         return { [weak self] row in
             let editableRow = row as! EditableTextRow
-            self?.pushSettingsController(for: editableRow, hint: NSLocalizedString("Image Alt", comment: "Hint for image alt on image settings."),
+            self?.pushSettingsController(for: editableRow, hint: Strings.Hints.imageAlt,
                                          onValueChanged: { value in
                                             self?.mediaMetadata.alt = value
                                             self?.reloadViewModel()
@@ -471,4 +474,30 @@ private struct MediaMetadata {
 
 private enum Strings {
     static let url = NSLocalizedString("siteMedia.details.url", value: "URL", comment: "Title for the URL field")
+    static let title = NSLocalizedString("siteMedia.details.title", value: "Title", comment: "Noun. Label for the title of a media asset (image / video)")
+    static let caption = NSLocalizedString("siteMedia.details.caption", value: "Caption", comment: "Noun. Label for the caption for a media asset (image / video)")
+    static let description = NSLocalizedString("siteMedia.details.description", value: "Description", comment: "Label for the description for a media asset (image / video)")
+    static let altText = NSLocalizedString("siteMedia.details.altText", value: "Alt Text", comment: "Label for the alt for a media asset (image)")
+    static let fileName = NSLocalizedString("siteMedia.details.fileName", value: "File Name", comment: "Label for the file name for a media asset (image / video)")
+    static let fileType = NSLocalizedString("siteMedia.details.fileType", value: "File Type", comment: "Label for the file type (.JPG, .PNG, etc) for a media asset (image / video)")
+    static let fileSize = NSLocalizedString("siteMedia.details.fileSize", value: "File Size", comment: "Label for the file size for a media asset (image / video)")
+    static let dimensions = NSLocalizedString("siteMedia.details.dimensions", value: "Dimensions", comment: "Label for the dimensions in pixels for a media asset (image / video)")
+    static let uploaded = NSLocalizedString("siteMedia.details.uploaded", value: "Uploaded", comment: "Label for the date a media asset (image / video) was uploaded")
+    static let trash = NSLocalizedString("siteMedia.details.trash", value: "Trash", comment: "Accessibility label for trash buttons in nav bars")
+    static let mediaDeleted = NSLocalizedString("siteMedia.details.mediaDeleted", value: "This media item has been deleted.", comment: "Message displayed in Media Library if the user attempts to edit a media asset (image / video) after it has been deleted.")
+    static let unableToLoadVideo = NSLocalizedString("siteMedia.details.unableToLoadVideo", value: "Unable to load video.", comment: "Error shown when the app fails to load a video from the user's media library.")
+    static let deleteConfirmation = NSLocalizedString("siteMedia.details.deleteConfirmation", value: "Are you sure you want to permanently delete this item?", comment: "Message prompting the user to confirm that they want to permanently delete a media item. Should match Calypso.")
+    static let cancel = NSLocalizedString("siteMedia.details.cancel", value: "Cancel", comment: "Verb. Button title. Tapping cancels an action.")
+    static let delete = NSLocalizedString("siteMedia.details.delete", value: "Delete", comment: "Title for button that permanently deletes a media item (photo / video)")
+    static let deleting = NSLocalizedString("siteMedia.details.deleting", value: "Deleting...", comment: "Text displayed in HUD while a media item is being deleted.")
+    static let deleted = NSLocalizedString("siteMedia.details.deleted", value: "Deleted!", comment: "Text displayed in HUD after successfully deleting a media item")
+    static let unableToDeleteMedia = NSLocalizedString("siteMedia.details.unableToDeleteMedia", value: "Unable to delete media item.", comment: "Text displayed in HUD if there was an error attempting to delete a media item.")
+    static let unableToSaveMedia = NSLocalizedString("siteMedia.details.unableToSaveMedia", value: "Unable to save media item.", comment: "Text displayed in HUD when a media item's metadata (title, etc) couldn't be saved.")
+
+    enum Hints {
+        static let imageTitle = NSLocalizedString("siteMedia.hints.imageTitle", value: "Image title", comment: "Hint for image title on image settings.")
+        static let imageCaption = NSLocalizedString("siteMedia.hints.imageCaption", value: "Image Caption", comment: "Hint for image caption on image settings.")
+        static let imageDescription = NSLocalizedString("siteMedia.hints.imageDescription", value: "Image Description", comment: "Hint for image description on image settings.")
+        static let imageAlt = NSLocalizedString("siteMedia.hints.imageAlt", value: "Image Alt", comment: "Hint for image alt on image settings.")
+    }
 }