Fix example runners for IJ/AS and Code to use the new folder names

- Scrollbehavior drag also with pen and trackpad - Examples 1,2,3,4 Set ListView primary to true in PageBody - Copy-paste from playground, use typography 2021
rydmike · Aug 11, 2022 · 7658e4e · 7658e4e
1 parent be0672f
commit 7658e4e
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 17 deletions.
diff --git a/.run/Example theme - Copy Paste.run.xml b/.run/Example theme - Copy Paste.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Example theme - Copy Playground Theme" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/example/lib/example_copy_paste/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/example/lib/example_copy_paste_from_playground/main.dart" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/Example1.run.xml b/.run/Example1.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Example1 - Basic Theme Usage" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/example/lib/example1/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/example/lib/example1_basic_theme_usage/main.dart" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/Example2.run.xml b/.run/Example2.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Example2 - Custom Theme" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/example/lib/example2/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/example/lib/example2_custom_theme/main.dart" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/Example3.run.xml b/.run/Example3.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Example3 - Four Themes" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/example/lib/example3/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/example/lib/example3_four_themes/main.dart" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/Example4.run.xml b/.run/Example4.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Example4 - All Themes" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/example/lib/example4/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/example/lib/example4_all_themes/main.dart" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.run/Example5.run.xml b/.run/Example5.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Example5 - Themes Playground" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="filePath" value="$PROJECT_DIR$/example/lib/example5/main.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/example/lib/example5_themes_playground/main.dart" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -20,42 +20,42 @@
             "cwd": "example",
             "request": "launch",
             "type": "dart",
-            "program": "lib/example_copy_paste/main.dart"
+            "program": "lib/example_copy_paste_from_playground/main.dart"
         },
         {
             "name": "Example 1 - Basic Theme Usage",
             "cwd": "example",
             "request": "launch",
             "type": "dart",
-            "program": "lib/example1/main.dart"
+            "program": "lib/example1_basic_theme_usage/main.dart"
         },
         {
             "name": "Example 2 - Custom Theme",
             "cwd": "example",
             "request": "launch",
             "type": "dart",
-            "program": "lib/example2/main.dart"
+            "program": "lib/example2_custom_theme/main.dart"
         },
         {
             "name": "Example 3 - Four Themes",
             "cwd": "example",
             "request": "launch",
             "type": "dart",
-            "program": "lib/example3/main.dart"
+            "program": "lib/example3_four_themes/main.dart"
         },
         {
             "name": "Example 4 - All Themes",
             "cwd": "example",
             "request": "launch",
             "type": "dart",
-            "program": "lib/example4/main.dart"
+            "program": "lib/example4_all_themes/main.dart"
         },
         {
             "name": "Example 5 - Themes Playground",
             "cwd": "example",
             "request": "launch",
             "type": "dart",
-            "program": "lib/example5/main.dart"
+            "program": "lib/example5_themes_playground/main.dart"
         }
     ]
 }
diff --git a/example/lib/example1_basic_theme_usage/home_page.dart b/example/lib/example1_basic_theme_usage/home_page.dart
@@ -43,6 +43,7 @@ class HomePage extends StatelessWidget {
       body: PageBody(
         constraints: const BoxConstraints(maxWidth: AppData.maxBodyWidth),
         child: ListView(
+          primary: true,
           padding: EdgeInsets.all(margins),
           children: <Widget>[
             const Text(

diff --git a/example/lib/example2_custom_theme/home_page.dart b/example/lib/example2_custom_theme/home_page.dart
@@ -47,6 +47,7 @@ class HomePage extends StatelessWidget {
       body: PageBody(
         constraints: const BoxConstraints(maxWidth: AppData.maxBodyWidth),
         child: ListView(
+          primary: true,
           padding: EdgeInsets.all(margins),
           children: <Widget>[
             const Text(

diff --git a/example/lib/example3_four_themes/home_page.dart b/example/lib/example3_four_themes/home_page.dart
@@ -46,6 +46,7 @@ class HomePage extends StatelessWidget {
       body: PageBody(
         constraints: const BoxConstraints(maxWidth: AppData.maxBodyWidth),
         child: ListView(
+          primary: true,
           padding: EdgeInsets.all(margins),
           children: <Widget>[
             const Text(

diff --git a/example/lib/example4_all_themes/home_page.dart b/example/lib/example4_all_themes/home_page.dart
@@ -59,6 +59,7 @@ class HomePage extends StatelessWidget {
             body: PageBody(
               constraints: const BoxConstraints(maxWidth: AppData.maxBodyWidth),
               child: ListView(
+                primary: true,
                 padding: EdgeInsets.all(margins),
                 children: <Widget>[
                   const Text(

diff --git a/example/lib/example_copy_paste_from_playground/main.dart b/example/lib/example_copy_paste_from_playground/main.dart
@@ -38,10 +38,10 @@ class _DemoAppState extends State<DemoApp> {
       // Material Design 2 color scheme, uncomment and use the theme setup below
       // and comment the copy-pasted themes further below,
       theme: ThemeData.from(colorScheme: const ColorScheme.light()).copyWith(
-        typography: Typography.material2018(platform: defaultTargetPlatform),
+        typography: Typography.material2021(platform: defaultTargetPlatform),
       ),
       darkTheme: ThemeData.from(colorScheme: const ColorScheme.dark()).copyWith(
-        typography: Typography.material2018(platform: defaultTargetPlatform),
+        typography: Typography.material2021(platform: defaultTargetPlatform),
       ),
 
       // This is where you would put a copy-pasted theme definition from
@@ -99,10 +99,10 @@ class _DemoAppState extends State<DemoApp> {
       // FlexThemeData extensions and opinionated component themes.
 
       // theme: ThemeData.from(colorScheme: flexSchemeLight).copyWith(
-      //   typography: Typography.material2018(platform: defaultTargetPlatform),
+      //   typography: Typography.material2021(platform: defaultTargetPlatform),
       // ),
       // darkTheme: ThemeData.from(colorScheme: flexSchemeDark).copyWith(
-      //   typography: Typography.material2018(platform: defaultTargetPlatform),
+      //   typography: Typography.material2021(platform: defaultTargetPlatform),
       // ),
 
       // ThemeMode toggle via callback

diff --git a/example/lib/shared/const/app_data.dart b/example/lib/shared/const/app_data.dart
@@ -36,7 +36,7 @@ class AppData {
   static const String versionBuild = '01';
   static const String version = '$versionMajor.2.0 Build-$versionBuild';
   static const String packageVersion = '5.2.0-dev.1';
-  static const String flutterVersion = 'master 3.1.0-0.0.pre.2199';
+  static const String flutterVersion = 'master 3.1.0-0.0.pre.2216';
   static const String copyright = '© 2020, 2021, 2022';
   static const String author = 'Mike Rydstrom';
   static const String license = 'BSD 3-Clause License';

diff --git a/example/lib/shared/utils/app_scroll_behavior.dart b/example/lib/shared/utils/app_scroll_behavior.dart
@@ -20,6 +20,8 @@ class AppScrollBehavior extends MaterialScrollBehavior {
   Set<PointerDeviceKind> get dragDevices => <PointerDeviceKind>{
         PointerDeviceKind.touch,
         PointerDeviceKind.mouse,
+        PointerDeviceKind.trackpad,
+        PointerDeviceKind.stylus,
       };
 }