Unverified Commit ab9373bf authored by Hans Muller's avatar Hans Muller Committed by GitHub

Removed remaining obsolete button widget references (#67440)

parent 6620f831
...@@ -193,7 +193,7 @@ class _ButtonsDemoState extends State<ButtonsDemo> { ...@@ -193,7 +193,7 @@ class _ButtonsDemoState extends State<ButtonsDemo> {
children: <Widget>[ children: <Widget>[
TextButton.icon( TextButton.icon(
style: style, style: style,
icon: const Icon(Icons.add_circle_outlined, size: 18.0), icon: const Icon(Icons.add_circle_outline, size: 18.0),
label: const Text('TEXT BUTTON', semanticsLabel: 'TEXT BUTTON 2'), label: const Text('TEXT BUTTON', semanticsLabel: 'TEXT BUTTON 2'),
onPressed: () { onPressed: () {
// Perform some action // Perform some action
...@@ -201,7 +201,7 @@ class _ButtonsDemoState extends State<ButtonsDemo> { ...@@ -201,7 +201,7 @@ class _ButtonsDemoState extends State<ButtonsDemo> {
), ),
TextButton.icon( TextButton.icon(
style: style, style: style,
icon: const Icon(Icons.add_circle_outlined, size: 18.0), icon: const Icon(Icons.add_circle_outline, size: 18.0),
label: const Text('DISABLED', semanticsLabel: 'DISABLED BUTTON 4'), label: const Text('DISABLED', semanticsLabel: 'DISABLED BUTTON 4'),
onPressed: null, onPressed: null,
), ),
......
...@@ -43,7 +43,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -43,7 +43,7 @@ class _MyHomePageState extends State<MyHomePage> {
title: Text(widget.title), title: Text(widget.title),
), ),
body: Column(children: <Widget>[ body: Column(children: <Widget>[
FlatButton( TextButton(
key: const ValueKey<String>('platform_view_button'), key: const ValueKey<String>('platform_view_button'),
child: const Text('show platform view'), child: const Text('show platform view'),
onPressed: () { onPressed: () {
...@@ -55,7 +55,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -55,7 +55,7 @@ class _MyHomePageState extends State<MyHomePage> {
}, },
), ),
// Push this button to perform an animation, which ensure the threads are unmerged after the animation. // Push this button to perform an animation, which ensure the threads are unmerged after the animation.
RaisedButton( ElevatedButton(
key: const ValueKey<String>('unmerge_button'), key: const ValueKey<String>('unmerge_button'),
child: const Text('Tap to unmerge threads'), child: const Text('Tap to unmerge threads'),
onPressed: () {}, onPressed: () {},
...@@ -82,7 +82,7 @@ class PlatformViewPage extends StatelessWidget { ...@@ -82,7 +82,7 @@ class PlatformViewPage extends StatelessWidget {
width: 300, width: 300,
height: 300, height: 300,
), ),
RaisedButton( ElevatedButton(
key: button, key: button,
child: const Text('button'), child: const Text('button'),
onPressed: (){}, onPressed: (){},
......
...@@ -29,7 +29,7 @@ void main() { ...@@ -29,7 +29,7 @@ void main() {
await driver.waitFor(plusButton); await driver.waitFor(plusButton);
await driver.waitUntilNoTransientCallbacks(); await driver.waitUntilNoTransientCallbacks();
// Tapping a raised button runs an animation that pumps enough frames to un-merge the threads. // Tapping an elevated button runs an animation that pumps enough frames to un-merge the threads.
await driver.tap(plusButton); await driver.tap(plusButton);
await driver.waitUntilNoTransientCallbacks(); await driver.waitUntilNoTransientCallbacks();
...@@ -56,7 +56,7 @@ void main() { ...@@ -56,7 +56,7 @@ void main() {
await driver.tap(backButton); await driver.tap(backButton);
await driver.waitUntilNoTransientCallbacks(); await driver.waitUntilNoTransientCallbacks();
// The animation of tapping a `RaisedButton` should pump enough frames to un-merge the thread. // The animation of tapping a `ElevatedButton` should pump enough frames to un-merge the thread.
final SerializableFinder unmergeButton = final SerializableFinder unmergeButton =
find.byValueKey('unmerge_button'); find.byValueKey('unmerge_button');
await driver.waitFor(unmergeButton); await driver.waitFor(unmergeButton);
......
...@@ -72,7 +72,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -72,7 +72,7 @@ class _MyHomePageState extends State<MyHomePage> {
), ),
Padding( Padding(
padding: const EdgeInsets.all(18.0), padding: const EdgeInsets.all(18.0),
child: RaisedButton( child: ElevatedButton(
child: Platform.isIOS child: Platform.isIOS
? const Text('Continue in iOS view') ? const Text('Continue in iOS view')
: const Text('Continue in Android view'), : const Text('Continue in Android view'),
......
...@@ -10,7 +10,6 @@ import 'package:flutter/widgets.dart'; ...@@ -10,7 +10,6 @@ import 'package:flutter/widgets.dart';
import '../app_bar.dart'; import '../app_bar.dart';
import '../back_button.dart'; import '../back_button.dart';
import '../button_theme.dart';
import '../color_scheme.dart'; import '../color_scheme.dart';
import '../debug.dart'; import '../debug.dart';
import '../dialog.dart'; import '../dialog.dart';
...@@ -518,12 +517,9 @@ class _CalendarRangePickerDialog extends StatelessWidget { ...@@ -518,12 +517,9 @@ class _CalendarRangePickerDialog extends StatelessWidget {
), ),
actions: <Widget>[ actions: <Widget>[
if (orientation == Orientation.landscape) entryModeIcon, if (orientation == Orientation.landscape) entryModeIcon,
ButtonTheme( TextButton(
minWidth: 64, onPressed: onConfirm,
child: TextButton( child: Text(confirmText, style: saveButtonStyle),
onPressed: onConfirm,
child: Text(confirmText, style: saveButtonStyle),
),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
], ],
......
...@@ -5550,7 +5550,7 @@ typedef RouteCompletionCallback<T> = void Function(T result); ...@@ -5550,7 +5550,7 @@ typedef RouteCompletionCallback<T> = void Function(T result);
/// mainAxisSize: MainAxisSize.min, /// mainAxisSize: MainAxisSize.min,
/// children: <Widget>[ /// children: <Widget>[
/// Text('Last count: ${_lastCount.value}'), /// Text('Last count: ${_lastCount.value}'),
/// RaisedButton( /// ElevatedButton(
/// onPressed: () { /// onPressed: () {
/// // Show the route defined by the `RestorableRouteFuture`. /// // Show the route defined by the `RestorableRouteFuture`.
/// _counterRoute.present('Awesome Counter'); /// _counterRoute.present('Awesome Counter');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment