New wording: Flutter-compatible and Flutter-only (#1536)

isoos · web-flow · commit 65dde0381012 · 2018-08-22T14:07:53.000+02:00
* Change Flutter-specific to Flutter-only.

* Refactor plaform-related consts.

* Explicit morePlatformPackagesLabel field in dict.

* Update Flutter-compatible/only labels.

* Update search placeholder label.

* web-compatible labels without web-only url.
diff --git a/app/lib/frontend/template_consts.dart b/app/lib/frontend/template_consts.dart
@@ -4,6 +4,7 @@
 
 import 'dart:convert';
 
+import 'package:meta/meta.dart';
 import 'package:pana/models.dart' show SuggestionCode;
 
 import 'package:pub_dartlang_org/shared/platform.dart' show KnownPlatforms;
@@ -12,26 +13,50 @@ import '../shared/urls.dart' as urls;
 
 class PlatformDict {
   final String name;
-  final String pageTitle;
+  final String topPlatformPackages;
+  final String morePlatformPackagesLabel;
+  final String onlyPlatformPackagesLabel;
+  final String onlyPlatformPackagesUrl;
+  final String searchPlatformPackagesLabel;
   final String landingPageTitle;
   final String landingBlurb;
   final String landingUrl;
   final String listingUrl;
   final String tagTitle;
 
   PlatformDict({
-    this.name,
-    String pageTitle,
-    this.landingPageTitle,
-    this.landingBlurb,
-    this.landingUrl,
-    this.listingUrl,
-    this.tagTitle,
-  }) : this.pageTitle = pageTitle ?? 'Top $name packages';
-
-  factory PlatformDict.forPlatform(String platform, {String tagTitle}) {
+    @required this.name,
+    @required this.topPlatformPackages,
+    @required this.morePlatformPackagesLabel,
+    @required this.onlyPlatformPackagesLabel,
+    @required this.onlyPlatformPackagesUrl,
+    @required this.searchPlatformPackagesLabel,
+    @required this.landingPageTitle,
+    @required this.landingBlurb,
+    @required this.landingUrl,
+    @required this.listingUrl,
+    @required this.tagTitle,
+  });
+
+  factory PlatformDict.forPlatform(
+    String platform, {
+    String tagTitle,
+    String onlyPlatformPackagesUrl,
+  }) {
+    final formattedPlatform = _formattedPlatformName(platform);
+    final hasOnly = onlyPlatformPackagesUrl != null;
+    final hasCompatible = hasOnly || platform == KnownPlatforms.web;
+    final platformCompatible =
+        hasCompatible ? '$formattedPlatform-compatible' : formattedPlatform;
+    final platformOnly =
+        hasOnly ? '$formattedPlatform-only' : formattedPlatform;
     return new PlatformDict(
-      name: _formattedPlatformName(platform),
+      name: formattedPlatform,
+      topPlatformPackages: 'Top $platformCompatible packages',
+      morePlatformPackagesLabel: 'More $platformCompatible packages...',
+      onlyPlatformPackagesLabel: hasOnly ? '$platformOnly packages...' : null,
+      onlyPlatformPackagesUrl: onlyPlatformPackagesUrl,
+      searchPlatformPackagesLabel: 'Search $platformCompatible packages',
       landingPageTitle: _landingPageTitle(platform),
       landingBlurb: _landingBlurb(platform),
       landingUrl: platform == null ? '/' : '/$platform',
@@ -55,6 +80,7 @@ final _dictionaries = <String, PlatformDict>{
   KnownPlatforms.flutter: new PlatformDict.forPlatform(
     KnownPlatforms.flutter,
     tagTitle: 'Compatible with the Flutter platform.',
+    onlyPlatformPackagesUrl: '/packages?q=dependency%3Aflutter',
   ),
   KnownPlatforms.web: new PlatformDict.forPlatform(
     KnownPlatforms.web,
@@ -63,6 +89,15 @@ final _dictionaries = <String, PlatformDict>{
   KnownPlatforms.other: new PlatformDict(
     name: KnownPlatforms.other,
     tagTitle: 'Compatible with other platforms (terminal, server, etc.).',
+    listingUrl: null, // no listing for platform tag
+    topPlatformPackages: null, // no landing page
+    morePlatformPackagesLabel: null, // no search filter for it
+    onlyPlatformPackagesLabel: null, // no search filter for it
+    onlyPlatformPackagesUrl: null, // no search filter for it
+    searchPlatformPackagesLabel: null, // no search filter for it
+    landingUrl: null,
+    landingPageTitle: null,
+    landingBlurb: null,
   ),
 };
 
@@ -149,9 +184,6 @@ final String defaultPageDescriptionEscaped = htmlEscape.convert(
     'Pub is the package manager for the Dart programming language, containing reusable '
     'libraries & packages for Flutter, AngularDart, and general Dart programs.');
 
-String flutterSpecificPackagesHtml =
-    '<a href="/packages?q=dependency%3Aflutter">Flutter-specific packages...</a>';
-
 final _suggestionHelpMessages = <String, String>{
   SuggestionCode.analysisOptionsRenameRequired: 'Read more about the setup of '
       '<a href="https://www.dartlang.org/guides/language/analysis-options#the-analysis-options-file">'
diff --git a/app/lib/frontend/templates.dart b/app/lib/frontend/templates.dart
@@ -159,7 +159,7 @@ class TemplateService {
       'ranking_tooltip_html': sortDict.tooltip,
       'is_search': isSearch,
       'unsupported_qualifier': unsupportedQualifier,
-      'title': platformDict.pageTitle,
+      'title': platformDict.topPlatformPackages,
       'packages': packagesJson,
       'has_packages': packages.isNotEmpty,
       'pagination': renderPagination(links),
@@ -168,7 +168,7 @@ class TemplateService {
     };
     final content = _renderTemplate('pkg/index', values);
 
-    String pageTitle = platformDict.pageTitle;
+    String pageTitle = platformDict.topPlatformPackages;
     if (isSearch) {
       pageTitle = 'Search results for ${searchQuery.query}.';
     } else {
@@ -647,16 +647,16 @@ class TemplateService {
   ) {
     final platformDict = getPlatformDict(platform);
     final packagesUrl = urls.searchUrl(platform: platform);
-    final morePackages = 'More ${platformDict.name} packages...';
     final links = <String>[
-      '<a href="$packagesUrl">${_htmlEscaper.convert(morePackages)}</a>'
+      '<a href="$packagesUrl">${_htmlEscaper.convert(platformDict.morePlatformPackagesLabel)}</a>'
     ];
-    if (platform == KnownPlatforms.flutter) {
-      links.add(flutterSpecificPackagesHtml);
+    if (platformDict.onlyPlatformPackagesUrl != null) {
+      links.add('<a href="${platformDict.onlyPlatformPackagesUrl}">'
+          '${_htmlEscaper.convert(platformDict.onlyPlatformPackagesLabel)}</a>');
     }
     final values = {
       'more_links_html': links.join(' '),
-      'top_header': platformDict.pageTitle,
+      'top_header': platformDict.topPlatformPackages,
       'ranking_tooltip_html': getSortDict('top').tooltip,
       'top_html': topHtml,
     };
@@ -725,7 +725,7 @@ class TemplateService {
       'title': htmlEscape.convert(title),
       'search_platform': platform,
       'search_query': escapedSearchQuery,
-      'search_query_placeholder': 'Search ${platformDict.name} packages',
+      'search_query_placeholder': platformDict.searchPlatformPackagesLabel,
       'search_sort_param': searchSort,
       'platform_tabs_html': platformTabs,
       'api_search_enabled': searchQuery?.isApiEnabled ?? true,
diff --git a/app/test/frontend/golden/flutter_landing_page.html b/app/test/frontend/golden/flutter_landing_page.html
@@ -66,7 +66,7 @@ <h1 class="_visuallyhidden">Dart pub</h1>
       <h2 class="_visuallyhidden">Dart package manager</h2>
       <img class="logo" src="/static/img/flutter-packages.png" alt="Flutter packages" />
       <form class="search-bar" action="/flutter/packages">
-        <input class="input" name="q" placeholder="Search Flutter packages" autocomplete="on" autofocus />
+        <input class="input" name="q" placeholder="Search Flutter-compatible packages" autocomplete="on" autofocus />
         <button class="icon"></button>
       </form>
       <div class="list-filters">
@@ -83,7 +83,7 @@ <h2 class="_visuallyhidden">Dart package manager</h2>
 <div class="home-lists-container">
   <div class="landing-page-title-block">
     <div class="tooltip-base hoverable">
-      <h2 class="center landing-page-title tooltip-dotted">Top Flutter packages</h2>
+      <h2 class="center landing-page-title tooltip-dotted">Top Flutter-compatible packages</h2>
       <div class="tooltip-content">
         Packages are sorted by the overall score. More information on <a href="/help#ranking">ranking</a>.
       </div>
@@ -102,7 +102,7 @@ <h3 class="title"><a href="/packages/foobar_pkg">foobar_pkg</a></h3>
 </ul>
 
   <div class="more">
-    <a href="/flutter/packages">More Flutter packages...</a> <a href="/packages?q=dependency%3Aflutter">Flutter-specific packages...</a>
+    <a href="/flutter/packages">More Flutter-compatible packages...</a> <a href="/packages?q=dependency%3Aflutter">Flutter-only packages...</a>
   </div>
 </div>
 
diff --git a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html
@@ -62,7 +62,7 @@ <h1 class="_visuallyhidden">Dart pub</h1>
   <div class="_banner-bg">
     <main class="package-banner">
       <form class="search-bar" action="/flutter/packages">
-        <input class="input" name="q" placeholder="Search Flutter packages" autocomplete="on" autofocus />
+        <input class="input" name="q" placeholder="Search Flutter-compatible packages" autocomplete="on" autofocus />
         <button class="icon"></button>
       </form>
     </main>
diff --git a/app/test/frontend/golden/web_landing_page.html b/app/test/frontend/golden/web_landing_page.html
@@ -66,7 +66,7 @@ <h1 class="_visuallyhidden">Dart pub</h1>
       <h2 class="_visuallyhidden">Dart package manager</h2>
       <img class="logo" src="/static/img/dart-packages.png" alt="Dart packages" />
       <form class="search-bar" action="/web/packages">
-        <input class="input" name="q" placeholder="Search web packages" autocomplete="on" autofocus />
+        <input class="input" name="q" placeholder="Search web-compatible packages" autocomplete="on" autofocus />
         <button class="icon"></button>
       </form>
       <div class="list-filters">
@@ -83,7 +83,7 @@ <h2 class="_visuallyhidden">Dart package manager</h2>
 <div class="home-lists-container">
   <div class="landing-page-title-block">
     <div class="tooltip-base hoverable">
-      <h2 class="center landing-page-title tooltip-dotted">Top web packages</h2>
+      <h2 class="center landing-page-title tooltip-dotted">Top web-compatible packages</h2>
       <div class="tooltip-content">
         Packages are sorted by the overall score. More information on <a href="/help#ranking">ranking</a>.
       </div>
@@ -102,7 +102,7 @@ <h3 class="title"><a href="/packages/foobar_pkg">foobar_pkg</a></h3>
 </ul>
 
   <div class="more">
-    <a href="/web/packages">More web packages...</a>
+    <a href="/web/packages">More web-compatible packages...</a>
   </div>
 </div>
 
