diff --git a/example/lib/complex_example/alpha_picker_page.dart b/example/lib/complex_example/alpha_picker_page.dart index 90bf4ae..6a4b646 100644 --- a/example/lib/complex_example/alpha_picker_page.dart +++ b/example/lib/complex_example/alpha_picker_page.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; - import 'package:flutter_hsvcolor_picker/flutter_hsvcolor_picker.dart'; class AlphaPickerPage extends StatefulWidget { @@ -32,7 +31,7 @@ class _AlphaPickerPageState extends State { children: [ Text( value.toString(), - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), const Divider(), diff --git a/example/lib/complex_example/main.dart b/example/lib/complex_example/main.dart index 32a371d..fa3e8e7 100644 --- a/example/lib/complex_example/main.dart +++ b/example/lib/complex_example/main.dart @@ -1,17 +1,17 @@ import 'package:flutter/material.dart'; -import 'slider_picker_page.dart'; -import 'palette_picker_page.dart'; +import 'alpha_picker_page.dart'; +import 'color_picker_page.dart'; +import 'hex_picker_page.dart'; import 'hsv_picker_page.dart'; -import 'rgb_picker_page.dart'; -import 'swatches_picker_page.dart'; -import 'wheel_picker_page.dart'; import 'palette_hue_picker_page.dart'; +import 'palette_picker_page.dart'; import 'palette_saturation_picker_page.dart'; import 'palette_value_picker_page.dart'; -import 'hex_picker_page.dart'; -import 'alpha_picker_page.dart'; -import 'color_picker_page.dart'; +import 'rgb_picker_page.dart'; +import 'slider_picker_page.dart'; +import 'swatches_picker_page.dart'; +import 'wheel_picker_page.dart'; void main() => runApp(const MyApp()); @@ -142,7 +142,7 @@ class _MainPageState extends State { child: Text( 'HSV Color', textAlign: TextAlign.center, - style: theme.textTheme.headline5, + style: theme.textTheme.headlineSmall, ), ), @@ -224,7 +224,7 @@ class _MainPageState extends State { child: ElevatedButton( onPressed: setTheme, style: ElevatedButton.styleFrom( - primary: Colors.blue.shade400, + backgroundColor: Colors.blue.shade400, shape: const StadiumBorder(), ), child: Text( diff --git a/example/lib/complex_example/palette_picker_page.dart b/example/lib/complex_example/palette_picker_page.dart index a025f2d..f35c354 100644 --- a/example/lib/complex_example/palette_picker_page.dart +++ b/example/lib/complex_example/palette_picker_page.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; - import 'package:flutter_hsvcolor_picker/flutter_hsvcolor_picker.dart'; class PalettePickerPage extends StatefulWidget { @@ -42,7 +41,7 @@ class _PalettePickerPageState extends State { ((value.dy * 100.0).toInt().toDouble() / 100.0) .toString() + ' )', - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), const Divider(), Expanded( diff --git a/example/lib/complex_example/slider_picker_page.dart b/example/lib/complex_example/slider_picker_page.dart index 74c03af..baae9ab 100644 --- a/example/lib/complex_example/slider_picker_page.dart +++ b/example/lib/complex_example/slider_picker_page.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; - import 'package:flutter_hsvcolor_picker/flutter_hsvcolor_picker.dart'; class SliderPickerPage extends StatefulWidget { @@ -41,7 +40,7 @@ class _SliderPickerPageState extends State { children: [ Text( ((value * 100.0).toInt().toDouble() / 100.0).toString(), - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), const Divider(), diff --git a/lib/src/color_picker.dart b/lib/src/color_picker.dart index ab3aca4..9f24a30 100644 --- a/lib/src/color_picker.dart +++ b/lib/src/color_picker.dart @@ -208,11 +208,14 @@ class _ColorPickerState extends State { child: Text( item.name, style: _index == _pickers.indexOf(item) - ? Theme.of(context).textTheme.headline5?.copyWith( + ? Theme.of(context).textTheme.headlineSmall?.copyWith( fontSize: 18, color: Theme.of(context).colorScheme.secondary, ) - : Theme.of(context).textTheme.headline5?.copyWith(fontSize: 18), + : Theme.of(context) + .textTheme + .headlineSmall + ?.copyWith(fontSize: 18), ), ), ); @@ -272,7 +275,8 @@ class _ColorPickerState extends State { iconSize: 32.0, isExpanded: true, isDense: true, - style: Theme.of(context).textTheme.headline5?.copyWith(fontSize: 20), + style: + Theme.of(context).textTheme.headlineSmall?.copyWith(fontSize: 20), value: _pickers[_index], onChanged: (_IPicker? value) => super.setState( () => _pickerOnChanged(value), @@ -295,7 +299,8 @@ class _ColorPickerState extends State { iconSize: 32.0, isExpanded: true, isDense: true, - style: Theme.of(context).textTheme.headline5?.copyWith(fontSize: 20), + style: + Theme.of(context).textTheme.headlineSmall?.copyWith(fontSize: 20), value: _pickers[_index], onChanged: (_IPicker? value) => super.setState( () => _pickerOnChanged(value), diff --git a/lib/src/widgets/hex_picker.dart b/lib/src/widgets/hex_picker.dart index 3e1c436..2400916 100644 --- a/lib/src/widgets/hex_picker.dart +++ b/lib/src/widgets/hex_picker.dart @@ -45,15 +45,17 @@ class _HexPickerState extends State { child: Text( '#', style: - Theme.of(context).textTheme.headline6?.copyWith(fontSize: 18), + Theme.of(context).textTheme.titleLarge?.copyWith(fontSize: 18), ), ), // TextField Expanded( child: TextField( - style: - Theme.of(context).textTheme.headline5?.copyWith(fontSize: 20), + style: Theme.of(context) + .textTheme + .headlineSmall + ?.copyWith(fontSize: 20), focusNode: FocusNode()..addListener(() {}), controller: widget._controller, onSubmitted: textOnSubmitted, diff --git a/lib/src/widgets/slider_title.dart b/lib/src/widgets/slider_title.dart index 3afb1fc..95be540 100644 --- a/lib/src/widgets/slider_title.dart +++ b/lib/src/widgets/slider_title.dart @@ -21,7 +21,7 @@ class SliderTitle extends StatelessWidget { opacity: 0.7, child: Text( title, - style: Theme.of(context).textTheme.headline6?.copyWith( + style: Theme.of(context).textTheme.titleLarge?.copyWith( fontSize: 18, ), ), @@ -29,7 +29,7 @@ class SliderTitle extends StatelessWidget { const Spacer(), Text( text, - style: Theme.of(context).textTheme.headline5?.copyWith( + style: Theme.of(context).textTheme.headlineSmall?.copyWith( fontSize: 18, ), ),