Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: material-extensions/material-icons-browser-extension
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.8.27
Choose a base ref
...
head repository: material-extensions/material-icons-browser-extension
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 11 commits
  • 68 files changed
  • 3 contributors

Commits on Oct 23, 2024

  1. Refactor UI components using React and TSX and providing new features (

    …#113)
    
    * Use react for settings popup
    
    * Update options
    
    * Update styling
    
    * Remove unused type conversions
    
    * Remove unused controls function
    
    * Update project structure
    
    * Delete unused code
    
    * Legacy ui components
    
    * Refactor files
    
    * Update styling
    
    * Update UI components
    
    * Remove unused code
    
    * Remove unused code
    
    * Improve theming
    
    * Update icon color
    
    * Improve custom domains
    
    * Update extension
    
    * Add delete functionalty for custom domains
    
    * Improve icon sizes on screen
    
    * Implement icon bindings dialog
    
    * Minor improvements
    
    * Add tooltips
    
    * Support lookup of language ids in manifest
    
    * Implement watch mode for development purposes
    
    * Improve language id binding customization
    
    * Adjust node script
    
    * Improve reset functionality
    
    * Adjust node script
    
    * Minor improvements
    
    * Update binding controls with icons
    
    * Organize imports
    
    * Update error message
    
    * Adjust icon binding dialog
    
    * Add Info Popover
    
    * Update autocomplete behavior
    
    * Fix image issue
    
    * Minor improvements
    
    * Clean up code
    
    * Make appbar sticky
    
    * Improve project structure
    
    * Update info text
    
    * Adjust styling
    
    * Update styling
    
    * Improve adding new bindings
    
    * Adjust tsconfig
    
    * Support switch of themes for the icon preview
    
    * Update watch script
    
    * Improve error handling
    
    * Move build languages step before build src
    PKief authored Oct 23, 2024
    Copy the full SHA
    17c71b8 View commit details

Commits on Oct 24, 2024

  1. Copy the full SHA
    d077941 View commit details

Commits on Nov 6, 2024

  1. Copy the full SHA
    63c5d07 View commit details

Commits on Nov 14, 2024

  1. Copy the full SHA
    bdceeb8 View commit details

Commits on Dec 7, 2024

  1. Copy the full SHA
    8c4ca5e View commit details

Commits on Dec 19, 2024

  1. Copy the full SHA
    265b16a View commit details

Commits on Jan 4, 2025

  1. chore: update logo (#117)

    * Update logo according to changed folder icon
    
    * Update logo at more locations
    PKief authored Jan 4, 2025
    Copy the full SHA
    13275dd View commit details

Commits on Jan 7, 2025

  1. Copy the full SHA
    5bb7485 View commit details

Commits on Jan 11, 2025

  1. Copy the full SHA
    7037529 View commit details
  2. chore(workflows): Update workflows

    PKief committed Jan 11, 2025
    Copy the full SHA
    4f829af View commit details
  3. chore: create devcontainer.json (#110)

    Signed-off-by: hema203 <[email protected]>
    hema203 authored Jan 11, 2025
    Copy the full SHA
    0c33571 View commit details
Showing with 4,751 additions and 1,349 deletions.
  1. +5 −0 .devcontainer/devcontainer.json
  2. +5 −7 .github/workflows/build.yml
  3. +33 −0 .github/workflows/pr-closed.yml
  4. +43 −0 .github/workflows/pr-title.yml
  5. +25 −16 .github/workflows/release.yml
  6. +24 −15 .github/workflows/update-from-upstream.yml
  7. +1 −1 README.md
  8. BIN assets/logo.png
  9. BIN logo.png
  10. +1 −21 logo.svg
  11. +2,870 −252 package-lock.json
  12. +15 −4 package.json
  13. +17 −0 renovate.json
  14. +4 −7 scripts/build-src.ts
  15. +8 −0 src/lib/custom-providers.ts
  16. +3 −3 src/lib/icon-sizes.ts
  17. +26 −9 src/lib/replace-icon.ts
  18. +15 −3 src/lib/replace-icons.ts
  19. +21 −10 src/lib/user-config.ts
  20. +0 −6 src/lib/utils.ts
  21. +1 −21 src/logo.svg
  22. +14 −5 src/main.ts
  23. +1 −1 src/manifests/base.json
  24. +8 −2 src/models/provider.ts
  25. +1 −1 src/providers/gitlab.ts
  26. +4 −0 src/providers/index.ts
  27. +15 −0 src/ui/options/api/domains.ts
  28. +39 −0 src/ui/options/api/icons.ts
  29. +22 −0 src/ui/options/api/language-ids.ts
  30. +37 −0 src/ui/options/components/confirm-dialog.tsx
  31. +61 −0 src/ui/options/components/domain-actions.tsx
  32. +22 −0 src/ui/options/components/domain-name.tsx
  33. +113 −0 src/ui/options/components/domain-settings.tsx
  34. +45 −0 src/ui/options/components/icon-settings/binding-input-controls.tsx
  35. +17 −0 src/ui/options/components/icon-settings/file-icon-bindings.tsx
  36. +17 −0 src/ui/options/components/icon-settings/folder-icon-bindings.tsx
  37. +202 −0 src/ui/options/components/icon-settings/icon-binding-controls.tsx
  38. +35 −0 src/ui/options/components/icon-settings/icon-preview.tsx
  39. +42 −0 src/ui/options/components/icon-settings/icon-settings-dialog.tsx
  40. +20 −0 src/ui/options/components/icon-settings/language-icon-bindings.tsx
  41. +138 −0 src/ui/options/components/main.tsx
  42. +3 −133 src/ui/options/options.css
  43. +9 −62 src/ui/options/options.html
  44. +0 −149 src/ui/options/options.ts
  45. +12 −0 src/ui/options/options.tsx
  46. +9 −0 src/ui/options/types/binding-control-props.ts
  47. +88 −0 src/ui/popup/api/access.ts
  48. +28 −0 src/ui/popup/api/helper.ts
  49. +28 −0 src/ui/popup/api/page-state.ts
  50. +24 −0 src/ui/popup/api/provider.ts
  51. +79 −0 src/ui/popup/components/add-provider.tsx
  52. +24 −0 src/ui/popup/components/ask-for-access.tsx
  53. +51 −0 src/ui/popup/components/domain-settings.tsx
  54. +28 −0 src/ui/popup/components/loading-spinner.tsx
  55. +131 −0 src/ui/popup/components/main.tsx
  56. +34 −0 src/ui/popup/components/not-supported.tsx
  57. +12 −182 src/ui/popup/settings-popup.css
  58. +0 −1 src/ui/popup/settings-popup.github-logo.svg
  59. +4 −141 src/ui/popup/settings-popup.html
  60. +0 −295 src/ui/popup/settings-popup.ts
  61. +14 −0 src/ui/popup/settings-popup.tsx
  62. +87 −0 src/ui/shared/domain-settings-controls.tsx
  63. +30 −0 src/ui/shared/footer.tsx
  64. +61 −0 src/ui/shared/info-popover.tsx
  65. +5 −0 src/ui/shared/logo.tsx
  66. +7 −0 src/ui/shared/theme.ts
  67. +6 −0 src/ui/shared/utils.ts
  68. +7 −2 tsconfig.json
5 changes: 5 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"image": "mcr.microsoft.com/devcontainers/universal:2",
"features": {
}
}
12 changes: 5 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build
name: 🛠️ Build

on:
push:
@@ -14,22 +14,20 @@ permissions:
jobs:
build:
runs-on: [ubuntu-latest]

name: Build Material Icons Browser Extension

steps:
- name: Checkout 🛎
- name: 🛎️ Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false

- name: Install dependencies 📦
- name: 📦 Install dependencies
run: npm ci

- name: Check code quality 🔍
- name: 🧹 Check code quality
run: npm run lint

- name: Build extension 🛠
- name: 🛠️ Build extension
run: npm run build
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33 changes: 33 additions & 0 deletions .github/workflows/pr-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: 🎉 PR closed

on:
pull_request:
types:
- closed

permissions:
contents: read
pull-requests: write

jobs:
thank-you:
runs-on: ubuntu-latest

if: github.event.pull_request.merged == true

steps:
- name: 🙏 Post Thank You Comment
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `
## Merge Successful
Thanks for your contribution! 🎉
The changes will be part of the upcoming update on the Marketplace.`
})
43 changes: 43 additions & 0 deletions .github/workflows/pr-title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: ✅ Check PR Title

