Skip to content

Commit

Permalink
Update to latest flutter version
Browse files Browse the repository at this point in the history
  • Loading branch information
derolf committed Feb 13, 2023
1 parent a48e4ad commit f7ad71e
Show file tree
Hide file tree
Showing 13 changed files with 171 additions and 150 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Expand Up @@ -29,4 +29,8 @@ First release:

## 0.0.7

- Bugfix in useValueListener
- Bugfix in useValueListener

## 0.0.8

- Upgrade to latest stable
2 changes: 1 addition & 1 deletion analysis_options.yaml
@@ -1,4 +1,4 @@
include: package:lint/analysis_options_package.yaml
include: package:flutter_lints/flutter.yaml

analyzer:
strong-mode:
Expand Down
26 changes: 23 additions & 3 deletions example/.metadata
@@ -1,10 +1,30 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled and should not be manually edited.
# This file should be version controlled.

version:
revision: c5a4b4029c0798f37c4a39b479d7cb75daa7b05c
channel: beta
revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
channel: stable

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
- platform: macos
create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf

# User provided section

# List of Local paths (relative to this file) that should be
# ignored by the migrate tool.
#
# Files that are not part of the templates will be ignored by default.
unmanaged_files:
- 'lib/main.dart'
- 'ios/Runner.xcodeproj/project.pbxproj'
2 changes: 2 additions & 0 deletions example/analysis_options.yaml
@@ -0,0 +1,2 @@
include: package:flutter_lints/flutter.yaml

2 changes: 1 addition & 1 deletion example/lib/main.dart
Expand Up @@ -176,7 +176,7 @@ class BuildTrackerExample extends HookConsumerWidget {
key: const ValueKey('ignore'),
builder: (_) {
final controller = useScrollController();
WidgetsBinding.instance!.addPostFrameCallback(
WidgetsBinding.instance.addPostFrameCallback(
(_) =>
controller.jumpTo(controller.position.maxScrollExtent),
);
Expand Down
3 changes: 1 addition & 2 deletions example/pubspec.yaml
Expand Up @@ -18,8 +18,7 @@ dependencies:
path: ../

dev_dependencies:
build_runner: ^2.0.1
lint: ^1.5.3
flutter_lints:

flutter:
uses-material-design: true
1 change: 1 addition & 0 deletions lib/src/build_tracker/build_tracker.dart
@@ -1,4 +1,5 @@
import 'package:built_collection/built_collection.dart';
import 'package:collection/collection.dart';
import 'package:flutter/widgets.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:noob/src/build_tracker/tracking_build_owner.dart';
Expand Down
7 changes: 6 additions & 1 deletion lib/src/build_tracker/test_tracking_build_owner.dart
Expand Up @@ -10,9 +10,14 @@ class TrackingBuildOwnerAutomatedTestWidgetsFlutterBinding
extends AutomatedTestWidgetsFlutterBinding
with TrackingBuildOwnerWidgetsBindingMixin {
static WidgetsBinding ensureInitialized() {
if (WidgetsBinding.instance == null) {
if (!_initialized) {
_initialized = true;
TrackingBuildOwnerAutomatedTestWidgetsFlutterBinding();
}
assert(WidgetsBinding.instance
is TrackingBuildOwnerAutomatedTestWidgetsFlutterBinding);
return WidgetsBinding.instance;
}

static var _initialized = false;
}
6 changes: 5 additions & 1 deletion lib/src/build_tracker/tracking_build_owner.dart
Expand Up @@ -35,11 +35,15 @@ mixin TrackingBuildOwnerWidgetsBindingMixin on WidgetsBinding {
class TrackingBuildOwnerWidgetsFlutterBinding extends WidgetsFlutterBinding
with TrackingBuildOwnerWidgetsBindingMixin {
static WidgetsBinding ensureInitialized() {
if (WidgetsBinding.instance == null) {
if (!_initialized) {
_initialized = true;
TrackingBuildOwnerWidgetsFlutterBinding();
}
assert(WidgetsBinding.instance is TrackingBuildOwnerWidgetsFlutterBinding);
return WidgetsBinding.instance;
}

static var _initialized = false;
}

///
Expand Down
16 changes: 8 additions & 8 deletions lib/src/tools/hooks.dart
Expand Up @@ -69,13 +69,13 @@ void useListener(
return null;
}

void _callback() => callbackHolder.value.call();
void lcallback() => callbackHolder.value.call();

listenable.addListener(_callback);
listenable.addListener(lcallback);
if (callInitially) {
_callback();
callback();
}
return () => listenable.removeListener(_callback);
return () => listenable.removeListener(lcallback);
},
[listenable],
);
Expand Down Expand Up @@ -111,13 +111,13 @@ void useValueListener<T>(
if (listenable == null) {
return null;
}
void _callback() => callbackHolder.value(listenable.value);
void lcallback() => callbackHolder.value(listenable.value);

listenable.addListener(_callback);
listenable.addListener(lcallback);
if (callInitially) {
callback(listenable.value);
}
return () => listenable.removeListener(_callback);
return () => listenable.removeListener(lcallback);
},
[listenable],
);
Expand Down Expand Up @@ -158,7 +158,7 @@ class _DisposableHookState<T extends Object>
late T _value;

@override
T build(BuildContext _context) => _value;
T build(BuildContext context) => _value;

@override
void initHook() => _value = hook.create();
Expand Down
15 changes: 8 additions & 7 deletions lib/src/tools/router.dart
@@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import "package:flutter/material.dart";
import "package:freezed_annotation/freezed_annotation.dart";
import "package:collection/collection.dart";

part 'router.freezed.dart';
part "router.freezed.dart";

///
/// See [UriRoute].
Expand Down Expand Up @@ -191,7 +192,7 @@ class UriRoute with _$UriRoute {
/// Tell whether the given segment is a key (has a leading `:` in [path]).
///
late final List<bool> pathSegmentIsKey =
Uri.parse(path).pathSegments.map((_) => _.startsWith(':')).toList();
Uri.parse(path).pathSegments.map((_) => _.startsWith(":")).toList();

///
/// Build the `path` with the given arguments.
Expand All @@ -215,7 +216,7 @@ class UriRoute with _$UriRoute {
if (i == pathSegments.length) {
throw ArgumentError.value(
pathParams,
'pathParams',
"pathParams",
'Key ${e.key} is not a segment key in path "$path"',
);
}
Expand All @@ -227,12 +228,12 @@ class UriRoute with _$UriRoute {
if (i >= 0) {
throw ArgumentError.value(
pathParams,
'pathParams',
"pathParams",
'Missing a value for segment key ${pathSegments[i]} in path "$path"',
);
}
return Uri(
pathSegments: ['', ...pathSegments],
pathSegments: ["", ...pathSegments],
queryParameters: queryParams,
).toString();
}
Expand Down

0 comments on commit f7ad71e

Please sign in to comment.