From 71fcce5f01209c57e9558a8a8c241d2197cd3aa0 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 4 Dec 2024 09:48:07 +0530 Subject: [PATCH 1/7] [auth] Add Lint validation for custom icon name --- .github/workflows/auth-lint.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/auth-lint.yml b/.github/workflows/auth-lint.yml index bad2539c30..53d5047113 100644 --- a/.github/workflows/auth-lint.yml +++ b/.github/workflows/auth-lint.yml @@ -33,5 +33,15 @@ jobs: - run: flutter analyze --no-fatal-infos + - name: Verify custom icons are lowercase including optional understores, and end with .svg + run: | + find assets/custom-icons -type f -name "*.svg" | while read -r file; do + if [[ "$(basename "$file")" != "$(basename "$file" | tr '[:upper:]' '[:lower:]' | tr ' ' '_')" ]]; then + echo "File name is not lowercase: $file" + exit 1 + fi + done + + - name: Verify custom icon JSON run: cat assets/custom-icons/_data/custom-icons.json | jq empty From 095c22b5656698bca2ad6b694ea2e5e9accd2637 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 4 Dec 2024 09:50:00 +0530 Subject: [PATCH 2/7] [auth] Rename existing icons to match lint rule --- .../custom-icons/_data/custom-icons.json | 41 ++++++++++++++----- .../icons/{1xBet.svg => 1x_bet.svg} | 0 auth/assets/custom-icons/icons/Binance.svg | 1 - .../icons/{BaiduCloud.svg => baidu_cloud.svg} | 0 .../icons/{BBS.NGA.svg => bbs_nga.svg} | 0 .../{binance.svg => binance_exchange.svg} | 0 .../icons/{Bluesky.svg => blue_sky.svg} | 0 .../icons/{BorgBase.svg => borg_base.svg} | 0 .../icons/{Icedrive.svg => ice_drive.svg} | 0 .../icons/{IDme.svg => id_me.svg} | 0 .../icons/{Ko-fi.svg => ko_fi.svg} | 0 .../{NeteaseMail.svg => netease_mail.svg} | 0 .../icons/{PebbleHost.svg => pebble_host.svg} | 0 13 files changed, 30 insertions(+), 12 deletions(-) rename auth/assets/custom-icons/icons/{1xBet.svg => 1x_bet.svg} (100%) delete mode 100644 auth/assets/custom-icons/icons/Binance.svg rename auth/assets/custom-icons/icons/{BaiduCloud.svg => baidu_cloud.svg} (100%) rename auth/assets/custom-icons/icons/{BBS.NGA.svg => bbs_nga.svg} (100%) rename auth/assets/custom-icons/icons/{binance.svg => binance_exchange.svg} (100%) rename auth/assets/custom-icons/icons/{Bluesky.svg => blue_sky.svg} (100%) rename auth/assets/custom-icons/icons/{BorgBase.svg => borg_base.svg} (100%) rename auth/assets/custom-icons/icons/{Icedrive.svg => ice_drive.svg} (100%) rename auth/assets/custom-icons/icons/{IDme.svg => id_me.svg} (100%) rename auth/assets/custom-icons/icons/{Ko-fi.svg => ko_fi.svg} (100%) rename auth/assets/custom-icons/icons/{NeteaseMail.svg => netease_mail.svg} (100%) rename auth/assets/custom-icons/icons/{PebbleHost.svg => pebble_host.svg} (100%) diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json index 57f3f8192c..e3a63d4658 100644 --- a/auth/assets/custom-icons/_data/custom-icons.json +++ b/auth/assets/custom-icons/_data/custom-icons.json @@ -1,7 +1,8 @@ { "icons": [ { - "title": "1xBet" + "title": "1xBet", + "slug": "1x_bet" }, { "title": "23andme" @@ -45,13 +46,15 @@ }, { "title": "BaiduCloud", + "slug": "baidu_cloud", "altNames": [ "百度云", "baiduyun" ] }, { - "title": "Band" + "title": "Band", + "slug": "band" }, { "title": "Battle.net", @@ -63,6 +66,7 @@ }, { "title": "BBS.NGA", + "slug": "bbs_nga", "altNames": [ "NGA玩家社区", "NGA社区" @@ -76,6 +80,7 @@ }, { "title": "Binance", + "slug": "binance_exchange", "altNames": [ "币安" ] @@ -128,7 +133,8 @@ ] }, { - "title": "Bluesky" + "title": "Bluesky", + "slug": "blue_sky" }, { "title": "Booking", @@ -138,6 +144,7 @@ }, { "title": "BorgBase", + "slug": "borg_base", "altNames": [ "borg" ] @@ -170,7 +177,8 @@ ] }, { - "title": "CERN" + "title": "CERN", + "slug": "cern" }, { "title": "ChangeNOW" @@ -272,7 +280,8 @@ "hex": "1DB954" }, { - "title": "enom" + "title": "enom", + "slug": "enom" }, { "title": "Epic Games", @@ -319,7 +328,7 @@ }, { "title": "Gosuslugi", - "slug": "Gosuslugi", + "slug": "gosuslugi", "altNames": [ "Госуслуги" ] @@ -366,11 +375,12 @@ ] }, { - "title": "IceDrive" + "title": "IceDrive", + "slug": "ice_drive" }, { "title": "ID.me", - "slug": "IDme" + "slug": "id_me" }, { "title": "Infomaniak" @@ -398,7 +408,8 @@ "hex": "000000" }, { - "title": "IVPN" + "title": "IVPN", + "slug": "ivpn" }, { "title": "Jagex", @@ -428,6 +439,7 @@ }, { "title": "Ko-fi", + "slug": "ko_fi", "altNames": [ "Ko fi", "Kofi" @@ -455,6 +467,7 @@ }, { "title": "Lark", + "slug": "lark", "altNames": [ "飞书" ] @@ -464,7 +477,7 @@ }, { "title": "Linux.Do", - "slug": "LINUX_DO", + "slug": "linux_do", "altNames": [ "LINUX DO", "LinxDo" @@ -563,6 +576,7 @@ }, { "title": "NeteaseMail", + "slug": "netease_mail", "altNames": [ "网易邮箱", "Mail.163" @@ -632,10 +646,12 @@ "hex": "f08222" }, { - "title": "pCloud" + "title": "pCloud", + "slug": "pcloud" }, { "title": "PebbleHost", + "slug": "pebble_host", "altNames": [ "Pebble Host" ] @@ -712,6 +728,7 @@ }, { "title": "Restream", + "slug": "restream", "altNames": [ "restream.io" ] @@ -834,6 +851,7 @@ }, { "title": "Terabit", + "slug": "terabit", "altNames": [ "Terabit Hosting", "terabit.io" @@ -962,6 +980,7 @@ }, { "title": "Yandex", + "slug": "yandex", "altNames": [ "Ya", "Яндекс" diff --git a/auth/assets/custom-icons/icons/1xBet.svg b/auth/assets/custom-icons/icons/1x_bet.svg similarity index 100% rename from auth/assets/custom-icons/icons/1xBet.svg rename to auth/assets/custom-icons/icons/1x_bet.svg diff --git a/auth/assets/custom-icons/icons/Binance.svg b/auth/assets/custom-icons/icons/Binance.svg deleted file mode 100644 index 95a229021e..0000000000 --- a/auth/assets/custom-icons/icons/Binance.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/auth/assets/custom-icons/icons/BaiduCloud.svg b/auth/assets/custom-icons/icons/baidu_cloud.svg similarity index 100% rename from auth/assets/custom-icons/icons/BaiduCloud.svg rename to auth/assets/custom-icons/icons/baidu_cloud.svg diff --git a/auth/assets/custom-icons/icons/BBS.NGA.svg b/auth/assets/custom-icons/icons/bbs_nga.svg similarity index 100% rename from auth/assets/custom-icons/icons/BBS.NGA.svg rename to auth/assets/custom-icons/icons/bbs_nga.svg diff --git a/auth/assets/custom-icons/icons/binance.svg b/auth/assets/custom-icons/icons/binance_exchange.svg similarity index 100% rename from auth/assets/custom-icons/icons/binance.svg rename to auth/assets/custom-icons/icons/binance_exchange.svg diff --git a/auth/assets/custom-icons/icons/Bluesky.svg b/auth/assets/custom-icons/icons/blue_sky.svg similarity index 100% rename from auth/assets/custom-icons/icons/Bluesky.svg rename to auth/assets/custom-icons/icons/blue_sky.svg diff --git a/auth/assets/custom-icons/icons/BorgBase.svg b/auth/assets/custom-icons/icons/borg_base.svg similarity index 100% rename from auth/assets/custom-icons/icons/BorgBase.svg rename to auth/assets/custom-icons/icons/borg_base.svg diff --git a/auth/assets/custom-icons/icons/Icedrive.svg b/auth/assets/custom-icons/icons/ice_drive.svg similarity index 100% rename from auth/assets/custom-icons/icons/Icedrive.svg rename to auth/assets/custom-icons/icons/ice_drive.svg diff --git a/auth/assets/custom-icons/icons/IDme.svg b/auth/assets/custom-icons/icons/id_me.svg similarity index 100% rename from auth/assets/custom-icons/icons/IDme.svg rename to auth/assets/custom-icons/icons/id_me.svg diff --git a/auth/assets/custom-icons/icons/Ko-fi.svg b/auth/assets/custom-icons/icons/ko_fi.svg similarity index 100% rename from auth/assets/custom-icons/icons/Ko-fi.svg rename to auth/assets/custom-icons/icons/ko_fi.svg diff --git a/auth/assets/custom-icons/icons/NeteaseMail.svg b/auth/assets/custom-icons/icons/netease_mail.svg similarity index 100% rename from auth/assets/custom-icons/icons/NeteaseMail.svg rename to auth/assets/custom-icons/icons/netease_mail.svg diff --git a/auth/assets/custom-icons/icons/PebbleHost.svg b/auth/assets/custom-icons/icons/pebble_host.svg similarity index 100% rename from auth/assets/custom-icons/icons/PebbleHost.svg rename to auth/assets/custom-icons/icons/pebble_host.svg From 2562fd05ae2e875c2607f7511b0b18a971d3aa0a Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 4 Dec 2024 09:54:17 +0530 Subject: [PATCH 3/7] [auth] Rename enom icon --- auth/assets/custom-icons/_data/custom-icons.json | 2 +- auth/assets/custom-icons/icons/{Enom.svg => enom_v1.svg} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename auth/assets/custom-icons/icons/{Enom.svg => enom_v1.svg} (100%) diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json index e3a63d4658..f66c0d7c8e 100644 --- a/auth/assets/custom-icons/_data/custom-icons.json +++ b/auth/assets/custom-icons/_data/custom-icons.json @@ -281,7 +281,7 @@ }, { "title": "enom", - "slug": "enom" + "slug": "enom_v1" }, { "title": "Epic Games", diff --git a/auth/assets/custom-icons/icons/Enom.svg b/auth/assets/custom-icons/icons/enom_v1.svg similarity index 100% rename from auth/assets/custom-icons/icons/Enom.svg rename to auth/assets/custom-icons/icons/enom_v1.svg From c4970e9df8254733f76ca9a948c2e630c650b7be Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 4 Dec 2024 09:59:08 +0530 Subject: [PATCH 4/7] [auth] Fix icon case for git --- auth/assets/custom-icons/icons/{enom_v1.svg => enom.svg} | 0 auth/assets/custom-icons/icons/{IVPN.svg => ivpn.svg} | 0 auth/assets/custom-icons/icons/{Lark.svg => lark.svg} | 0 auth/assets/custom-icons/icons/{Terabit.svg => terabit.svg} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename auth/assets/custom-icons/icons/{enom_v1.svg => enom.svg} (100%) rename auth/assets/custom-icons/icons/{IVPN.svg => ivpn.svg} (100%) rename auth/assets/custom-icons/icons/{Lark.svg => lark.svg} (100%) rename auth/assets/custom-icons/icons/{Terabit.svg => terabit.svg} (100%) diff --git a/auth/assets/custom-icons/icons/enom_v1.svg b/auth/assets/custom-icons/icons/enom.svg similarity index 100% rename from auth/assets/custom-icons/icons/enom_v1.svg rename to auth/assets/custom-icons/icons/enom.svg diff --git a/auth/assets/custom-icons/icons/IVPN.svg b/auth/assets/custom-icons/icons/ivpn.svg similarity index 100% rename from auth/assets/custom-icons/icons/IVPN.svg rename to auth/assets/custom-icons/icons/ivpn.svg diff --git a/auth/assets/custom-icons/icons/Lark.svg b/auth/assets/custom-icons/icons/lark.svg similarity index 100% rename from auth/assets/custom-icons/icons/Lark.svg rename to auth/assets/custom-icons/icons/lark.svg diff --git a/auth/assets/custom-icons/icons/Terabit.svg b/auth/assets/custom-icons/icons/terabit.svg similarity index 100% rename from auth/assets/custom-icons/icons/Terabit.svg rename to auth/assets/custom-icons/icons/terabit.svg From e3a4f419f4bd982dec6e5bd1c015ff61d3fa232f Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:15:21 +0530 Subject: [PATCH 5/7] [auth] Move custom icon validation on top --- .github/workflows/auth-lint.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/auth-lint.yml b/.github/workflows/auth-lint.yml index 53d5047113..575a5e6dc3 100644 --- a/.github/workflows/auth-lint.yml +++ b/.github/workflows/auth-lint.yml @@ -22,6 +22,18 @@ jobs: with: submodules: recursive + - name: Verify custom icons are lowercase including optional understores, and end with .svg + run: | + find assets/custom-icons -type f -name "*.svg" | while read -r file; do + if [[ "$(basename "$file")" != "$(basename "$file" | tr '[:upper:]' '[:lower:]' | tr ' ' '_')" ]]; then + echo "File name is not lowercase: $file" + exit 1 + fi + done + + - name: Verify custom icon JSON + run: cat assets/custom-icons/_data/custom-icons.json | jq empty + - name: Install Flutter ${{ env.FLUTTER_VERSION }} uses: subosito/flutter-action@v2 with: @@ -32,16 +44,3 @@ jobs: - run: flutter pub get - run: flutter analyze --no-fatal-infos - - - name: Verify custom icons are lowercase including optional understores, and end with .svg - run: | - find assets/custom-icons -type f -name "*.svg" | while read -r file; do - if [[ "$(basename "$file")" != "$(basename "$file" | tr '[:upper:]' '[:lower:]' | tr ' ' '_')" ]]; then - echo "File name is not lowercase: $file" - exit 1 - fi - done - - - - name: Verify custom icon JSON - run: cat assets/custom-icons/_data/custom-icons.json | jq empty From 689045d06bb47ec41387bc8f2d3dff514f5b5c3b Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:18:20 +0530 Subject: [PATCH 6/7] [auth] Fix case issue for git --- auth/assets/custom-icons/icons/{BAND.svg => band.svg} | 0 auth/assets/custom-icons/icons/{CERN.svg => cern.svg} | 0 auth/assets/custom-icons/icons/{Gosuslugi.svg => gosuslugi.svg} | 0 auth/assets/custom-icons/icons/{LINUX_DO.svg => linux_do.svg} | 0 auth/assets/custom-icons/icons/{Restream.svg => restream.svg} | 0 auth/assets/custom-icons/icons/{Yandex.svg => yandex.svg} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename auth/assets/custom-icons/icons/{BAND.svg => band.svg} (100%) rename auth/assets/custom-icons/icons/{CERN.svg => cern.svg} (100%) rename auth/assets/custom-icons/icons/{Gosuslugi.svg => gosuslugi.svg} (100%) rename auth/assets/custom-icons/icons/{LINUX_DO.svg => linux_do.svg} (100%) rename auth/assets/custom-icons/icons/{Restream.svg => restream.svg} (100%) rename auth/assets/custom-icons/icons/{Yandex.svg => yandex.svg} (100%) diff --git a/auth/assets/custom-icons/icons/BAND.svg b/auth/assets/custom-icons/icons/band.svg similarity index 100% rename from auth/assets/custom-icons/icons/BAND.svg rename to auth/assets/custom-icons/icons/band.svg diff --git a/auth/assets/custom-icons/icons/CERN.svg b/auth/assets/custom-icons/icons/cern.svg similarity index 100% rename from auth/assets/custom-icons/icons/CERN.svg rename to auth/assets/custom-icons/icons/cern.svg diff --git a/auth/assets/custom-icons/icons/Gosuslugi.svg b/auth/assets/custom-icons/icons/gosuslugi.svg similarity index 100% rename from auth/assets/custom-icons/icons/Gosuslugi.svg rename to auth/assets/custom-icons/icons/gosuslugi.svg diff --git a/auth/assets/custom-icons/icons/LINUX_DO.svg b/auth/assets/custom-icons/icons/linux_do.svg similarity index 100% rename from auth/assets/custom-icons/icons/LINUX_DO.svg rename to auth/assets/custom-icons/icons/linux_do.svg diff --git a/auth/assets/custom-icons/icons/Restream.svg b/auth/assets/custom-icons/icons/restream.svg similarity index 100% rename from auth/assets/custom-icons/icons/Restream.svg rename to auth/assets/custom-icons/icons/restream.svg diff --git a/auth/assets/custom-icons/icons/Yandex.svg b/auth/assets/custom-icons/icons/yandex.svg similarity index 100% rename from auth/assets/custom-icons/icons/Yandex.svg rename to auth/assets/custom-icons/icons/yandex.svg From 1f29efb060f384baa2e46535e767038e55997c60 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:19:44 +0530 Subject: [PATCH 7/7] [auth] Fix case issue for git --- auth/assets/custom-icons/icons/{pCloud.svg => pcloud.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename auth/assets/custom-icons/icons/{pCloud.svg => pcloud.svg} (100%) diff --git a/auth/assets/custom-icons/icons/pCloud.svg b/auth/assets/custom-icons/icons/pcloud.svg similarity index 100% rename from auth/assets/custom-icons/icons/pCloud.svg rename to auth/assets/custom-icons/icons/pcloud.svg