Skip to content

Commit fc500ba

Browse files
authored
Remove null-safety badge. (#8958)
1 parent 15886cd commit fc500ba

File tree

7 files changed

+6
-37
lines changed

7 files changed

+6
-37
lines changed

app/lib/frontend/templates/package_misc.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ final nameMatchBadgeNode = packageBadgeNode(
3535
color: 'name-match',
3636
);
3737

38-
/// Renders the null-safe badge used by package listing and package page.
39-
d.Node nullSafeBadgeNode({String? title}) {
40-
return packageBadgeNode(
41-
label: 'Null safety',
42-
title: title ?? 'Supports the null safety language feature.',
43-
);
44-
}
45-
4638
/// Renders the Dart 3 compatible badge.
4739
final dart3CompatibleNode = packageBadgeNode(
4840
label: 'Dart 3 compatible',

app/lib/frontend/templates/views/pkg/header.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ d.Node packageHeaderNode({
2222
d.span(child: d.xAgoTimestamp(published)),
2323
d.text(' '),
2424
if (publisherId != null) ..._publisher(publisherId),
25-
if (isNullSafe && !isDart3Compatible) nullSafeBadgeNode(),
2625
if (isDart3Compatible) dart3CompatibleNode,
2726
if (isDart3Incompatible) dart3IncompatibleNode,
2827
if (releases != null) ..._releases(packageName, releases),

app/lib/frontend/templates/views/pkg/package_list.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ d.Node _sdkLibraryItem(SdkLibraryHit hit) {
7373
text: sdkDict.libraryTypeLabel,
7474
),
7575
coreLibraryBadgeNode,
76-
nullSafeBadgeNode(),
7776
]),
7877
tagsNode: null,
7978
replacedBy: null,
@@ -94,7 +93,6 @@ d.Node _packageItem(
9493
required bool isLiked,
9594
}) {
9695
final isFlutterFavorite = view.tags.contains(PackageTags.isFlutterFavorite);
97-
final isNullSafe = view.tags.contains(PackageVersionTags.isNullSafe);
9896
final isDart3Compatible = view.tags.contains(
9997
PackageVersionTags.isDart3Compatible,
10098
);
@@ -157,7 +155,6 @@ d.Node _packageItem(
157155
if (licenseNode != null)
158156
d.span(classes: ['packages-metadata-block'], child: licenseNode),
159157
if (isFlutterFavorite) flutterFavoriteBadgeNode,
160-
if (isNullSafe && !isDart3Compatible) nullSafeBadgeNode(),
161158
if (isDart3Compatible) dart3CompatibleNode,
162159
if (isDart3Incompatible) dart3IncompatibleNode,
163160
]);

app/lib/frontend/templates/views/pkg/versions/version_row.dart

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import '../../../../../package/model_properties.dart';
99
import '../../../../../shared/urls.dart' as urls;
1010
import '../../../../dom/dom.dart' as d;
1111
import '../../../../static_files.dart';
12-
import '../../../package_misc.dart';
1312

1413
d.Node versionRowNode(
1514
String package,
@@ -29,14 +28,7 @@ d.Node versionRowNode(
2928
title: 'Visit $package ${version.version} page',
3029
),
3130
),
32-
d.td(
33-
classes: ['badge'],
34-
child: pubspec.hasOptedIntoNullSafety
35-
? nullSafeBadgeNode(
36-
title: 'Package version is opted into null safety.',
37-
)
38-
: null,
39-
),
31+
d.td(classes: ['badge'], child: null),
4032
d.td(
4133
classes: ['sdk'],
4234
child: sdk != null

app/test/frontend/golden/pkg_index_page.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ <h3 class="packages-title pub-monochrome-icon-hoverable">
446446
<p class="packages-metadata">
447447
<span class="packages-metadata-block">Dart SDK library</span>
448448
<span class="package-badge">Core library</span>
449-
<span class="package-badge" title="Supports the null safety language feature.">Null safety</span>
450449
</p>
451450
</div>
452451
</div>

app/test/frontend/golden/pkg_versions_page.html

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,7 @@ <h2 id="stable">Stable versions of oxygen</h2>
249249
<td class="version">
250250
<a href="/packages/oxygen/versions/1.2.0" title="Visit oxygen 1.2.0 page">1.2.0</a>
251251
</td>
252-
<td class="badge">
253-
<span class="package-badge" title="Package version is opted into null safety.">Null safety</span>
254-
</td>
252+
<td class="badge"></td>
255253
<td class="sdk">3.0</td>
256254
<td class="uploaded">
257255
<a class="-x-ago" href="" title="%%version-created-date%%" role="button" data-timestamp="%%millis%%">%%x-ago%%</a>
@@ -271,9 +269,7 @@ <h2 id="stable">Stable versions of oxygen</h2>
271269
<td class="version">
272270
<a href="/packages/oxygen/versions/1.0.0" title="Visit oxygen 1.0.0 page">1.0.0</a>
273271
</td>
274-
<td class="badge">
275-
<span class="package-badge" title="Package version is opted into null safety.">Null safety</span>
276-
</td>
272+
<td class="badge"></td>
277273
<td class="sdk">3.0</td>
278274
<td class="uploaded">
279275
<a class="-x-ago" href="" title="%%version-created-date%%" role="button" data-timestamp="%%millis%%">%%x-ago%%</a>
@@ -316,9 +312,7 @@ <h2 id="prerelease">Prerelease versions of oxygen</h2>
316312
<td class="version">
317313
<a href="/packages/oxygen/versions/2.0.0-dev" title="Visit oxygen 2.0.0-dev page">2.0.0-dev</a>
318314
</td>
319-
<td class="badge">
320-
<span class="package-badge" title="Package version is opted into null safety.">Null safety</span>
321-
</td>
315+
<td class="badge"></td>
322316
<td class="sdk">3.0</td>
323317
<td class="uploaded">
324318
<a class="-x-ago" href="" title="%%version-created-date%%" role="button" data-timestamp="%%millis%%">%%x-ago%%</a>

app/test/task/testdata/goldens/packages/oxygen/versions.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,7 @@ <h2 id="stable">Stable versions of oxygen</h2>
235235
<td class="version">
236236
<a href="/packages/oxygen/versions/2.0.0" title="Visit oxygen 2.0.0 page">2.0.0</a>
237237
</td>
238-
<td class="badge">
239-
<span class="package-badge" title="Package version is opted into null safety.">Null safety</span>
240-
</td>
238+
<td class="badge"></td>
241239
<td class="sdk">3.0</td>
242240
<td class="uploaded">
243241
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>
@@ -257,9 +255,7 @@ <h2 id="stable">Stable versions of oxygen</h2>
257255
<td class="version">
258256
<a href="/packages/oxygen/versions/1.0.0" title="Visit oxygen 1.0.0 page">1.0.0</a>
259257
</td>
260-
<td class="badge">
261-
<span class="package-badge" title="Package version is opted into null safety.">Null safety</span>
262-
</td>
258+
<td class="badge"></td>
263259
<td class="sdk">3.0</td>
264260
<td class="uploaded">
265261
<a class="-x-ago" href="" title="%%short-dateformat%%" role="button" data-timestamp="%%time-ago-millis%%">%%time-ago%%</a>

0 commit comments

Comments
 (0)