on:
pull_request:
types: [opened, edited]

permissions:
pull-requests: write
issues: write # Update issue labels

jobs:
lint-pr-title:
name: Check PR Title

runs-on: ubuntu-latest

if: ${{ github.event.action == 'opened' || github.event.changes.title != null }}

steps:
- name: 📥 Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# Only fetch the config file from the repository
sparse-checkout-cone-mode: false
sparse-checkout: |
.github/scripts/update-status-label.sh
commitlint.config.js
- name: 📦 Install dependencies
run: npm install --global @commitlint/config-conventional commitlint

- name: 🔍 Check PR title with commitlint
id: title-check
env:
PR_TITLE: ${{ github.event.pull_request.title }}
HELP_URL: https://github.com/material-extensions/vscode-material-icon-theme/blob/main/CONTRIBUTING.md#conventional-pull-request-titles
run: echo "$PR_TITLE" | npx commitlint --help-url $HELP_URL

- name: 🏷️ Manage label based on PR title check result
if: always()
run: .github/scripts/update-status-label.sh ${{ github.event.pull_request.number }} ${{ steps.title-check.outcome }} "🔤 invalid title"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41 changes: 25 additions & 16 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release new version
name: 🚀 Release new version
on:
workflow_dispatch:
inputs:
@@ -28,74 +28,83 @@ jobs:
id-token: write

