From b2c7bb1c87da7c90f252adaa2a0adc0e81b7bd4d Mon Sep 17 00:00:00 2001 From: James Leahy Date: Thu, 15 Feb 2024 08:53:10 +0100 Subject: [PATCH 1/2] chore: Remove dev releases --- lib/src/modules/common/constants.dart | 3 +-- lib/src/modules/releases/releases.provider.dart | 3 --- .../search/components/search_results_list.dart | 16 ---------------- lib/src/modules/search/search.provider.dart | 12 +----------- 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/lib/src/modules/common/constants.dart b/lib/src/modules/common/constants.dart index 1d78202d..24603088 100644 --- a/lib/src/modules/common/constants.dart +++ b/lib/src/modules/common/constants.dart @@ -17,7 +17,7 @@ const kNavigationWidth = 65.0; const kNavigationWidthExtended = 180.0; /// Channels without master -const kReleaseChannels = ['stable', 'beta', 'dev']; +const kReleaseChannels = ['stable', 'beta']; /// Master channel const kMasterChannel = 'master'; @@ -35,6 +35,5 @@ const kFlutterTagsUrl = 'https://github.com/flutter/flutter/releases/tag/'; Map channelDescriptions(BuildContext context) => { 'stable': context.i18n('modules:common.stableChannelDescription'), 'beta': context.i18n('modules:common.betaChannelDescription'), - 'dev': context.i18n('modules:common.devChannelDescription'), 'master': context.i18n('modules:common.masterChannelDescription'), }; diff --git a/lib/src/modules/releases/releases.provider.dart b/lib/src/modules/releases/releases.provider.dart index efcef4d8..865e4488 100644 --- a/lib/src/modules/releases/releases.provider.dart +++ b/lib/src/modules/releases/releases.provider.dart @@ -197,7 +197,6 @@ final getVersionProvider = Provider.family( enum Filter { beta, stable, - dev, all, } @@ -214,8 +213,6 @@ Filter filterFromName(String name) { switch (name) { case 'stable': return Filter.stable; - case 'dev': - return Filter.dev; case 'beta': return Filter.beta; case 'all': diff --git a/lib/src/modules/search/components/search_results_list.dart b/lib/src/modules/search/components/search_results_list.dart index 0d366195..05739dd0 100644 --- a/lib/src/modules/search/components/search_results_list.dart +++ b/lib/src/modules/search/components/search_results_list.dart @@ -96,22 +96,6 @@ class SearchResultsList extends StatelessWidget { ), ], ), - SliverSection( - shouldDisplay: results.devReleases.isNotEmpty, - slivers: [ - SliverPersistentHeader( - delegate: SliverHeaderDelegate( - title: context.i18n('modules:search.components.devReleases'), - count: results.devReleases.length, - ), - ), - SliverList( - delegate: SliverChildBuilderDelegate((context, index) { - return ReleaseListItem(results.devReleases[index]); - }, childCount: results.devReleases.length), - ), - ], - ), ], ), ); diff --git a/lib/src/modules/search/search.provider.dart b/lib/src/modules/search/search.provider.dart index 172ab474..6f7eb1b6 100644 --- a/lib/src/modules/search/search.provider.dart +++ b/lib/src/modules/search/search.provider.dart @@ -40,16 +40,12 @@ class SearchResults { /// Beta Releases final List betaReleases; - /// Dev Releases - final List devReleases; - /// Constructor SearchResults({ this.projects = const [], this.channels = const [], this.stableReleases = const [], this.betaReleases = const [], - this.devReleases = const [], }); /// No results @@ -57,8 +53,7 @@ class SearchResults { return projects.isEmpty && channels.isEmpty && stableReleases.isEmpty && - betaReleases.isEmpty && - devReleases.isEmpty; + betaReleases.isEmpty; } } @@ -84,7 +79,6 @@ final searchResultsProvider = Provider((ref) { final channelResults = []; final stableReleaseResults = []; final betaReleaseResults = []; - final devReleaseResults = []; // We look for multiple terms, make sure result only shows up once final uniques = {}; @@ -141,9 +135,6 @@ final searchResultsProvider = Provider((ref) { case Channel.beta: betaReleaseResults.add(release); break; - case Channel.dev: - devReleaseResults.add(release); - break; default: /// TODO: If this logic is removed, it should support passing actual Context @@ -175,6 +166,5 @@ final searchResultsProvider = Provider((ref) { projects: projectResults, stableReleases: stableReleaseResults, betaReleases: betaReleaseResults, - devReleases: devReleaseResults, ); }); From d85aa63d647b0ed6db7cb5c20612c27cdaa26dbf Mon Sep 17 00:00:00 2001 From: James Leahy Date: Sun, 18 Feb 2024 10:32:48 +0100 Subject: [PATCH 2/2] Remove modules:search.components.devReleases key --- localizations/ar-SA/modules.json | 1 - localizations/bn-BD/modules.json | 1 - localizations/de-DE/modules.json | 1 - localizations/en-GB/modules.json | 1 - localizations/en-US/modules.json | 1 - localizations/es-ES/modules.json | 1 - localizations/fr-FR/modules.json | 1 - localizations/hi-IN/modules.json | 1 - localizations/id-ID/modules.json | 1 - localizations/it-IT/modules.json | 1 - localizations/ja-JP/modules.json | 1 - localizations/ko-KR/modules.json | 1 - localizations/pl-PL/modules.json | 1 - localizations/pt-BR/modules.json | 1 - localizations/ru-RU/modules.json | 1 - localizations/sv-SE/modules.json | 1 - localizations/tr-TR/modules.json | 1 - localizations/uk-UA/modules.json | 1 - localizations/uz-CY/modules.json | 1 - localizations/uz-LA/modules.json | 1 - localizations/zh-CN/modules.json | 1 - localizations/zh-TW/modules.json | 1 - 22 files changed, 22 deletions(-) diff --git a/localizations/ar-SA/modules.json b/localizations/ar-SA/modules.json index d974fd88..62139057 100644 --- a/localizations/ar-SA/modules.json +++ b/localizations/ar-SA/modules.json @@ -106,7 +106,6 @@ "channels": "القنوات", "stableReleases": "الإصدارات المستقرة", "betaReleases": "الإصدارات التجريبية", - "devReleases": "الإصدارات التجريبية \"مطورين\"", "invalidChanel": "قناة غير صالحة" } }, diff --git a/localizations/bn-BD/modules.json b/localizations/bn-BD/modules.json index 8a7a2a61..29f3a9b6 100644 --- a/localizations/bn-BD/modules.json +++ b/localizations/bn-BD/modules.json @@ -106,7 +106,6 @@ "channels": "চ্যানেলসমূহ", "stableReleases": "স্টেবল রিলিজেস", "betaReleases": "বিটা রিলিজেস", - "devReleases": "ডেভ রিলিজেস", "invalidChanel": "অবৈধ চ্যানেল" } }, diff --git a/localizations/de-DE/modules.json b/localizations/de-DE/modules.json index 3b03b5f1..7ede99b0 100644 --- a/localizations/de-DE/modules.json +++ b/localizations/de-DE/modules.json @@ -106,7 +106,6 @@ "channels": "Channels", "stableReleases": "Stable Releases", "betaReleases": "Beta Releases", - "devReleases": "Dev Releases", "invalidChannel": "Ungültiger Channel" } }, diff --git a/localizations/en-GB/modules.json b/localizations/en-GB/modules.json index fa23a8b7..3aa25488 100644 --- a/localizations/en-GB/modules.json +++ b/localizations/en-GB/modules.json @@ -106,7 +106,6 @@ "channels": "Channels", "stableReleases": "Stable Releases", "betaReleases": "Beta Releases", - "devReleases": "Dev Releases", "invalidChanel": "Invalid Channel" } }, diff --git a/localizations/en-US/modules.json b/localizations/en-US/modules.json index b3d84f67..09e7101f 100644 --- a/localizations/en-US/modules.json +++ b/localizations/en-US/modules.json @@ -106,7 +106,6 @@ "channels": "Channels", "stableReleases": "Stable Releases", "betaReleases": "Beta Releases", - "devReleases": "Dev Releases", "invalidChanel": "Invalid Channel" } }, diff --git a/localizations/es-ES/modules.json b/localizations/es-ES/modules.json index b96366c3..15674880 100644 --- a/localizations/es-ES/modules.json +++ b/localizations/es-ES/modules.json @@ -106,7 +106,6 @@ "channels": "Canales", "stableReleases": "Vesiones Estables", "betaReleases": "Versiones Beta", - "devReleases": "Versiones Dev", "invalidChanel": "Canal inválido" } }, diff --git a/localizations/fr-FR/modules.json b/localizations/fr-FR/modules.json index 82d4a22b..0a29c561 100644 --- a/localizations/fr-FR/modules.json +++ b/localizations/fr-FR/modules.json @@ -106,7 +106,6 @@ "channels": "Branches", "stableReleases": "Releases stables", "betaReleases": "Releases beta", - "devReleases": "Releases dev", "invalidChanel": "Branche invalide" } }, diff --git a/localizations/hi-IN/modules.json b/localizations/hi-IN/modules.json index 40163757..41d3bef8 100644 --- a/localizations/hi-IN/modules.json +++ b/localizations/hi-IN/modules.json @@ -106,7 +106,6 @@ "channels": "चैनल", "stableReleases": "स्टैबल रिलीज", "betaReleases": "बीटा रिलीज", - "devReleases": "देव रिलीज", "invalidChanel": "अमान्य चैनल" } }, diff --git a/localizations/id-ID/modules.json b/localizations/id-ID/modules.json index b0e91e9b..494658ce 100644 --- a/localizations/id-ID/modules.json +++ b/localizations/id-ID/modules.json @@ -106,7 +106,6 @@ "channels": "Channel", "stableReleases": "Rilis Stabil", "betaReleases": "Rilis Beta", - "devReleases": "Rilis Dev", "invalidChanel": "Channel Tidak Valid" } }, diff --git a/localizations/it-IT/modules.json b/localizations/it-IT/modules.json index aebc5c80..02eef030 100644 --- a/localizations/it-IT/modules.json +++ b/localizations/it-IT/modules.json @@ -106,7 +106,6 @@ "channels": "Canali", "stableReleases": "Stable Releases", "betaReleases": "Beta Releases", - "devReleases": "Dev Releases", "invalidChanel": "Canale non valido" } }, diff --git a/localizations/ja-JP/modules.json b/localizations/ja-JP/modules.json index 06b07a88..b1a78399 100644 --- a/localizations/ja-JP/modules.json +++ b/localizations/ja-JP/modules.json @@ -106,7 +106,6 @@ "channels": "チャンネル", "stableReleases": "Stableリリース", "betaReleases": "Betaリリース", - "devReleases": "Devリリース", "invalidChanel": "無効なチャンネル" } }, diff --git a/localizations/ko-KR/modules.json b/localizations/ko-KR/modules.json index 8893d2f6..db986683 100644 --- a/localizations/ko-KR/modules.json +++ b/localizations/ko-KR/modules.json @@ -106,7 +106,6 @@ "channels": "채널", "stableReleases": "안정 버전", "betaReleases": "베타 버전", - "devReleases": "개발자 버전", "invalidChanel": "유효하지 않은 버전" } }, diff --git a/localizations/pl-PL/modules.json b/localizations/pl-PL/modules.json index e589cb2f..6b0636bf 100644 --- a/localizations/pl-PL/modules.json +++ b/localizations/pl-PL/modules.json @@ -106,7 +106,6 @@ "channels": "Kanały", "stableReleases": "Wydania stabilne", "betaReleases": "Wydania beta", - "devReleases": "Wydania developerskie", "invalidChanel": "Niepoprawny kanał" } }, diff --git a/localizations/pt-BR/modules.json b/localizations/pt-BR/modules.json index 322320d9..5dcf04d3 100644 --- a/localizations/pt-BR/modules.json +++ b/localizations/pt-BR/modules.json @@ -106,7 +106,6 @@ "channels": "Canais", "stableReleases": "Releases Estáveis", "betaReleases": "Releases Beta", - "devReleases": "Releases Dev", "invalidChanel": "Canal inválido" } }, diff --git a/localizations/ru-RU/modules.json b/localizations/ru-RU/modules.json index f7915621..fa181267 100644 --- a/localizations/ru-RU/modules.json +++ b/localizations/ru-RU/modules.json @@ -106,7 +106,6 @@ "channels": "Каналы", "stableReleases": "Стабильные релизы", "betaReleases": "Бета-релизы", - "devReleases": "Релизы разработчиков", "invalidChanel": "Некорректный канал" } }, diff --git a/localizations/sv-SE/modules.json b/localizations/sv-SE/modules.json index ece62bf5..7354603f 100644 --- a/localizations/sv-SE/modules.json +++ b/localizations/sv-SE/modules.json @@ -106,7 +106,6 @@ "channels": "Kaneler", "stableReleases": "Stabil releaser", "betaReleases": "Beta releaser", - "devReleases": "Dev releaser", "invalidChanel": "Felaktig kanal" } }, diff --git a/localizations/tr-TR/modules.json b/localizations/tr-TR/modules.json index 414e1d0d..1d2b33bf 100644 --- a/localizations/tr-TR/modules.json +++ b/localizations/tr-TR/modules.json @@ -106,7 +106,6 @@ "channels": "Kanallar", "stableReleases": "Stabil Yayınlar", "betaReleases": "Beta Yayınlar", - "devReleases": "Geliştirici Yayınlar", "invalidChanel": "Geçersiz kanal" } }, diff --git a/localizations/uk-UA/modules.json b/localizations/uk-UA/modules.json index 94a253d0..c21915d4 100644 --- a/localizations/uk-UA/modules.json +++ b/localizations/uk-UA/modules.json @@ -106,7 +106,6 @@ "channels": "Канали", "stableReleases": "Стабільні релізи", "betaReleases": "Бета-релізи", - "devReleases": "Релізи розробників", "invalidChanel": "Недійсний канал" } }, diff --git a/localizations/uz-CY/modules.json b/localizations/uz-CY/modules.json index 888241eb..434b61fd 100644 --- a/localizations/uz-CY/modules.json +++ b/localizations/uz-CY/modules.json @@ -106,7 +106,6 @@ "channels": "Каналлар", "stableReleases": "Барқарор нашрлар", "betaReleases": "Бета нашрлар", - "devReleases": "Ишлаб чиқарувчи нашрлари", "invalidChanel": "Яроқсиз канал" } }, diff --git a/localizations/uz-LA/modules.json b/localizations/uz-LA/modules.json index 8a983aa6..07f44cdb 100644 --- a/localizations/uz-LA/modules.json +++ b/localizations/uz-LA/modules.json @@ -106,7 +106,6 @@ "channels": "Kanallar", "stableReleases": "Barqaror nashrlar", "betaReleases": "Beta nashrlar", - "devReleases": "Ishlab chiqaruvchi nashrlari", "invalidChanel": "Yaroqsiz kanal" } }, diff --git a/localizations/zh-CN/modules.json b/localizations/zh-CN/modules.json index b2f3f3c0..f77b3a0e 100644 --- a/localizations/zh-CN/modules.json +++ b/localizations/zh-CN/modules.json @@ -106,7 +106,6 @@ "channels": "渠道", "stableReleases": "Stable 发行版", "betaReleases": "Beta 发行版", - "devReleases": "Dev 发行版", "invalidChanel": "无效渠道" } }, diff --git a/localizations/zh-TW/modules.json b/localizations/zh-TW/modules.json index b4627891..f98b67c7 100644 --- a/localizations/zh-TW/modules.json +++ b/localizations/zh-TW/modules.json @@ -106,7 +106,6 @@ "channels": "通道", "stableReleases": "Stable 發行版", "betaReleases": "Beta 發行版", - "devReleases": "Dev 發行版", "invalidChanel": "無效通道" } },