Revert "Flutter 1.14.6 (#93)" (#94)

This reverts commit 994ccb7.
tomaszpolanski · Feb 10, 2020 · 199afea · 199afea
1 parent 994ccb7
commit 199afea
Show file tree

Hide file tree

Showing 29 changed files with 99 additions and 203 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,3 @@ windows/flutter/generated_plugin_registrant.h
 ios/Flutter/flutter_export_environment.sh
 .flutter-plugins-dependencies
 windows/window_configuration.cpp_copy
-ios/Podfile
-macos/Podfile
-
diff --git a/README.md b/README.md
@@ -7,13 +7,13 @@ Available as a [webpage](https://flutter-animations-cheat-sheet.codemagic.app/#/
 The content of the page is [searchable](https://flutter-animations-cheat-sheet.codemagic.app/#/content).
 
 # Building
-Last tested version of Flutter that works with this repo is `v1.14.6`:
-  * **Important**: Use `version` otherwise desktop won't be picked up: `v1.14.6`
+Last tested version of Flutter that works with this repo is `v1.12.13+hotfix.5`:
+  * **Important**: Use `version` otherwise desktop won't be picked up: `v1.12.13+hotfix.5`
 
 ## Building for Web
-Upgrade flutter to minimum `v1.14.6`, enable web compilation and run:
+Upgrade flutter to minimum `v1.12.13+hotfix.5`, enable web compilation and run:
 ```
-flutter version v1.14.6
+flutter version v1.12.13+hotfix.5
 flutter config --enable-web
 flutter run -d chrome -v
 ```

diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/lib/animated_widgets/default_text_style.dart b/lib/animated_widgets/default_text_style.dart
@@ -42,8 +42,8 @@ class _AnimatedDefaultTextStyleExampleState
     return AnimatedDefaultTextStyle(
       duration: const Duration(seconds: 4),
       style: _showFirst
-          ? Theme.of(context).textTheme.headline4
-          : Theme.of(context).textTheme.headline2,
+          ? Theme.of(context).textTheme.display1
+          : Theme.of(context).textTheme.display3,
       child: const Text('FlutterFlutterFlutterFlutterFlutterFlutter'),
     );
   }

diff --git a/lib/generic/not_found_page.dart b/lib/generic/not_found_page.dart
@@ -15,14 +15,14 @@ class NotFoundPage extends StatelessWidget {
           children: <Widget>[
             Text(
               '0x‭194‬',
-              style: Theme.of(context).textTheme.headline1.copyWith(
+              style: Theme.of(context).textTheme.display4.copyWith(
                     color: Colors.black,
                     fontSize: 200,
                   ),
             ),
             Text(
               '(404)',
-              style: Theme.of(context).textTheme.headline4,
+              style: Theme.of(context).textTheme.display1,
             ),
           ],
         ),

diff --git a/lib/pages/licenses_page.dart b/lib/pages/licenses_page.dart
@@ -117,12 +117,12 @@ class _LicensesPageState extends State<LicensesPage> {
                 children: <Widget>[
                   Text(
                     name,
-                    style: Theme.of(context).textTheme.headline5,
+                    style: Theme.of(context).textTheme.headline,
                   ),
                   if (version != null)
                     Text(
                       version,
-                      style: Theme.of(context).textTheme.bodyText2,
+                      style: Theme.of(context).textTheme.body1,
                     ),
                   const SizedBox(height: 18),
                   Text(
@@ -132,7 +132,7 @@ class _LicensesPageState extends State<LicensesPage> {
                   Container(height: 18),
                   Text(
                     'Powered by Flutter',
-                    style: Theme.of(context).textTheme.bodyText2,
+                    style: Theme.of(context).textTheme.body1,
                   ),
                   Container(height: 24),
                   ..._licenses,

diff --git a/lib/shared/ui/description.dart b/lib/shared/ui/description.dart
@@ -13,7 +13,7 @@ class Description extends StatelessWidget {
       width: 640,
       padding: const EdgeInsets.symmetric(horizontal: 20),
       child: DefaultTextStyle.merge(
-        style: Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 25),
+        style: Theme.of(context).textTheme.subhead.copyWith(fontSize: 25),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
@@ -102,7 +102,7 @@ class _Description extends StatelessWidget {
     return SizedBox(
       width: 600,
       child: RichText(
-        text: TextSpan(style: Theme.of(context).textTheme.subtitle1, children: [
+        text: TextSpan(style: Theme.of(context).textTheme.subhead, children: [
           const TextSpan(
             text: 'Do you need simple animation samples for Flutter?\n'
                 'I present you my set of Flutter animation code snippets. '

diff --git a/lib/shared/ui/footer.dart b/lib/shared/ui/footer.dart
@@ -18,7 +18,7 @@ class Footer extends StatelessWidget {
               onPressed: () => Navigator.of(context).pushNamed(Routes.content),
               child: Text(
                 'Content',
-                style: theme.textTheme.headline6.copyWith(
+                style: theme.textTheme.title.copyWith(
                   color: Colors.white,
                 ),
               ),
@@ -32,7 +32,7 @@ class Footer extends StatelessWidget {
               onPressed: () => Navigator.of(context).pushNamed(Routes.licenses),
               child: Text(
                 'Licenses',
-                style: theme.textTheme.headline6.copyWith(
+                style: theme.textTheme.title.copyWith(
                   color: Colors.white,
                 ),
               ),

diff --git a/lib/shared/ui/new_section.dart b/lib/shared/ui/new_section.dart
@@ -29,7 +29,7 @@ class NewSection extends StatelessWidget {
     ]
         .map((example) => Text(
               '    • ${example.title}',
-              style: Theme.of(context).textTheme.headline6.copyWith(fontSize: 25),
+              style: Theme.of(context).textTheme.title.copyWith(fontSize: 25),
             ))
         .toList(growable: false);
     return children.isNotEmpty
@@ -46,7 +46,7 @@ class NewSection extends StatelessWidget {
                     NewLabel(),
                     Text(
                       ' wigets:',
-                      style: Theme.of(context).textTheme.headline4.copyWith(
+                      style: Theme.of(context).textTheme.display1.copyWith(
                           fontWeight: FontWeight.bold, color: Colors.black),
                     ),
                   ],

diff --git a/lib/shared/ui/search_bar.dart b/lib/shared/ui/search_bar.dart
@@ -39,8 +39,8 @@ class _SearchBarState extends State<SearchBar> {
       automaticallyImplyLeading: false,
       title: TextField(
         controller: _controller,
-        style: Theme.of(context).primaryTextTheme.headline6,
-        cursorColor: Theme.of(context).primaryTextTheme.headline6.color,
+        style: Theme.of(context).primaryTextTheme.title,
+        cursorColor: Theme.of(context).primaryTextTheme.title.color,
         keyboardType: TextInputType.text,
         autofocus: true,
       ),

diff --git a/lib/shared/ui/section.dart b/lib/shared/ui/section.dart
@@ -67,7 +67,7 @@ class _SectionState extends State<Section> with SingleTickerProviderStateMixin {
             ),
             const SizedBox(height: 20),
             DefaultTextStyle.merge(
-              style: Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 25),
+              style: Theme.of(context).textTheme.subhead.copyWith(fontSize: 25),
               child: widget.body,
             ),
             const SizedBox(height: 20),
@@ -154,7 +154,7 @@ class DoubleSection extends StatelessWidget {
             ),
             const SizedBox(height: 20),
             DefaultTextStyle.merge(
-              style: Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 25),
+              style: Theme.of(context).textTheme.subhead.copyWith(fontSize: 25),
               child: body,
             ),
             const SizedBox(height: 20),
@@ -193,13 +193,13 @@ class SectionHeader extends StatelessWidget {
             DefaultTextStyle.merge(
               style: Theme.of(context)
                   .textTheme
-                  .headline4
+                  .display1
                   .copyWith(fontWeight: FontWeight.bold, color: Colors.black),
               child: title,
             ),
             const SizedBox(height: 20),
             DefaultTextStyle.merge(
-              style: Theme.of(context).textTheme.subtitle1.copyWith(fontSize: 25),
+              style: Theme.of(context).textTheme.subhead.copyWith(fontSize: 25),
               child: child,
             ),
             const SizedBox(height: 20),
@@ -226,7 +226,7 @@ class SectionTitle extends StatelessWidget {
   Widget build(BuildContext context) {
     final titleWidget = Text(
       title,
-      style: Theme.of(context).textTheme.headline5.copyWith(
+      style: Theme.of(context).textTheme.headline.copyWith(
             fontWeight: FontWeight.bold,
             fontSize: 35,
           ),

diff --git a/lib/transitions/default_text_style.dart b/lib/transitions/default_text_style.dart
@@ -16,8 +16,8 @@ class DefaultTextStyleExample extends StatelessWidget {
       style: animation
           .drive(CurveTween(curve: Curves.fastOutSlowIn))
           .drive(TextStyleTween(
-            begin: Theme.of(context).textTheme.headline4,
-            end: Theme.of(context).textTheme.headline2,
+            begin: Theme.of(context).textTheme.display1,
+            end: Theme.of(context).textTheme.display3,
           )),
       child: const Text('Flutter'),
     );

diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -21,7 +21,6 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		283F7411E1ACA660669AA953 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F7D5947D766E76000E9BFFE /* Pods_Runner.framework */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
@@ -59,8 +58,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		20FF289891F3182D52D4B9E2 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		2F7D5947D766E76000E9BFFE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		33CC10ED2044A3C60003C045 /* Flutter Desktop Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Flutter Desktop Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -78,9 +75,7 @@
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		C7EDC928B59186F4A6A5D860 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; };
-		FFBB31FF973B1796960654DA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -90,7 +85,6 @@
 			files = (
 				D73912F022F37F9E000D13A0 /* App.framework in Frameworks */,
 				33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */,
-				283F7411E1ACA660669AA953 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -115,7 +109,6 @@
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
-				A48C6381E79F790BD3FDB9C9 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -164,21 +157,9 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		A48C6381E79F790BD3FDB9C9 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				C7EDC928B59186F4A6A5D860 /* Pods-Runner.debug.xcconfig */,
-				20FF289891F3182D52D4B9E2 /* Pods-Runner.release.xcconfig */,
-				FFBB31FF973B1796960654DA /* Pods-Runner.profile.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				2F7D5947D766E76000E9BFFE /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -190,13 +171,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				5A977D9A54EEE67B5F90D788 /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				69BE4BB488C4B370BE0FC718 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -303,43 +282,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh\ntouch Flutter/ephemeral/tripwire\n";
 		};
-		5A977D9A54EEE67B5F90D788 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		69BE4BB488C4B370BE0FC718 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Presentations made with Flutter
 
 environment:
   sdk: ">=2.6.0-dev.0.0.flutter-1103600280 <3.0.0"
-  flutter: ">=1.14.6 <2.0.0"
+
 
 dependencies:
   flutter:
@@ -26,9 +26,13 @@ dev_dependencies:
   args: ^1.5.2
   process_run: ^0.10.3
   rxdart: 0.22.0
-  fast_flutter_driver: ^0.1.0
+  fast_flutter_driver:
+    git:
+      url: git://github.com/tomaszpolanski/fast_flutter_driver.git
+      path: driver
 
 flutter:
+
   uses-material-design: true
   assets:
     - assets/favicon.png

diff --git a/test_driver/generic/generic_test.dart b/test_driver/generic/generic_test.dart
@@ -1,12 +1,11 @@
 // ignore_for_file: directives_ordering
-/// This file is autogenerated and should not be committed to source control
 
+import '../../test_driver/curves_test.dart' as test_driver_curves;
 import '../../test_driver/root_test.dart' as test_driver_root;
 import '../../test_driver/sliver_fill_remaining_test.dart' as test_driver_sliver_fill_remaining;
-import '../../test_driver/curves_test.dart' as test_driver_curves;
 
 void main(List<String> args) {
+  test_driver_curves.main(args);
   test_driver_root.main(args);
   test_driver_sliver_fill_remaining.main(args);
-  test_driver_curves.main(args);
 }
diff --git a/windows/FlutterBuild.vcxproj b/windows/FlutterBuild.vcxproj
@@ -14,12 +14,11 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{6419BF13-6ECD-4CD2-9E85-E566A1F03F8F}</ProjectGuid>
     <ProjectName>Flutter Build</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -43,4 +42,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
		#include "Generated.xcconfig"
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
		#include "ephemeral/Flutter-Generated.xcconfig"