steps:
- uses: actions/checkout@v4
- name: 🤖 Use App Token for the Bot which is allowed to create releases
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}

- name: 📥 Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-node@v4
- name: 🛠️ Setup Node
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: "20"

- name: install dependencies
- name: 📦 Install dependencies
run: npm ci

- name: build extension
- name: 🏗️ Build extension
if: ${{ github.event.inputs.onlyUpload != 'not' && github.event.inputs.onlyUpload != 'none' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npm run build

- name: Attempt update
- name: 🔄 Attempt update
if: ${{ github.event.inputs.onlyUpload == 'not' || github.event.inputs.onlyUpload == 'none' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npm run release ${{ github.event.inputs.versionChange }}

- name: Get package version
- name: 📝 Get package version
if: ${{ github.event.inputs.onlyUpload == 'not' || github.event.inputs.onlyUpload == 'none' }}
run: echo "package_version=v$(jq -r .version package.json)" >> $GITHUB_ENV

- name: Commit updated files
- name: 💾 Commit updated files
if: ${{ github.event.inputs.onlyUpload == 'not' || github.event.inputs.onlyUpload == 'none' }}
uses: EndBug/add-and-commit@v9
uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
with:
add: "."
message: "[auto] release ${{env.package_version}}"
tag: "${{env.package_version}}"

- name: Release
- name: 🚀 Release
if: ${{ github.event.inputs.onlyUpload == 'not' || github.event.inputs.onlyUpload == 'none' }}
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: "${{env.package_version}}"
files: "*.zip"
generate_release_notes: true

- name: Upload to chrome store
- name: 🌐 Upload to chrome store
if: ${{ github.event.inputs.onlyUpload != 'firefox' && github.event.inputs.onlyUpload != 'none' }}
continue-on-error: true
uses: trmcnvn/chrome-addon@v2
uses: trmcnvn/chrome-addon@7fc5a5ad3ff597dc64d6a13de7dcaa8515328be7 # v2
with:
extension: bggfcpfjbdkhfhfmkjpbhnkhnpjjeomc
zip: github-material-icons-chrome-extension.zip
client-id: ${{ secrets.CHROME_CLIENT_ID }}
client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}

- name: Upload to edge store
- name: 🌐 Upload to edge store
if: ${{ github.event.inputs.onlyUpload != 'edge' && github.event.inputs.onlyUpload != 'none' }}
continue-on-error: true
uses: wdzeng/edge-addon@v1
uses: wdzeng/edge-addon@e307af4adb6d4e1c12387dc7d6bd545dcd075909 # v1.2.5
with:
product-id: d7692295-d84f-4bf5-9447-3cbb6ae29517
zip-path: github-material-icons-edge-extension.zip
client-id: ${{ secrets.EDGE_CLIENT_ID }}
client-secret: ${{ secrets.EDGE_CLIENT_SECRET }}
access-token-url: ${{ secrets.EDGE_ACCESS_TOKEN_URL }}

- name: Upload to firefox store
- name: 🌐 Upload to firefox store
if: ${{ github.event.inputs.onlyUpload != 'chrome' && github.event.inputs.onlyUpload != 'none'}}
continue-on-error: true
run: npx web-ext sign -s ./dist/firefox/ --channel=listed --api-key=${{ secrets.FIREFOX_API_JWT_ISSUER }} --api-secret=${{ secrets.FIREFOX_API_JWT_SECRET }}
39 changes: 24 additions & 15 deletions .github/workflows/update-from-upstream.yml
Original file line number Diff line number Diff line change
@@ -16,49 +16,58 @@ jobs:
id-token: write

steps:
- uses: actions/checkout@v4
- name: 🤖 Use App Token for the Bot which is allowed to create releases
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
id: app-token
with:
app-id: ${{ vars.BOT_APP_ID }}
private-key: ${{ secrets.BOT_PRIVATE_KEY }}

- name: 📥 Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-node@v4
- name: 🛠️ Setup Node
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: "20"

- name: Install dependencies
- name: 📦 Install dependencies
run: npm ci

- name: Fetch release version
- name: 🔍 Fetch release version
id: upstream
run: |
release_tag=$(npm view material-icon-theme version)
current_tag=$(npm list material-icon-theme --depth=0 | grep 'material-icon-theme@' | cut -d '@' -f 2)
echo "release_tag=$release_tag" >> $GITHUB_ENV
echo "current_tag=$current_tag" >> $GITHUB_ENV
- name: Attempt update
- name: 🔄 Attempt update
if: env.release_tag != env.current_tag
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm run update
npm i material-icon-theme@5.x
- name: Get package version
- name: 📝 Get package version
if: env.release_tag != env.current_tag
run: |
echo "package_version=v$(jq -r .version package.json)" >> $GITHUB_ENV
- name: Commit updated files
- name: 💾 Commit updated files
if: env.release_tag != env.current_tag
uses: EndBug/add-and-commit@v9
uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
with:
add: "."
message: "[auto] update to upstream ${{env.release_tag}}"
tag: "${{env.package_version}}"

- name: Release
- name: 🚀 Release
if: env.release_tag != env.current_tag
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
@@ -67,29 +76,29 @@ jobs:
files: "*.zip"
generate_release_notes: true

- name: Upload to chrome store
- name: 🌐 Upload to chrome store
if: env.release_tag != env.current_tag
continue-on-error: true
uses: trmcnvn/chrome-addon@v2
uses: trmcnvn/chrome-addon@7fc5a5ad3ff597dc64d6a13de7dcaa8515328be7 # v2
with:
extension: bggfcpfjbdkhfhfmkjpbhnkhnpjjeomc
zip: github-material-icons-chrome-extension.zip
client-id: ${{ secrets.CHROME_CLIENT_ID }}
client-secret: ${{ secrets.CHROME_CLIENT_SECRET }}
refresh-token: ${{ secrets.CHROME_REFRESH_TOKEN }}

- name: Upload to edge store
- name: 🌐 Upload to edge store
if: env.release_tag != env.current_tag
continue-on-error: true
uses: wdzeng/edge-addon@v1
uses: wdzeng/edge-addon@e307af4adb6d4e1c12387dc7d6bd545dcd075909 # v1.2.5
with:
product-id: d7692295-d84f-4bf5-9447-3cbb6ae29517
zip-path: github-material-icons-edge-extension.zip
client-id: ${{ secrets.EDGE_CLIENT_ID }}
client-secret: ${{ secrets.EDGE_CLIENT_SECRET }}
access-token-url: ${{ secrets.EDGE_ACCESS_TOKEN_URL }}

- name: Upload to firefox store
- name: 🌐 Upload to firefox store
if: env.release_tag != env.current_tag
continue-on-error: true
run: npx web-ext sign -s ./dist/firefox/ --channel=listed --api-key=${{ secrets.FIREFOX_API_JWT_ISSUER }} --api-secret=${{ secrets.FIREFOX_API_JWT_SECRET }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@

---

<a href="https://github.com/material-extensions/vscode-material-icon-theme"><img src="https://img.shields.io/badge/last_built_with_vscode_theme-v5.11.0-blue" /></a>
<a href="https://github.com/material-extensions/vscode-material-icon-theme"><img src="https://img.shields.io/badge/last_built_with_vscode_theme-v5.16.0-blue" /></a>

<img valign="middle" src="https://img.shields.io/chrome-web-store/v/bggfcpfjbdkhfhfmkjpbhnkhnpjjeomc?label=Version%20Available%20in%20Chrome%20Store">

Binary file modified assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 1 addition & 21 deletions logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading