Merge branch 'main' of https://github.com/flutter/samples into beta

flutter · Jul 24, 2023 · 2db8d34 · 2db8d34
2 parents ae934a0 + 1d66a0e
commit 2db8d34
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/background_isolate_channels/lib/main.dart b/background_isolate_channels/lib/main.dart
@@ -31,6 +31,7 @@ class MyApp extends StatelessWidget {
       title: 'Background Isolate Channels',
       theme: ThemeData(
         primarySwatch: Colors.blue,
+        useMaterial3: true,
       ),
       home: const MyHomePage(title: 'Background Isolate Channels'),
     );
@@ -124,26 +125,24 @@ class _MyHomePageState extends State<MyHomePage> {
     return Scaffold(
       appBar: AppBar(
         title: Text(widget.title),
-      ),
-      body: Column(
-        children: [
-          TextField(
-            onChanged:
-                _database == null ? null : (query) => _refresh(query: query),
-            decoration: const InputDecoration(
-              labelText: 'Search',
-              suffixIcon: Icon(Icons.search),
-            ),
-          ),
-          Expanded(
-            child: ListView.builder(
-              itemBuilder: (context, index) {
-                return ListTile(title: Text(_entries![index]));
-              },
-              itemCount: _entries?.length ?? 0,
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(kToolbarHeight),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 8.0),
+            child: SearchBar(
+              hintText: 'Search',
+              onChanged:
+                  _database == null ? null : (query) => _refresh(query: query),
+              trailing: const [Icon(Icons.search), SizedBox(width: 8)],
             ),
           ),
-        ],
+        ),
+      ),
+      body: ListView.builder(
+        itemBuilder: (context, index) {
+          return ListTile(title: Text(_entries![index]));
+        },
+        itemCount: _entries?.length ?? 0,
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: _database == null ? null : _addDate,

diff --git a/simplistic_calculator/lib/main.dart b/simplistic_calculator/lib/main.dart
@@ -347,6 +347,7 @@ class CalculatorApp extends ConsumerWidget {
 
     return MaterialApp(
       debugShowCheckedModeBanner: false,
+      theme: ThemeData.light(useMaterial3: true),
       home: Scaffold(
         body: Container(
           color: Colors.white,