Revert "Refactor ThemeData (#91497)" (#92820)

This reverts commit 78689d34.

packages/flutter/test/material/theme_data_test.dart

@@ -666,93 +666,88 @@ void main() {
   test('ThemeData diagnostics include all properties', () {
     // List of properties must match the properties in ThemeData.hashCode()
     final Set<String> expectedPropertyNames = <String>{
-      // GENERAL CONFIGURATION
-      'androidOverscrollIndicator',
-      'applyElevationOverlayColor',
-      'cupertinoOverrideTheme',
-      'inputDecorationTheme',
-      'materialTapTargetSize',
-      'pageTransitionsTheme',
-      'platform',
-      'scrollbarTheme',
-      'splashFactory',
       'visualDensity',
-      // COLOR
-      'colorScheme',
       'primaryColor',
       'primaryColorBrightness',
       'primaryColorLight',
       'primaryColorDark',
-      'focusColor',
-      'hoverColor',
-      'shadowColor',
       'canvasColor',
+      'shadowColor',
+      'accentColor',
+      'accentColorBrightness',
       'scaffoldBackgroundColor',
       'bottomAppBarColor',
       'cardColor',
       'dividerColor',
+      'focusColor',
+      'hoverColor',
       'highlightColor',
       'splashColor',
+      'splashFactory',
       'selectedRowColor',
       'unselectedWidgetColor',
       'disabledColor',
+      'buttonTheme',
+      'buttonColor',
+      'toggleButtonsTheme',
       'secondaryHeaderColor',
+      'textSelectionColor',
+      'cursorColor',
+      'textSelectionHandleColor',
       'backgroundColor',
       'dialogBackgroundColor',
       'indicatorColor',
       'hintColor',
       'errorColor',
       'toggleableActiveColor',
-      // TYPOGRAPHY & ICONOGRAPHY
-      'typography',
       'textTheme',
       'primaryTextTheme',
+      'accentTextTheme',
+      'inputDecorationTheme',
       'iconTheme',
       'primaryIconTheme',
-      // COMPONENT THEMES
-      'appBarTheme',
-      'bannerTheme',
-      'bottomAppBarTheme',
-      'bottomNavigationBarTheme',
-      'bottomSheetTheme',
-      'buttonBarTheme',
-      'buttonTheme',
+      'accentIconTheme',
+      'sliderTheme',
+      'tabBarTheme',
+      'tooltipTheme',
       'cardTheme',
-      'checkboxTheme',
       'chipTheme',
-      'dataTableTheme',
+      'platform',
+      'materialTapTargetSize',
+      'applyElevationOverlayColor',
+      'pageTransitionsTheme',
+      'appBarTheme',
+      'scrollbarTheme',
+      'bottomAppBarTheme',
+      'colorScheme',
       'dialogTheme',
-      'dividerTheme',
-      'drawerTheme',
-      'elevatedButtonTheme',
       'floatingActionButtonTheme',
-      'listTileTheme',
       'navigationBarTheme',
       'navigationRailTheme',
-      'outlinedButtonTheme',
-      'popupMenuTheme',
-      'progressIndicatorTheme',
-      'radioTheme',
-      'sliderTheme',
+      'typography',
+      'cupertinoOverrideTheme',
       'snackBarTheme',
-      'switchTheme',
-      'tabBarTheme',
+      'bottomSheetTheme',
+      'popupMenuTheme',
+      'bannerTheme',
+      'dividerTheme',
+      'buttonBarTheme',
+      'bottomNavigationBarTheme',
+      'timePickerTheme',
       'textButtonTheme',
+      'elevatedButtonTheme',
+      'outlinedButtonTheme',
       'textSelectionTheme',
-      'timePickerTheme',
-      'toggleButtonsTheme',
-      'tooltipTheme',
-      // DEPRECATED (newest deprecations at the bottom)
-      'useTextSelectionTheme',
-      'textSelectionColor',
-      'cursorColor',
-      'textSelectionHandleColor',
-      'accentColor',
-      'accentColorBrightness',
-      'accentTextTheme',
-      'accentIconTheme',
-      'buttonColor',
+      'dataTableTheme',
+      'checkboxTheme',
+      'radioTheme',
+      'switchTheme',
+      'progressIndicatorTheme',
+      'drawerTheme',
+      'listTileTheme',
       'fixTextFieldOutlineLabel',
+      'useTextSelectionTheme',
+      'androidOverscrollIndicator',
     };
 
     final DiagnosticPropertiesBuilder properties = DiagnosticPropertiesBuilder();