Merge branch '5-2-0-dev.1-candidate'

rydmike · Aug 11, 2022 · 1e345f9 · 1e345f9
2 parents 02862ad + 7658e4e
commit 1e345f9
Show file tree

Hide file tree

Showing 82 changed files with 5,945 additions and 2,628 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,6 @@
 #    Controversial but pub.dev penalizes you if dart format is not used.
 #  - Run all tests with coverage.
 #  - Upload code coverage output to Codecov for analysis.
-#  - branch: version-5-0-0-dev1
 name: Test
 on:
   pull_request:
@@ -32,7 +31,7 @@ jobs:
       - name: "Install Flutter and Dart SDK"
         uses: subosito/[email protected]
         with:
-          channel: "stable"
+          channel: "master"
       - name: "Show Dart SDK version"
         run: dart --version
       - name: "Show Flutter SDK version"

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"
         }
     ]
 }