Use ButtonStyle.fixedSize in DevTools theme (#2658)

* Use ButtonStyle.fixedSize in DevTools theme

Author: kenzieschmoll

packages/devtools_app/lib/src/analytics/prompt.dart

@@ -5,7 +5,6 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
-import '../common_widgets.dart';
 import '../theme.dart';
 import '../utils.dart';
 import 'provider.dart';
@@ -114,7 +113,7 @@ class _AnalyticsPromptState extends State<AnalyticsPrompt> {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.end,
       children: [
-        FixedHeightElevatedButton(
+        ElevatedButton(
           onPressed: () {
             _provider.setDontAllowAnalytics();
             setState(() {
@@ -127,7 +126,7 @@ class _AnalyticsPromptState extends State<AnalyticsPrompt> {
         const Padding(
           padding: EdgeInsets.only(left: defaultSpacing),
         ),
-        FixedHeightElevatedButton(
+        ElevatedButton(
           onPressed: () {
             _provider.setAllowAnalytics();
             setState(() {

packages/devtools_app/lib/src/common_widgets.dart

@@ -112,12 +112,12 @@ class IconLabelButton extends StatelessWidget {
       includeTextWidth: includeTextWidth,
     );
     if (elevatedButton) {
-      return FixedHeightElevatedButton(
+      return ElevatedButton(
         onPressed: onPressed,
         child: iconLabel,
       );
     }
-    return FixedHeightOutlinedButton(
+    return OutlinedButton(
       onPressed: onPressed,
       child: iconLabel,
     );
@@ -258,13 +258,17 @@ class SettingsOutlinedButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FixedHeightOutlinedButton(
+    return SizedBox(
       width: defaultButtonHeight, // This will result in a square button.
-      onPressed: onPressed,
-      tooltip: tooltip,
-      child: const Icon(
-        Icons.settings,
-        size: defaultIconSize,
+      child: DevToolsTooltip(
+        tooltip: tooltip,
+        child: OutlinedButton(
+          onPressed: onPressed,
+          child: const Icon(
+            Icons.settings,
+            size: defaultIconSize,
+          ),
+        ),
       ),
     );
   }
@@ -298,7 +302,7 @@ class ExpandAllButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FixedHeightOutlinedButton(
+    return OutlinedButton(
       onPressed: onPressed,
       child: const Text('Expand All'),
     );
@@ -313,93 +317,13 @@ class CollapseAllButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FixedHeightOutlinedButton(
+    return OutlinedButton(
       onPressed: onPressed,
       child: const Text('Collapse All'),
     );
   }
 }
 
-// TODO(kenz): remove use of this class once we can specify a fixed button
-// height in the theme. See https://github.com/flutter/flutter/issues/73741.
-class FixedHeightOutlinedButton extends StatelessWidget {
-  const FixedHeightOutlinedButton({
-    this.buttonKey,
-    @required this.onPressed,
-    @required this.child,
-    this.autofocus = false,
-    this.style,
-    this.width,
-    this.tooltip,
-  });
-
-  final Key buttonKey;
-
-  final VoidCallback onPressed;
-
-  final Widget child;
-
-  final bool autofocus;
-
-  final ButtonStyle style;
-
-  final double width;
-
-  final String tooltip;
-
-  @override
-  Widget build(BuildContext context) {
-    final button = SizedBox(
-      height: defaultButtonHeight,
-      width: width,
-      child: OutlinedButton(
-        key: buttonKey,
-        style: style,
-        autofocus: autofocus,
-        onPressed: onPressed,
-        child: child,
-      ),
-    );
-    if (tooltip != null) {
-      return Tooltip(
-        message: tooltip,
-        preferBelow: false,
-        waitDuration: tooltipWait,
-        child: button,
-      );
-    }
-    return button;
-  }
-}
-
-// TODO(kenz): remove use of this class once we can specify a fixed button
-// height in the theme. See https://github.com/flutter/flutter/issues/73741.
-class FixedHeightElevatedButton extends StatelessWidget {
-  const FixedHeightElevatedButton({
-    @required this.child,
-    @required this.onPressed,
-    this.style,
-  });
-
-  final Widget child;
-
-  final VoidCallback onPressed;
-
-  final ButtonStyle style;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: defaultButtonHeight,
-      child: ElevatedButton(
-        style: style,
-        onPressed: onPressed,
-        child: child,
-      ),
-    );
-  }
-}
-
 class RecordingInfo extends StatelessWidget {
   const RecordingInfo({
     this.instructionsKey,
@@ -573,8 +497,8 @@ class ExitOfflineButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FixedHeightOutlinedButton(
-      buttonKey: const Key('exit offline button'),
+    return OutlinedButton(
+      key: const Key('exit offline button'),
       onPressed: onPressed,
       child: const MaterialIconLabel(
         label: 'Exit offline mode',
@@ -841,21 +765,23 @@ class FilterButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    return FixedHeightOutlinedButton(
-      buttonKey: key,
+    return DevToolsTooltip(
       tooltip: 'Filter',
-      onPressed: onPressed,
-      style: TextButton.styleFrom(
-        backgroundColor: isFilterActive
-            ? theme.colorScheme.toggleButtonBackgroundColor
-            : Colors.transparent,
-      ),
-      child: Icon(
-        Icons.filter_list,
-        size: defaultIconSize,
-        color: isFilterActive
-            ? theme.colorScheme.toggleButtonForegroundColor
-            : theme.colorScheme.contrastForeground,
+      child: OutlinedButton(
+        key: key,
+        onPressed: onPressed,
+        style: TextButton.styleFrom(
+          backgroundColor: isFilterActive
+              ? theme.colorScheme.toggleButtonBackgroundColor
+              : Colors.transparent,
+        ),
+        child: Icon(
+          Icons.filter_list,
+          size: defaultIconSize,
+          color: isFilterActive
+              ? theme.colorScheme.toggleButtonForegroundColor
+              : theme.colorScheme.contrastForeground,
+        ),
       ),
     );
   }

packages/devtools_app/lib/src/debugger/controls.dart

@@ -232,18 +232,20 @@ class DebuggerButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FixedHeightOutlinedButton(
-      autofocus: autofocus,
+    return DevToolsTooltip(
       tooltip: title,
-      style: OutlinedButton.styleFrom(
-        side: BorderSide.none,
-        shape: const ContinuousRectangleBorder(),
-      ),
-      onPressed: onPressed,
-      child: MaterialIconLabel(
-        label: title,
-        iconData: icon,
-        includeTextWidth: mediumDeviceWidth,
+      child: OutlinedButton(
+        autofocus: autofocus,
+        style: OutlinedButton.styleFrom(
+          side: BorderSide.none,
+          shape: const ContinuousRectangleBorder(),
+        ),
+        onPressed: onPressed,
+        child: MaterialIconLabel(
+          label: title,
+          iconData: icon,
+          includeTextWidth: mediumDeviceWidth,
+        ),
       ),
     );
   }

packages/devtools_app/lib/src/device_dialog.dart

@@ -96,7 +96,7 @@ class DeviceDialog extends StatelessWidget {
   }
 
   Widget _connectToNewAppButton(BuildContext context) {
-    return FixedHeightElevatedButton(
+    return ElevatedButton(
       onPressed: () {
         DevToolsRouterDelegate.of(context).navigate(homePageId, {'uri': null});
         Navigator.of(context, rootNavigator: true).pop('dialog');

packages/devtools_app/lib/src/file_import.dart

@@ -153,7 +153,7 @@ class _FileImportContainerState extends State<FileImportContainer> {
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            FixedHeightElevatedButton(
+            ElevatedButton(
               onPressed: importedFile != null
                   ? () => widget.onAction(importedFile)
                   : null,
@@ -316,7 +316,7 @@ class _DualFileImportContainerState extends State<DualFileImportContainer> {
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            FixedHeightElevatedButton(
+            ElevatedButton(
               onPressed: firstImportedFile != null && secondImportedFile != null
                   ? () => widget.onAction(
                         firstImportedFile,

packages/devtools_app/lib/src/initializer.dart

@@ -152,7 +152,7 @@ class _InitializerState extends State<Initializer>
               Text('Disconnected', style: theme.textTheme.headline3),
               const SizedBox(height: defaultSpacing),
               if (widget.allowConnectionScreenOnDisconnect)
-                FixedHeightElevatedButton(
+                ElevatedButton(
                     onPressed: () {
                       hideDisconnectedOverlay();
                       DevToolsRouterDelegate.of(context)
@@ -165,7 +165,7 @@ class _InitializerState extends State<Initializer>
                   style: theme.textTheme.bodyText2,
                 ),
               const Spacer(),
-              FixedHeightElevatedButton(
+              ElevatedButton(
                 onPressed: hideDisconnectedOverlay,
                 child: const Text('Review History'),
               ),

packages/devtools_app/lib/src/inspector/inspector_screen.dart

@@ -229,7 +229,7 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
         mainAxisSize: MainAxisSize.min,
         children: [
           Flexible(
-            child: FixedHeightOutlinedButton(
+            child: OutlinedButton(
               onPressed: enableButtons ? _onExpandClick : null,
               child: const Text(
                 'Expand all',
@@ -239,7 +239,7 @@ class InspectorScreenBodyState extends State<InspectorScreenBody>
           ),
           const SizedBox(width: denseSpacing),
           Flexible(
-            child: FixedHeightOutlinedButton(
+            child: OutlinedButton(
               onPressed: enableButtons ? _onResetClick : null,
               child: const Text(
                 'Collapse to selected',

packages/devtools_app/lib/src/landing_screen.dart

@@ -88,7 +88,7 @@ class _LandingScreenBodyState extends State<LandingScreenBody> {
               'At this time, DevTools only supports importing files that were originally'
               ' exported from DevTools.'),
           const SizedBox(height: defaultSpacing),
-          FixedHeightElevatedButton(
+          ElevatedButton(
             onPressed: _importFile,
             child: const MaterialIconLabel(
               label: 'Import File',
@@ -119,7 +119,7 @@ class _LandingScreenBodyState extends State<LandingScreenBody> {
           _captionText('Load Dart AOT snapshots or app size analysis files to '
               'track down size issues in your app.'),
           const SizedBox(height: defaultSpacing),
-          FixedHeightElevatedButton(
+          ElevatedButton(
             child: const Text('Open app size tool'),
             onPressed: () =>
                 DevToolsRouterDelegate.of(context).navigate(appSizePageId),
@@ -185,7 +185,7 @@ class _LandingScreenBodyState extends State<LandingScreenBody> {
               ),
             ),
             const SizedBox(width: defaultSpacing),
-            FixedHeightElevatedButton(
+            ElevatedButton(
               child: const Text('Connect'),
               onPressed: connectDebounce.invoke,
             ),