introduce localized text geometry in MaterialLocalizations (flutter#1…

…1829) * introduce localized text geometry in MaterialLocalizations * remove geometry from color text themes * fix merge conflict * optional Localizations * fix fallback; test; docs
ferminfeng · Sep 22, 2017 · b9e1be9 · b9e1be9
1 parent f4f20c2
commit b9e1be9
Show file tree

Hide file tree

Showing 25 changed files with 645 additions and 117 deletions.
diff --git a/packages/flutter/lib/src/material/i18n/localizations.dart b/packages/flutter/lib/src/material/i18n/localizations.dart
@@ -12,6 +12,7 @@
 /// This variable is used by [MaterialLocalizations].
 const Map<String, Map<String, String>> localizations = const <String, Map<String, String>> {
   "ar": const <String, String>{
+    "scriptCategory": r"tall",
     "timeOfDayFormat": r"h:mm a",
     "openAppDrawerTooltip": r"افتح قائمة التنقل",
     "backButtonTooltip": r"الى الخلف",
@@ -40,6 +41,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "postMeridiemAbbreviation": r"م",
   },
   "de": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"HH:mm",
     "openAppDrawerTooltip": r"Navigationsmenü öffnen",
     "backButtonTooltip": r"Zurück",
@@ -68,6 +70,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"LIZENZEN ANZEIGEN",
   },
   "en": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"h:mm a",
     "openAppDrawerTooltip": r"Open navigation menu",
     "backButtonTooltip": r"Back",
@@ -107,6 +110,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "timeOfDayFormat": r"HH:mm",
   },
   "es": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"H:mm",
     "openAppDrawerTooltip": r"Abrir el menú de navegación",
     "backButtonTooltip": r"Espalda",
@@ -140,6 +144,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "postMeridiemAbbreviation": r"PM",
   },
   "fa": const <String, String>{
+    "scriptCategory": r"tall",
     "timeOfDayFormat": r"H:mm",
     "openAppDrawerTooltip": r"منوی ناوبری را باز کنید",
     "backButtonTooltip": r"بازگشت",
@@ -166,6 +171,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"مشاهده مجوز",
   },
   "fr": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"HH:mm",
     "openAppDrawerTooltip": r"Ouvrir le menu de navigation",
     "backButtonTooltip": r"Retour",
@@ -197,6 +203,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "timeOfDayFormat": r"HH 'h' mm",
   },
   "he": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"H:mm",
     "openAppDrawerTooltip": r"פתח תפריט ניווט",
     "backButtonTooltip": r"אחורה",
@@ -223,6 +230,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"ראה רישיונות",
   },
   "it": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"HH:mm",
     "openAppDrawerTooltip": r"Apri il menu di navigazione",
     "backButtonTooltip": r"Indietro",
@@ -249,6 +257,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"VEDI LE LICENZE",
   },
   "ja": const <String, String>{
+    "scriptCategory": r"dense",
     "timeOfDayFormat": r"H:mm",
     "openAppDrawerTooltip": r"ナビゲーションメニューを開く",
     "backButtonTooltip": r"戻る",
@@ -275,6 +284,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"ライセンス表記",
   },
   "ps": const <String, String>{
+    "scriptCategory": r"tall",
     "timeOfDayFormat": r"HH:mm",
     "openAppDrawerTooltip": r"د پرانیستی نیینګ مینو",
     "backButtonTooltip": r"شاته",
@@ -301,6 +311,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"لیدلس وګورئ",
   },
   "pt": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"HH:mm",
     "openAppDrawerTooltip": r"Abrir menu de navegação",
     "backButtonTooltip": r"Costas",
