feat: small tweaks for new flutter (#43)

flame-engine · Jul 25, 2024 · 5d70c94 · 5d70c94
1 parent 9113879
commit 5d70c94
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 22 deletions.
diff --git a/fire_atlas_editor/lib/theme.dart b/fire_atlas_editor/lib/theme.dart
@@ -14,8 +14,8 @@ final darkTheme = ThemeData(
  indicatorColor: _buttonColor,
  visualDensity: VisualDensity.adaptivePlatformDensity,
  checkboxTheme: CheckboxThemeData(
- checkColor: MaterialStateProperty.all(_buttonColor),
- fillColor: MaterialStateProperty.all(_darkPrimaryColor),
+ checkColor: WidgetStateProperty.all(_buttonColor),
+ fillColor: WidgetStateProperty.all(_darkPrimaryColor),
  ),
  brightness: Brightness.dark,
 );
diff --git a/fire_atlas_editor/lib/widgets/button.dart b/fire_atlas_editor/lib/widgets/button.dart
@@ -29,7 +29,7 @@ class FButton extends StatelessWidget {
  child: Opacity(
  opacity: disabled ? 0.6 : 1,
  child: ElevatedButton(
- style: ButtonStyle(backgroundColor: MaterialStateProperty.all(color)),
+ style: ButtonStyle(backgroundColor: WidgetStateProperty.all(color)),
  onPressed: () {
  if (!disabled) {
  onSelect();

diff --git a/fire_atlas_editor/macos/Podfile.lock b/fire_atlas_editor/macos/Podfile.lock
@@ -32,4 +32,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.15.2
diff --git a/fire_atlas_editor/macos/Runner.xcodeproj/project.pbxproj b/fire_atlas_editor/macos/Runner.xcodeproj/project.pbxproj
@@ -202,7 +202,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0920;
- LastUpgradeCheck = 1300;
+ LastUpgradeCheck = 1510;
  ORGANIZATIONNAME = "";
  TargetAttributes = {
  33CC10EC2044A3C60003C045 = {

diff --git a/fire_atlas_editor/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/fire_atlas_editor/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1300"
+ LastUpgradeVersion = "1510"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/fire_atlas_editor/pubspec.lock b/fire_atlas_editor/pubspec.lock
@@ -232,30 +232,54 @@ packages:
  url: "https://pub.dev"
  source: hosted
  version: "0.6.7"
+ leak_tracker:
+ dependency: transitive
+ description:
+ name: leak_tracker
+ sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+ url: "https://pub.dev"
+ source: hosted
+ version: "10.0.4"
+ leak_tracker_flutter_testing:
+ dependency: transitive
+ description:
+ name: leak_tracker_flutter_testing
+ sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.3"
+ leak_tracker_testing:
+ dependency: transitive
+ description:
+ name: leak_tracker_testing
+ sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.1"
  matcher:
  dependency: transitive
  description:
  name: matcher
- sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+ sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
  url: "https://pub.dev"
  source: hosted
- version: "0.12.16"
+ version: "0.12.16+1"
  material_color_utilities:
  dependency: transitive
  description:
  name: material_color_utilities
- sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+ sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
  url: "https://pub.dev"
  source: hosted
- version: "0.5.0"
+ version: "0.8.0"
  meta:
  dependency: transitive
  description:
  name: meta
- sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+ sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
  url: "https://pub.dev"
  source: hosted
- version: "1.10.0"
+ version: "1.12.0"
  ordered_set:
  dependency: transitive
  description:
@@ -268,10 +292,10 @@ packages:
  dependency: transitive
  description:
  name: path
- sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+ sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
  url: "https://pub.dev"
  source: hosted
- version: "1.8.3"
+ version: "1.9.0"
  path_provider_linux:
  dependency: transitive
  description:
@@ -441,10 +465,10 @@ packages:
  dependency: transitive
  description:
  name: test_api
- sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+ sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
  url: "https://pub.dev"
  source: hosted
- version: "0.6.1"
+ version: "0.7.0"
  typed_data:
  dependency: transitive
  description:
@@ -525,14 +549,14 @@ packages:
  url: "https://pub.dev"
  source: hosted
  version: "2.1.4"
- web:
+ vm_service:
  dependency: transitive
  description:
- name: web
- sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+ name: vm_service
+ sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
  url: "https://pub.dev"
  source: hosted
- version: "0.3.0"
+ version: "14.2.1"
  win32:
  dependency: transitive
  description:
@@ -550,5 +574,5 @@ packages:
  source: hosted
  version: "0.2.0+3"
 sdks:
- dart: ">=3.2.0-194.0.dev <4.0.0"
- flutter: ">=3.3.0"
+ dart: ">=3.3.0 <4.0.0"
+ flutter: ">=3.18.0-18.0.pre.54"