From 8f2d40c2d5bc34c7c7ef61fd635aef34cbc0b18c Mon Sep 17 00:00:00 2001
From: Chris Bracken <chris@bracken.jp>
Date: Tue, 1 Nov 2016 13:21:59 -0700
Subject: [PATCH] Extract time picker typography from theme (#6627)

---
 .../flutter/lib/src/material/time_picker.dart | 30 ++++---------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart
index 09ff57e7ad..faf88687d6 100644
--- a/packages/flutter/lib/src/material/time_picker.dart
+++ b/packages/flutter/lib/src/material/time_picker.dart
@@ -513,11 +513,6 @@ class _DialState extends State<_Dial> with SingleTickerProviderStateMixin {
     _animateTo(_getThetaForTime(config.selectedTime));
   }
 
-  final List<TextPainter> _hoursWhite = _initHours(Typography.white);
-  final List<TextPainter> _hoursBlack = _initHours(Typography.black);
-  final List<TextPainter> _minutesWhite = _initMinutes(Typography.white);
-  final List<TextPainter> _minutesBlack = _initMinutes(Typography.black);
-
   @override
   Widget build(BuildContext context) {
     ThemeData themeData = Theme.of(context);
@@ -532,32 +527,17 @@ class _DialState extends State<_Dial> with SingleTickerProviderStateMixin {
         break;
     }
 
+    ThemeData theme = Theme.of(context);
     List<TextPainter> primaryLabels;
     List<TextPainter> secondaryLabels;
     switch (config.mode) {
       case _TimePickerMode.hour:
-        switch (themeData.brightness) {
-          case Brightness.light:
-            primaryLabels = _hoursBlack;
-            secondaryLabels = _hoursWhite;
-            break;
-          case Brightness.dark:
-            primaryLabels = _hoursWhite;
-            secondaryLabels = _hoursBlack;
-            break;
-        }
+        primaryLabels = _initHours(theme.textTheme);
+        secondaryLabels = _initHours(theme.primaryTextTheme);
         break;
       case _TimePickerMode.minute:
-        switch (themeData.brightness) {
-          case Brightness.light:
-            primaryLabels = _minutesBlack;
-            secondaryLabels = _minutesWhite;
-            break;
-          case Brightness.dark:
-            primaryLabels = _minutesWhite;
-            secondaryLabels = _minutesBlack;
-            break;
-        }
+        primaryLabels = _initMinutes(theme.textTheme);
+        secondaryLabels = _initMinutes(theme.primaryTextTheme);
         break;
     }