Migrate ios_add2app_life_cycle to nullsafety (#80617)

This commit is contained in:
Abhishek Ghaskata 2021-04-21 04:19:02 +05:30 committed by GitHub
parent fdda777e34
commit 013dc3dd7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions

View File

@ -8,14 +8,14 @@ import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:collection/collection.dart';
VoidCallback originalSemanticsListener;
VoidCallback? originalSemanticsListener;
void main() {
WidgetsFlutterBinding.ensureInitialized();
// Disconnects semantics listener for testing purposes.
originalSemanticsListener = ui.window.onSemanticsEnabledChanged;
ui.window.onSemanticsEnabledChanged = null;
RendererBinding.instance.setSemanticsEnabled(false);
RendererBinding.instance?.setSemanticsEnabled(false);
// If the test passes, LifeCycleSpy will rewire the semantics listener back.
runApp(const LifeCycleSpy());
}
@ -28,7 +28,7 @@ void main() {
///
/// Rewiring semantics is a signal to native IOS test that the test has passed.
class LifeCycleSpy extends StatefulWidget {
const LifeCycleSpy({Key key}) : super(key: key);
const LifeCycleSpy({Key? key}) : super(key: key);
@override
_LifeCycleSpyState createState() => _LifeCycleSpyState();
@ -40,36 +40,36 @@ class _LifeCycleSpyState extends State<LifeCycleSpy> with WidgetsBindingObserver
AppLifecycleState.inactive,
AppLifecycleState.resumed,
];
List<AppLifecycleState> _actualLifeCycleSequence;
List<AppLifecycleState?>? _actualLifeCycleSequence;
@override
void initState(){
super.initState();
WidgetsBinding.instance.addObserver(this);
_actualLifeCycleSequence = <AppLifecycleState>[
ServicesBinding.instance.lifecycleState
WidgetsBinding.instance?.addObserver(this);
_actualLifeCycleSequence = <AppLifecycleState?>[
ServicesBinding.instance?.lifecycleState
];
}
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
WidgetsBinding.instance?.removeObserver(this);
super.dispose();
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
setState(() {
_actualLifeCycleSequence = List<AppLifecycleState>.from(_actualLifeCycleSequence);
_actualLifeCycleSequence.add(state);
_actualLifeCycleSequence = List<AppLifecycleState>.from(_actualLifeCycleSequence!);
_actualLifeCycleSequence?.add(state);
});
}
@override
Widget build(BuildContext context) {
if (const ListEquality<AppLifecycleState>().equals(_actualLifeCycleSequence, _expectedLifeCycleSequence)) {
if (const ListEquality<AppLifecycleState?>().equals(_actualLifeCycleSequence, _expectedLifeCycleSequence)) {
// Rewires the semantics harness if test passes.
RendererBinding.instance.setSemanticsEnabled(true);
RendererBinding.instance?.setSemanticsEnabled(true);
ui.window.onSemanticsEnabledChanged = originalSemanticsListener;
}
return const MaterialApp(

View File

@ -14,7 +14,7 @@ description: A new flutter module project.
version: 1.0.0+1
environment:
sdk: ">=2.0.0-dev.68.0 <3.0.0"
sdk: ">=2.12.0 <3.0.0"
dependencies:
flutter: