From 0e1355841df5affb312ba789354b770cf586eb79 Mon Sep 17 00:00:00 2001 From: Sasank Tumpati <76063158+sasanktumpati@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:46:39 +0530 Subject: [PATCH] Fixed ThemeData in the Flutter Samples unnecessarily includes useMaterial3 = true (Issue #2214) (#2217) --- .../android_view/flutter_module_using_plugin/lib/main.dart | 1 - add_to_app/books/flutter_module_books/lib/main.dart | 1 - add_to_app/fullscreen/flutter_module/lib/main.dart | 2 +- .../multiple_flutters/multiple_flutters_module/lib/main.dart | 1 - add_to_app/plugin/flutter_module_using_plugin/lib/main.dart | 2 +- add_to_app/prebuilt_module/flutter_module/lib/main.dart | 2 +- android_splash_screen/lib/main.dart | 1 - animations/lib/main.dart | 1 - background_isolate_channels/lib/main.dart | 1 - code_sharing/client/lib/main.dart | 1 - context_menus/lib/main.dart | 1 - deeplink_store_example/lib/main.dart | 2 +- desktop_photo_search/material/lib/main.dart | 1 - .../federated_plugin/federated_plugin/example/lib/main.dart | 2 +- experimental/linting_tool/lib/theme/app_theme.dart | 2 +- experimental/pedometer/example/lib/main.dart | 1 - experimental/varfont_shader_puzzle/lib/main.dart | 1 - experimental/web_dashboard/lib/src/app.dart | 2 +- flutter_maps_firestore/lib/main.dart | 1 - form_app/lib/main.dart | 1 - game_template/lib/main.dart | 1 - google_maps/lib/main.dart | 1 - infinite_list/lib/main.dart | 2 +- isolate_example/lib/main.dart | 2 +- place_tracker/lib/place_tracker_app.dart | 1 - platform_channels/lib/main.dart | 1 - platform_design/lib/main.dart | 1 - platform_view_swift/lib/main.dart | 1 - provider_counter/lib/main.dart | 1 - provider_shopper/lib/common/theme.dart | 1 - simple_shader/lib/main.dart | 1 - simplistic_calculator/lib/main.dart | 2 +- simplistic_editor/lib/main.dart | 1 - testing_app/lib/main.dart | 1 - web/_packages/web_startup_analyzer/example/lib/main.dart | 1 - web_embedding/element_embedding_demo/lib/main.dart | 1 - web_embedding/ng-flutter/flutter/lib/main.dart | 1 - 37 files changed, 10 insertions(+), 37 deletions(-) diff --git a/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart b/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart index 0e9360f0f..50fa1083e 100644 --- a/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart +++ b/add_to_app/android_view/flutter_module_using_plugin/lib/main.dart @@ -78,7 +78,6 @@ class MyApp extends StatelessWidget { title: 'Flutter Module Title', theme: ThemeData( colorSchemeSeed: Colors.blue, - useMaterial3: true, ), routes: { '/': (context) => const FullScreenView(), diff --git a/add_to_app/books/flutter_module_books/lib/main.dart b/add_to_app/books/flutter_module_books/lib/main.dart index 0f9cc3537..edd9ef179 100644 --- a/add_to_app/books/flutter_module_books/lib/main.dart +++ b/add_to_app/books/flutter_module_books/lib/main.dart @@ -15,7 +15,6 @@ class MyApp extends StatelessWidget { return MaterialApp( theme: ThemeData( primaryColor: const Color(0xff6200ee), - useMaterial3: true, ), home: const BookDetail(), ); diff --git a/add_to_app/fullscreen/flutter_module/lib/main.dart b/add_to_app/fullscreen/flutter_module/lib/main.dart index 4615a8971..10505e5aa 100644 --- a/add_to_app/fullscreen/flutter_module/lib/main.dart +++ b/add_to_app/fullscreen/flutter_module/lib/main.dart @@ -64,7 +64,7 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp( title: 'Flutter Module Title', - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), routes: { '/': (context) => const FullScreenView(), '/mini': (context) => const Contents(), diff --git a/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart b/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart index 71c6a37af..f4060e478 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart +++ b/add_to_app/multiple_flutters/multiple_flutters_module/lib/main.dart @@ -25,7 +25,6 @@ class MyApp extends StatelessWidget { title: 'Flutter Demo', theme: ThemeData( colorSchemeSeed: color, - useMaterial3: true, appBarTheme: AppBarTheme( backgroundColor: color, foregroundColor: Colors.white, diff --git a/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart b/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart index 7aa9fba49..20a2fa4ec 100644 --- a/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart +++ b/add_to_app/plugin/flutter_module_using_plugin/lib/main.dart @@ -75,7 +75,7 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp( title: 'Flutter Module Title', - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), routes: { '/': (context) => const FullScreenView(), '/mini': (context) => const Contents(), diff --git a/add_to_app/prebuilt_module/flutter_module/lib/main.dart b/add_to_app/prebuilt_module/flutter_module/lib/main.dart index fcff29b1c..46c913ad2 100644 --- a/add_to_app/prebuilt_module/flutter_module/lib/main.dart +++ b/add_to_app/prebuilt_module/flutter_module/lib/main.dart @@ -64,7 +64,7 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp( title: 'Flutter Module Title', - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), routes: { '/': (context) => const FullScreenView(), '/mini': (context) => const Contents(), diff --git a/android_splash_screen/lib/main.dart b/android_splash_screen/lib/main.dart index 77bc060c4..08057a129 100644 --- a/android_splash_screen/lib/main.dart +++ b/android_splash_screen/lib/main.dart @@ -30,7 +30,6 @@ class MyApp extends StatelessWidget { title: 'Flutter Demo', theme: ThemeData( primarySwatch: Colors.blue, - useMaterial3: true, ), home: const MyHomePage(title: 'Flutter Demo Home Page'), ); diff --git a/animations/lib/main.dart b/animations/lib/main.dart index 9e2187f7b..83c4e312a 100644 --- a/animations/lib/main.dart +++ b/animations/lib/main.dart @@ -184,7 +184,6 @@ class AnimationSamples extends StatelessWidget { title: 'Animation Samples', theme: ThemeData( colorSchemeSeed: Colors.deepPurple, - useMaterial3: true, ), routerConfig: router, ); diff --git a/background_isolate_channels/lib/main.dart b/background_isolate_channels/lib/main.dart index 616770efb..48c8f2261 100644 --- a/background_isolate_channels/lib/main.dart +++ b/background_isolate_channels/lib/main.dart @@ -31,7 +31,6 @@ class MyApp extends StatelessWidget { title: 'Background Isolate Channels', theme: ThemeData( primarySwatch: Colors.blue, - useMaterial3: true, ), home: const MyHomePage(title: 'Background Isolate Channels'), ); diff --git a/code_sharing/client/lib/main.dart b/code_sharing/client/lib/main.dart index 2f70689fb..1c669d519 100644 --- a/code_sharing/client/lib/main.dart +++ b/code_sharing/client/lib/main.dart @@ -34,7 +34,6 @@ class MyApp extends StatelessWidget { title: 'Flutter Demo', theme: ThemeData( colorSchemeSeed: Colors.blue, - useMaterial3: true, ), home: MyHomePage( title: 'Flutter Demo Home Page', diff --git a/context_menus/lib/main.dart b/context_menus/lib/main.dart index 9978da272..6ca9af6aa 100644 --- a/context_menus/lib/main.dart +++ b/context_menus/lib/main.dart @@ -62,7 +62,6 @@ class _MyAppState extends State { theme: ThemeData( primarySwatch: Colors.blue, platform: defaultTargetPlatform, - useMaterial3: true, ), initialRoute: '/', routes: { diff --git a/deeplink_store_example/lib/main.dart b/deeplink_store_example/lib/main.dart index e2684c332..3653947aa 100644 --- a/deeplink_store_example/lib/main.dart +++ b/deeplink_store_example/lib/main.dart @@ -28,7 +28,7 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp.router( debugShowCheckedModeBanner: false, - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), routerConfig: GoRouter( routes: [ GoRoute( diff --git a/desktop_photo_search/material/lib/main.dart b/desktop_photo_search/material/lib/main.dart index ba0932be5..7b27d7ac1 100644 --- a/desktop_photo_search/material/lib/main.dart +++ b/desktop_photo_search/material/lib/main.dart @@ -64,7 +64,6 @@ class UnsplashSearchApp extends StatelessWidget { title: 'Photo Search', theme: ThemeData( colorSchemeSeed: Colors.orange, - useMaterial3: true, ), home: const UnsplashHomePage(title: 'Photo Search'), ); diff --git a/experimental/federated_plugin/federated_plugin/example/lib/main.dart b/experimental/federated_plugin/federated_plugin/example/lib/main.dart index c9f64ff09..6d88f64e4 100644 --- a/experimental/federated_plugin/federated_plugin/example/lib/main.dart +++ b/experimental/federated_plugin/federated_plugin/example/lib/main.dart @@ -15,7 +15,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), home: const HomePage(), ); } diff --git a/experimental/linting_tool/lib/theme/app_theme.dart b/experimental/linting_tool/lib/theme/app_theme.dart index 9096a21be..8fd8e704d 100644 --- a/experimental/linting_tool/lib/theme/app_theme.dart +++ b/experimental/linting_tool/lib/theme/app_theme.dart @@ -9,7 +9,7 @@ import 'package:linting_tool/theme/colors.dart'; abstract class AppTheme { static ThemeData buildReplyLightTheme(BuildContext context) { - final base = ThemeData.light(useMaterial3: true); + final base = ThemeData.light(); return base.copyWith( bottomSheetTheme: BottomSheetThemeData( backgroundColor: AppColors.blue700, diff --git a/experimental/pedometer/example/lib/main.dart b/experimental/pedometer/example/lib/main.dart index 705a530f6..8c1e7cc98 100644 --- a/experimental/pedometer/example/lib/main.dart +++ b/experimental/pedometer/example/lib/main.dart @@ -17,7 +17,6 @@ class MyApp extends StatelessWidget { title: 'Flutter Demo', theme: ThemeData( primarySwatch: Colors.blue, - useMaterial3: true, ), home: const Home(), ); diff --git a/experimental/varfont_shader_puzzle/lib/main.dart b/experimental/varfont_shader_puzzle/lib/main.dart index 16ce72b21..2a26e0221 100644 --- a/experimental/varfont_shader_puzzle/lib/main.dart +++ b/experimental/varfont_shader_puzzle/lib/main.dart @@ -19,7 +19,6 @@ class TypePuzzle extends StatelessWidget { title: 'Type Jam', theme: ThemeData( primarySwatch: Colors.grey, - useMaterial3: true, ), home: const Scaffold( appBar: null, diff --git a/experimental/web_dashboard/lib/src/app.dart b/experimental/web_dashboard/lib/src/app.dart index 639c7691e..c14a88ceb 100644 --- a/experimental/web_dashboard/lib/src/app.dart +++ b/experimental/web_dashboard/lib/src/app.dart @@ -66,7 +66,7 @@ class _DashboardAppState extends State { return Provider.value( value: _appState, child: MaterialApp( - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), home: SignInSwitcher( appState: _appState, apiBuilder: widget.apiBuilder, diff --git a/flutter_maps_firestore/lib/main.dart b/flutter_maps_firestore/lib/main.dart index 8643f28a2..5b3b03687 100644 --- a/flutter_maps_firestore/lib/main.dart +++ b/flutter_maps_firestore/lib/main.dart @@ -36,7 +36,6 @@ class App extends StatelessWidget { theme: ThemeData( colorSchemeSeed: Colors.pink, scaffoldBackgroundColor: Colors.pink[50], - useMaterial3: true, ), ); } diff --git a/form_app/lib/main.dart b/form_app/lib/main.dart index d986de48d..eb404c268 100644 --- a/form_app/lib/main.dart +++ b/form_app/lib/main.dart @@ -90,7 +90,6 @@ class FormApp extends StatelessWidget { title: 'Form Samples', theme: ThemeData( colorSchemeSeed: Colors.teal, - useMaterial3: true, ), routerConfig: router, ); diff --git a/game_template/lib/main.dart b/game_template/lib/main.dart index 8b6518dbd..d8fec61e0 100644 --- a/game_template/lib/main.dart +++ b/game_template/lib/main.dart @@ -273,7 +273,6 @@ class MyApp extends StatelessWidget { color: palette.ink, ), ), - useMaterial3: true, ), routeInformationProvider: _router.routeInformationProvider, routeInformationParser: _router.routeInformationParser, diff --git a/google_maps/lib/main.dart b/google_maps/lib/main.dart index 07330a64f..f31a7c3ba 100644 --- a/google_maps/lib/main.dart +++ b/google_maps/lib/main.dart @@ -41,7 +41,6 @@ class _MyAppState extends State { title: 'Flutter Demo', theme: ThemeData( primarySwatch: Colors.green, - useMaterial3: true, ), home: Scaffold( appBar: AppBar( diff --git a/infinite_list/lib/main.dart b/infinite_list/lib/main.dart index ba2bc32ce..4c5e30b99 100644 --- a/infinite_list/lib/main.dart +++ b/infinite_list/lib/main.dart @@ -46,7 +46,7 @@ class MyApp extends StatelessWidget { create: (context) => Catalog(), child: MaterialApp( title: 'Infinite List Sample', - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), home: const MyHomePage(), ), ); diff --git a/isolate_example/lib/main.dart b/isolate_example/lib/main.dart index 6ee432951..0c3f48367 100644 --- a/isolate_example/lib/main.dart +++ b/isolate_example/lib/main.dart @@ -48,7 +48,7 @@ class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), home: DefaultTabController( length: 3, child: Scaffold( diff --git a/place_tracker/lib/place_tracker_app.dart b/place_tracker/lib/place_tracker_app.dart index 6af83669c..e067893a1 100644 --- a/place_tracker/lib/place_tracker_app.dart +++ b/place_tracker/lib/place_tracker_app.dart @@ -25,7 +25,6 @@ class PlaceTrackerApp extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp.router( theme: ThemeData( - useMaterial3: true, colorSchemeSeed: Colors.green, appBarTheme: AppBarTheme( backgroundColor: Colors.green[700], diff --git a/platform_channels/lib/main.dart b/platform_channels/lib/main.dart index 03620b029..d80d7cc1a 100644 --- a/platform_channels/lib/main.dart +++ b/platform_channels/lib/main.dart @@ -25,7 +25,6 @@ class PlatformChannelSample extends StatelessWidget { snackBarTheme: SnackBarThemeData( backgroundColor: Colors.blue[500], ), - useMaterial3: true, ), routerConfig: router(), ); diff --git a/platform_design/lib/main.dart b/platform_design/lib/main.dart index 16fc0838d..51e1508f8 100644 --- a/platform_design/lib/main.dart +++ b/platform_design/lib/main.dart @@ -25,7 +25,6 @@ class MyAdaptingApp extends StatelessWidget { theme: ThemeData( // Use the green theme for Material widgets. primarySwatch: Colors.green, - useMaterial3: true, ), darkTheme: ThemeData.dark(), builder: (context, child) { diff --git a/platform_view_swift/lib/main.dart b/platform_view_swift/lib/main.dart index 89191c6eb..74a5f154c 100644 --- a/platform_view_swift/lib/main.dart +++ b/platform_view_swift/lib/main.dart @@ -20,7 +20,6 @@ class PlatformView extends StatelessWidget { title: 'Platform View', theme: ThemeData( primarySwatch: Colors.grey, - useMaterial3: true, ), home: const HomePage(), ); diff --git a/provider_counter/lib/main.dart b/provider_counter/lib/main.dart index d60faebbd..8a970271a 100644 --- a/provider_counter/lib/main.dart +++ b/provider_counter/lib/main.dart @@ -69,7 +69,6 @@ class MyApp extends StatelessWidget { title: 'Flutter Demo', theme: ThemeData( primarySwatch: Colors.blue, - useMaterial3: true, ), home: const MyHomePage(), ); diff --git a/provider_shopper/lib/common/theme.dart b/provider_shopper/lib/common/theme.dart index 9c7ea440d..5b2a3d011 100644 --- a/provider_shopper/lib/common/theme.dart +++ b/provider_shopper/lib/common/theme.dart @@ -6,7 +6,6 @@ import 'package:flutter/material.dart'; final appTheme = ThemeData( colorSchemeSeed: Colors.yellow, - useMaterial3: true, textTheme: const TextTheme( displayLarge: TextStyle( fontFamily: 'Corben', diff --git a/simple_shader/lib/main.dart b/simple_shader/lib/main.dart index 2ed46620e..04824c298 100644 --- a/simple_shader/lib/main.dart +++ b/simple_shader/lib/main.dart @@ -16,7 +16,6 @@ class MyApp extends StatelessWidget { title: 'Simple Shader Demo', theme: ThemeData( colorSchemeSeed: Colors.blue, - useMaterial3: true, ), home: const MyHomePage(), ); diff --git a/simplistic_calculator/lib/main.dart b/simplistic_calculator/lib/main.dart index d9eeecdfe..56d2bf9ca 100644 --- a/simplistic_calculator/lib/main.dart +++ b/simplistic_calculator/lib/main.dart @@ -347,7 +347,7 @@ class CalculatorApp extends ConsumerWidget { return MaterialApp( debugShowCheckedModeBanner: false, - theme: ThemeData.light(useMaterial3: true), + theme: ThemeData.light(), home: Scaffold( body: Container( color: Colors.white, diff --git a/simplistic_editor/lib/main.dart b/simplistic_editor/lib/main.dart index 1b6287ffb..16ffc8cf4 100644 --- a/simplistic_editor/lib/main.dart +++ b/simplistic_editor/lib/main.dart @@ -22,7 +22,6 @@ class MyApp extends StatelessWidget { title: 'Simplistic Editor', theme: ThemeData( primarySwatch: Colors.blue, - useMaterial3: true, ), home: const MyHomePage(title: 'Simplistic Editor'), ), diff --git a/testing_app/lib/main.dart b/testing_app/lib/main.dart index ebd8b72e1..ca673a601 100644 --- a/testing_app/lib/main.dart +++ b/testing_app/lib/main.dart @@ -42,7 +42,6 @@ class TestingApp extends StatelessWidget { theme: ThemeData( colorSchemeSeed: Colors.blue, visualDensity: VisualDensity.adaptivePlatformDensity, - useMaterial3: true, ), routerConfig: router(), ), diff --git a/web/_packages/web_startup_analyzer/example/lib/main.dart b/web/_packages/web_startup_analyzer/example/lib/main.dart index 7cdc19335..46ee86fe0 100644 --- a/web/_packages/web_startup_analyzer/example/lib/main.dart +++ b/web/_packages/web_startup_analyzer/example/lib/main.dart @@ -41,7 +41,6 @@ class WebStartupAnalyzerSample extends StatelessWidget { title: 'Flutter web app timing', theme: ThemeData( colorScheme: ColorScheme.fromSeed(seedColor: Colors.green.shade100), - useMaterial3: true, ), home: WebStartupAnalyzerScreen(analyzer: analyzer), ); diff --git a/web_embedding/element_embedding_demo/lib/main.dart b/web_embedding/element_embedding_demo/lib/main.dart index 4e68290ae..031724142 100644 --- a/web_embedding/element_embedding_demo/lib/main.dart +++ b/web_embedding/element_embedding_demo/lib/main.dart @@ -65,7 +65,6 @@ class _MyAppState extends State { title: 'Element embedding', theme: ThemeData( colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), - useMaterial3: true, ), debugShowCheckedModeBanner: false, home: demoScreenRouter(_currentDemoScreen), diff --git a/web_embedding/ng-flutter/flutter/lib/main.dart b/web_embedding/ng-flutter/flutter/lib/main.dart index 76a610c87..b34b69c5e 100644 --- a/web_embedding/ng-flutter/flutter/lib/main.dart +++ b/web_embedding/ng-flutter/flutter/lib/main.dart @@ -52,7 +52,6 @@ class _MyAppState extends State { title: 'Element embedding', theme: ThemeData( colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue), - useMaterial3: true, ), home: ValueListenableBuilder( valueListenable: _screen,