From 7923f305b65a58db1aae5fe7b9959c2d1bd3e0f9 Mon Sep 17 00:00:00 2001 From: Kyle Hickinson Date: Fri, 10 Nov 2023 11:03:09 -0500 Subject: [PATCH] No Bug: Update Leo & Leo SF Symbols packages (#8389) --- .../Browser/PlaylistChangeFoldersView.swift | 2 +- .../AddEditBookmarkTableViewController.swift | 2 +- .../Toolbars/UrlBar/ReaderModeButton.swift | 2 +- .../Settings/SettingsViewController.swift | 4 +- .../Contents.json | 0 .../Contents.json | 0 .../Contents.json | 0 package-lock.json | 70 +++++++++++++++---- package.json | 4 +- 9 files changed, 64 insertions(+), 20 deletions(-) rename Sources/DesignSystem/Icons/Symbols.xcassets/{leo.comment.smile-square.symbolset => leo.folder.open.symbolset}/Contents.json (100%) rename Sources/DesignSystem/Icons/Symbols.xcassets/{leo.folder.open-o.symbolset => leo.message.bubble-smile.symbolset}/Contents.json (100%) rename Sources/DesignSystem/Icons/Symbols.xcassets/{leo.product.readermode.symbolset => leo.product.speedreader.symbolset}/Contents.json (100%) diff --git a/Sources/Brave/Frontend/Browser/Playlist/Browser/PlaylistChangeFoldersView.swift b/Sources/Brave/Frontend/Browser/Playlist/Browser/PlaylistChangeFoldersView.swift index f7898adcd62..33ada177eb0 100644 --- a/Sources/Brave/Frontend/Browser/Playlist/Browser/PlaylistChangeFoldersView.swift +++ b/Sources/Brave/Frontend/Browser/Playlist/Browser/PlaylistChangeFoldersView.swift @@ -42,7 +42,7 @@ struct PlaylistChangeFoldersView: View { selectedFolderID = folder.id } label: { HStack { - Image(braveSystemName: "leo.folder.open-o") + Image(braveSystemName: "leo.folder.open") .foregroundColor(Color(folder.id == selectedFolderID ? .braveBlurpleTint : .braveLabel)) .frame(width: iconSize) VStack(alignment: .leading) { diff --git a/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/Bookmarks/AddEditBookmarkTableViewController.swift b/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/Bookmarks/AddEditBookmarkTableViewController.swift index fff6ffef230..036b91882a1 100644 --- a/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/Bookmarks/AddEditBookmarkTableViewController.swift +++ b/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/Bookmarks/AddEditBookmarkTableViewController.swift @@ -480,7 +480,7 @@ class AddEditBookmarkTableViewController: UITableViewController { if indentedFolder.folder.parent == nil { cell.customImage.image = UIImage(braveSystemNamed: "leo.product.bookmarks") } else { - cell.customImage.image = UIImage(braveSystemNamed: hasChildrenFolders == true ? "leo.folder.open-o" : "leo.folder") + cell.customImage.image = UIImage(braveSystemNamed: hasChildrenFolders == true ? "leo.folder.open" : "leo.folder") } if let folder = saveLocation.getFolder, folder.objectID == indentedFolder.folder.objectID { diff --git a/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/ReaderModeButton.swift b/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/ReaderModeButton.swift index 720b095437c..88e8ad0bbe0 100644 --- a/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/ReaderModeButton.swift +++ b/Sources/Brave/Frontend/Browser/Toolbars/UrlBar/ReaderModeButton.swift @@ -20,7 +20,7 @@ class ReaderModeButton: UIButton { override init(frame: CGRect) { super.init(frame: frame) adjustsImageWhenHighlighted = false - setImage(UIImage(braveSystemNamed: "leo.product.readermode"), for: .normal) + setImage(UIImage(braveSystemNamed: "leo.product.speedreader"), for: .normal) updateIconSize() } diff --git a/Sources/Brave/Frontend/Settings/SettingsViewController.swift b/Sources/Brave/Frontend/Settings/SettingsViewController.swift index 2e2e84b3bfd..a8579fdc201 100644 --- a/Sources/Brave/Frontend/Settings/SettingsViewController.swift +++ b/Sources/Brave/Frontend/Settings/SettingsViewController.swift @@ -370,7 +370,7 @@ class SettingsViewController: TableViewController { } }, image: UIImage(braveSystemNamed: "leo.sync"), accessory: .disclosureIndicator, cellClass: MultilineValue1Cell.self), - .boolRow(title: Strings.bookmarksLastVisitedFolderTitle, option: Preferences.General.showLastVisitedBookmarksFolder, image: UIImage(braveSystemNamed: "leo.folder.open-o")), + .boolRow(title: Strings.bookmarksLastVisitedFolderTitle, option: Preferences.General.showLastVisitedBookmarksFolder, image: UIImage(braveSystemNamed: "leo.folder.open")), Row( text: Strings.Shortcuts.shortcutSettingsTitle, selection: { [unowned self] in @@ -677,7 +677,7 @@ class SettingsViewController: TableViewController { UIApplication.shared.open(writeReviewURL) self.dismiss(animated: true) }, - image: UIImage(braveSystemNamed: "leo.comment.smile-square"), + image: UIImage(braveSystemNamed: "leo.message.bubble-smile"), cellClass: MultilineValue1Cell.self), ] ) diff --git a/Sources/DesignSystem/Icons/Symbols.xcassets/leo.comment.smile-square.symbolset/Contents.json b/Sources/DesignSystem/Icons/Symbols.xcassets/leo.folder.open.symbolset/Contents.json similarity index 100% rename from Sources/DesignSystem/Icons/Symbols.xcassets/leo.comment.smile-square.symbolset/Contents.json rename to Sources/DesignSystem/Icons/Symbols.xcassets/leo.folder.open.symbolset/Contents.json diff --git a/Sources/DesignSystem/Icons/Symbols.xcassets/leo.folder.open-o.symbolset/Contents.json b/Sources/DesignSystem/Icons/Symbols.xcassets/leo.message.bubble-smile.symbolset/Contents.json similarity index 100% rename from Sources/DesignSystem/Icons/Symbols.xcassets/leo.folder.open-o.symbolset/Contents.json rename to Sources/DesignSystem/Icons/Symbols.xcassets/leo.message.bubble-smile.symbolset/Contents.json diff --git a/Sources/DesignSystem/Icons/Symbols.xcassets/leo.product.readermode.symbolset/Contents.json b/Sources/DesignSystem/Icons/Symbols.xcassets/leo.product.speedreader.symbolset/Contents.json similarity index 100% rename from Sources/DesignSystem/Icons/Symbols.xcassets/leo.product.readermode.symbolset/Contents.json rename to Sources/DesignSystem/Icons/Symbols.xcassets/leo.product.speedreader.symbolset/Contents.json diff --git a/package-lock.json b/package-lock.json index a4e3b667e07..c3f066fa975 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "dependencies": { "@mozilla/readability": "^0.4.2", "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.61.69/brave-core-ios-1.61.69.tgz", - "leo": "github:brave/leo#7f2dfddb70aff1501ef5a2f3c640a8c74a7343ee", - "leo-sf-symbols": "github:brave/leo-sf-symbols#d6056328b8d6ef06e68996ff02a22e06f52590c3", + "leo": "github:brave/leo#792ab5c9f82784578e8f8fc14b9eaa24fa1956d2", + "leo-sf-symbols": "github:brave/leo-sf-symbols#775bb8fca9df76679b9b272545e162418127c5de", "page-metadata-parser": "^1.1.3", "webpack-cli": "^4.8.0" }, @@ -39,6 +39,27 @@ "node": ">=10.0.0" } }, + "node_modules/@floating-ui/core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz", + "integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==", + "dependencies": { + "@floating-ui/utils": "^0.1.3" + } + }, + "node_modules/@floating-ui/dom": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.4.4.tgz", + "integrity": "sha512-21hhDEPOiWkGp0Ys4Wi6Neriah7HweToKra626CIK712B5m9qkdz54OP9gVldUg+URnBTpv/j/bi/skmGdstXQ==", + "dependencies": { + "@floating-ui/core": "^1.3.1" + } + }, + "node_modules/@floating-ui/utils": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz", + "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -1302,11 +1323,12 @@ "node_modules/leo": { "name": "@brave/leo", "version": "0.0.1", - "resolved": "git+ssh://git@github.com/brave/leo.git#7f2dfddb70aff1501ef5a2f3c640a8c74a7343ee", - "integrity": "sha512-DU0gUSBV2wexsgZ7DEyyryDk09cVgHAw6/dYNCfacuRvbY9cSCMKbxU9e8u/88wLjAnK3XizGTuDxC+9LNOKog==", + "resolved": "git+ssh://git@github.com/brave/leo.git#792ab5c9f82784578e8f8fc14b9eaa24fa1956d2", + "integrity": "sha512-ni8DYcbpkzS5XSgF9hcBBFX7+XRV9ioknWEBQmSM5JlsgVxeD8vzJ5csLmOlXUTou5pgfhBmg9dMac8IhTHGxA==", "license": "MIT", "dependencies": { "@ctrl/tinycolor": "3.5.1", + "@floating-ui/dom": "1.4.4", "@tsconfig/svelte": "3.0.0", "lodash.camelcase": "4.3.0", "lodash.merge": "4.6.2", @@ -1335,9 +1357,9 @@ } }, "node_modules/leo-sf-symbols": { - "version": "1.0.20", - "resolved": "git+ssh://git@github.com/brave/leo-sf-symbols.git#d6056328b8d6ef06e68996ff02a22e06f52590c3", - "integrity": "sha512-KgnNbivBqdlNhhI9BA3M93/lR7DDnbiILzYBZy9Bc8px3Wo/rXbKGIcYjj4rBsfWBpj+jKDNXipNrGfgUKfiYA==", + "version": "1.0.35", + "resolved": "git+ssh://git@github.com/brave/leo-sf-symbols.git#775bb8fca9df76679b9b272545e162418127c5de", + "integrity": "sha512-jZ1vJ4dalIEP6XZv4XQ9pXlv6Y4aKALWT6CtWTjZ3pQuqrFkeptW01qfT8MQJc/ybK7fuJ3MqzCLWG+zu/I9Gw==", "license": "MPL-2.0" }, "node_modules/lilconfig": { @@ -2788,6 +2810,27 @@ "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz", "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==" }, + "@floating-ui/core": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz", + "integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==", + "requires": { + "@floating-ui/utils": "^0.1.3" + } + }, + "@floating-ui/dom": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.4.4.tgz", + "integrity": "sha512-21hhDEPOiWkGp0Ys4Wi6Neriah7HweToKra626CIK712B5m9qkdz54OP9gVldUg+URnBTpv/j/bi/skmGdstXQ==", + "requires": { + "@floating-ui/core": "^1.3.1" + } + }, + "@floating-ui/utils": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz", + "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" + }, "@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -3774,11 +3817,12 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "leo": { - "version": "git+ssh://git@github.com/brave/leo.git#7f2dfddb70aff1501ef5a2f3c640a8c74a7343ee", - "integrity": "sha512-DU0gUSBV2wexsgZ7DEyyryDk09cVgHAw6/dYNCfacuRvbY9cSCMKbxU9e8u/88wLjAnK3XizGTuDxC+9LNOKog==", - "from": "leo@github:brave/leo#7f2dfddb70aff1501ef5a2f3c640a8c74a7343ee", + "version": "git+ssh://git@github.com/brave/leo.git#792ab5c9f82784578e8f8fc14b9eaa24fa1956d2", + "integrity": "sha512-ni8DYcbpkzS5XSgF9hcBBFX7+XRV9ioknWEBQmSM5JlsgVxeD8vzJ5csLmOlXUTou5pgfhBmg9dMac8IhTHGxA==", + "from": "leo@github:brave/leo#792ab5c9f82784578e8f8fc14b9eaa24fa1956d2", "requires": { "@ctrl/tinycolor": "3.5.1", + "@floating-ui/dom": "1.4.4", "@tsconfig/svelte": "3.0.0", "lodash.camelcase": "4.3.0", "lodash.merge": "4.6.2", @@ -3792,9 +3836,9 @@ } }, "leo-sf-symbols": { - "version": "git+ssh://git@github.com/brave/leo-sf-symbols.git#d6056328b8d6ef06e68996ff02a22e06f52590c3", - "integrity": "sha512-KgnNbivBqdlNhhI9BA3M93/lR7DDnbiILzYBZy9Bc8px3Wo/rXbKGIcYjj4rBsfWBpj+jKDNXipNrGfgUKfiYA==", - "from": "leo-sf-symbols@github:brave/leo-sf-symbols#d6056328b8d6ef06e68996ff02a22e06f52590c3" + "version": "git+ssh://git@github.com/brave/leo-sf-symbols.git#775bb8fca9df76679b9b272545e162418127c5de", + "integrity": "sha512-jZ1vJ4dalIEP6XZv4XQ9pXlv6Y4aKALWT6CtWTjZ3pQuqrFkeptW01qfT8MQJc/ybK7fuJ3MqzCLWG+zu/I9Gw==", + "from": "leo-sf-symbols@github:brave/leo-sf-symbols#775bb8fca9df76679b9b272545e162418127c5de" }, "lilconfig": { "version": "2.1.0", diff --git a/package.json b/package.json index abda754d04a..32b0a8ed415 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "dependencies": { "@mozilla/readability": "^0.4.2", "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.61.69/brave-core-ios-1.61.69.tgz", - "leo": "github:brave/leo#7f2dfddb70aff1501ef5a2f3c640a8c74a7343ee", - "leo-sf-symbols": "github:brave/leo-sf-symbols#d6056328b8d6ef06e68996ff02a22e06f52590c3", + "leo": "github:brave/leo#792ab5c9f82784578e8f8fc14b9eaa24fa1956d2", + "leo-sf-symbols": "github:brave/leo-sf-symbols#775bb8fca9df76679b9b272545e162418127c5de", "page-metadata-parser": "^1.1.3", "webpack-cli": "^4.8.0" },