@@ -327,6 +338,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"VER LICENÇAS",
   },
   "ru": const <String, String>{
+    "scriptCategory": r"English-like",
     "timeOfDayFormat": r"H:mm",
     "openAppDrawerTooltip": r"Открыть меню навигации",
     "backButtonTooltip": r"Назад",
@@ -355,6 +367,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"ПРОСМОТРЕТЬ ЛИЦЕНЗИИ",
   },
   "sd": const <String, String>{
+    "scriptCategory": r"tall",
     "timeOfDayFormat": r"HH:mm",
     "openAppDrawerTooltip": r"اوپن جي مينڊيٽ مينيو",
     "backButtonTooltip": r"پوئتي",
@@ -381,6 +394,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "viewLicensesButtonLabel": r"لائسنس ڏسو",
   },
   "ur": const <String, String>{
+    "scriptCategory": r"tall",
     "timeOfDayFormat": r"h:mm a",
     "openAppDrawerTooltip": r"کھولیں نیویگیشن مینو",
     "backButtonTooltip": r"واپس",
@@ -409,6 +423,7 @@ const Map<String, Map<String, String>> localizations = const <String, Map<String
     "postMeridiemAbbreviation": r"PM",
   },
   "zh": const <String, String>{
+    "scriptCategory": r"dense",
     "timeOfDayFormat": r"ah:mm",
     "openAppDrawerTooltip": r"打开导航菜单",
     "backButtonTooltip": r"返回",

diff --git a/packages/flutter/lib/src/material/i18n/material_ar.arb b/packages/flutter/lib/src/material/i18n/material_ar.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "tall",
   "timeOfDayFormat": "h:mm a",
   "openAppDrawerTooltip": "افتح قائمة التنقل",
   "backButtonTooltip": "الى الخلف",

diff --git a/packages/flutter/lib/src/material/i18n/material_de.arb b/packages/flutter/lib/src/material/i18n/material_de.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "English-like",
   "timeOfDayFormat": "HH:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "German time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "German time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_en.arb b/packages/flutter/lib/src/material/i18n/material_en.arb
@@ -1,4 +1,10 @@
 {
+  "scriptCategory": "English-like",
+  "@scriptCategory": {
+    "description": "The name of the language's script category (see https://material.io/guidelines/style/typography.html#typography-language-categories-reference)",
+    "type": "text"
+  },
+
   "timeOfDayFormat": "h:mm a",
   "@timeOfDayFormat": {
     "description": "The ICU 'Short Time' pattern, such as 'HH:mm', 'h:mm a', 'H:mm'. See: http://demo.icu-project.org/icu-bin/locexp?d_=en&_=en_US",

diff --git a/packages/flutter/lib/src/material/i18n/material_es.arb b/packages/flutter/lib/src/material/i18n/material_es.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "English-like",
   "timeOfDayFormat": "H:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Standard Spanish time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Standard Spanish time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_fa.arb b/packages/flutter/lib/src/material/i18n/material_fa.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "tall",
   "timeOfDayFormat": "H:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Farsi time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Farsi time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_fr.arb b/packages/flutter/lib/src/material/i18n/material_fr.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "English-like",
   "timeOfDayFormat": "HH:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "French time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "French time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_he.arb b/packages/flutter/lib/src/material/i18n/material_he.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "English-like",
   "timeOfDayFormat": "H:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Hebrew time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Hebrew time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_it.arb b/packages/flutter/lib/src/material/i18n/material_it.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "English-like",
   "timeOfDayFormat": "HH:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Italian time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Italian time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_ja.arb b/packages/flutter/lib/src/material/i18n/material_ja.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "dense",
   "timeOfDayFormat": "H:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Japanese time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Japanese time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_ps.arb b/packages/flutter/lib/src/material/i18n/material_ps.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "tall",
   "timeOfDayFormat": "HH:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Pashto time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Pashto time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_pt.arb b/packages/flutter/lib/src/material/i18n/material_pt.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "English-like",
   "timeOfDayFormat": "HH:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Portuguese time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Portuguese time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_ru.arb b/packages/flutter/lib/src/material/i18n/material_ru.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "English-like",
   "timeOfDayFormat": "H:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Russian time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Russian time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_sd.arb b/packages/flutter/lib/src/material/i18n/material_sd.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "tall",
   "timeOfDayFormat": "HH:mm",
   "@anteMeridiemAbbreviation": { "notUsed": "Sindhi time format does not use a.m. indicator" },
   "@postMeridiemAbbreviation": { "notUsed": "Sindhi time format does not use p.m. indicator" },

diff --git a/packages/flutter/lib/src/material/i18n/material_ur.arb b/packages/flutter/lib/src/material/i18n/material_ur.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "tall",
   "timeOfDayFormat": "h:mm a",
   "openAppDrawerTooltip": "کھولیں نیویگیشن مینو",
   "backButtonTooltip": "واپس",

diff --git a/packages/flutter/lib/src/material/i18n/material_zh.arb b/packages/flutter/lib/src/material/i18n/material_zh.arb
@@ -1,4 +1,5 @@
 {
+  "scriptCategory": "dense",
   "timeOfDayFormat": "ah:mm",
   "openAppDrawerTooltip": "打开导航菜单",
   "backButtonTooltip": "返回",

diff --git a/packages/flutter/lib/src/material/material_localizations.dart b/packages/flutter/lib/src/material/material_localizations.dart
@@ -9,6 +9,7 @@ import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart' as intl;
 
 import 'i18n/localizations.dart';
+import 'typography.dart';
 
 /// Defines the localized resource values used by the Material widgets.
 ///
@@ -95,6 +96,19 @@ abstract class MaterialLocalizations {
   /// each supported layout.
   TimeOfDayFormat get timeOfDayFormat;
 
+  /// Provides geometric text preferences for the current locale.
+  ///
+  /// This text theme is incomplete. For example, it lacks text color
+  /// information. This theme must be merged with another text theme that
+  /// provides the missing values. The text styles provided by this theme have
+  /// their [TextStyle.inherit] property set to `true`.
+  ///
+  /// Typically a complete theme is obtained via [Theme.of], which can be
+  /// localized using the [Localizations] widget.
+  ///
+  /// See also: https://material.io/guidelines/style/typography.html
+  TextTheme get localTextGeometry;
+
   /// The `MaterialLocalizations` from the closest [Localizations] instance
   /// that encloses the given context.
   ///
@@ -287,6 +301,10 @@ class DefaultMaterialLocalizations implements MaterialLocalizations {
     return _icuTimeOfDayToEnum[icuShortTimePattern];
   }
 
+  /// Looks up text geometry defined in [MaterialTextGeometry].
+  @override
+  TextTheme get localTextGeometry => MaterialTextGeometry.forScriptCategory(_nameToValue["scriptCategory"]);
+
   /// Creates an object that provides localized resource values for the
   /// for the widgets of the material library.
   ///

diff --git a/packages/flutter/lib/src/material/theme.dart b/packages/flutter/lib/src/material/theme.dart
@@ -5,7 +5,9 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
+import 'material_localizations.dart';
 import 'theme_data.dart';
+import 'typography.dart';
 
 export 'theme_data.dart' show Brightness, ThemeData;
 
@@ -65,6 +67,10 @@ class Theme extends StatelessWidget {
   /// The data from the closest [Theme] instance that encloses the given
   /// context.
   ///
+  /// If the given context is enclosed in a [Localizations] widget providing
+  /// [MaterialLocalizations], the returned data is localized according to the
+  /// nearest available [MaterialLocalizations].
+  ///
   /// Defaults to [new ThemeData.fallback] if there is no [Theme] in the given
   /// build context.
   ///
@@ -123,7 +129,11 @@ class Theme extends StatelessWidget {
         return null;
       return inheritedTheme.theme.data;
     }
-    return (inheritedTheme != null) ? inheritedTheme.theme.data : _kFallbackTheme;
+
+    final ThemeData colorTheme = (inheritedTheme != null) ? inheritedTheme.theme.data : _kFallbackTheme;
+    final MaterialLocalizations localizations = MaterialLocalizations.of(context);
+    final TextTheme geometryTheme = localizations?.localTextGeometry ?? MaterialTextGeometry.englishLike;
+    return ThemeData.localize(colorTheme, geometryTheme);
   }
 
   @override