Merge pull request #55 from boyan01/dev-nnbd

migrating to null safe

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v1
         with:
-          channel: 'stable'
+          channel: 'dev'
       - run: flutter config --enable-web
       - run: flutter pub get
 
@@ -30,4 +30,4 @@ jobs:
         uses: codecov/[email protected]
         with:
           token: ${{secrets.CODECOV_TOKEN}}
-          flags: unittests
+          flags: unittests

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [1.1.0-nullsafety.0]
+* migrate to nullsafety.
+
 ## [1.0.5] - 2020/7/20
 * Expose duration to `showSimpleNotification` [#46](https://github.com/boyan01/overlay_support/pull/46) by [Elvis Sun](https://github.com/elvisun)
 

example/android/.gitignore

@@ -0,0 +1,11 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties

example/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

example/android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

example/ios/.gitignore

@@ -0,0 +1,32 @@
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3

example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

example/lib/main.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:overlay_support/overlay_support.dart';
-import 'package:overlay_support_example/pages/page_main.dart';
-import 'package:overlay_support_example/pages/page_with_ime.dart';
+
+import 'pages/page_main.dart';
+import 'pages/page_with_ime.dart';
 
 void main() {
   debugDefaultTargetPlatformOverride = TargetPlatform.android;
@@ -50,7 +51,7 @@ class _ExampleDrawerState extends State<_ExampleDrawer> {
                 color: Theme.of(context).primaryIconTheme.color,
                 progress: ProxyAnimation(kAlwaysDismissedAnimation)),
             onPressed: () {
-              _scaffoldKey.currentState.openDrawer();
+              _scaffoldKey.currentState?.openDrawer();
             }),
       ),
       body: HomePage(),

example/lib/notification/custom_animation.dart

@@ -9,7 +9,7 @@ class CustomAnimationToast extends StatelessWidget {
 
   static final Tween<double> tweenOpacity = Tween<double>(begin: 0, end: 1);
 
-  const CustomAnimationToast({Key key, @required this.value}) : super(key: key);
+  const CustomAnimationToast({Key? key, required this.value}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

example/lib/notification/custom_notification.dart

@@ -15,9 +15,9 @@ class MessageNotification extends StatelessWidget {
   final String message;
 
   const MessageNotification({
-    Key key,
-    @required this.onReply,
-    @required this.message,
+    Key? key,
+    required this.onReply,
+    required this.message,
   }) : super(key: key);
 
   @override

example/lib/notification/ios_toast.dart

@@ -5,7 +5,7 @@ class IosStyleToast extends StatelessWidget {
   Widget build(BuildContext context) {
     return SafeArea(
       child: DefaultTextStyle(
-        style: Theme.of(context).textTheme.bodyText2.copyWith(color: Colors.white),
+        style: Theme.of(context).textTheme.bodyText2!.copyWith(color: Colors.white),
         child: Padding(
           padding: const EdgeInsets.all(16),
           child: Center(

example/lib/pages/page_main.dart

@@ -32,7 +32,7 @@ class HomePage extends StatelessWidget {
                   return FlatButton(
                       textColor: Colors.yellow,
                       onPressed: () {
-                        OverlaySupportEntry.of(context).dismiss();
+                        OverlaySupportEntry.of(context)!.dismiss();
                       },
                       child: Text('Dismiss'));
                 }),
@@ -57,7 +57,7 @@ class HomePage extends StatelessWidget {
                 return MessageNotification(
                   message: messages[3],
                   onReply: () {
-                    OverlaySupportEntry.of(context).dismiss();
+                    OverlaySupportEntry.of(context)!.dismiss();
                     toast('you checked this message');
                   },
                 );
@@ -74,7 +74,7 @@ class HomePage extends StatelessWidget {
                   return MessageNotification(
                     message: messages[i],
                     onReply: () {
-                      OverlaySupportEntry.of(context).dismiss();
+                      OverlaySupportEntry.of(context)!.dismiss();
                       toast('you checked this message');
                     },
                   );
@@ -121,13 +121,13 @@ class HomePage extends StatelessWidget {
                 return Container(
                   color: Color.lerp(Colors.transparent, Colors.black54, t),
                   child: FractionalTranslation(
-                    translation: Offset.lerp(const Offset(0, -1), const Offset(0, 0), t),
+                    translation: Offset.lerp(const Offset(0, -1), const Offset(0, 0), t)!,
                     child: Column(
                       children: <Widget>[
                         MessageNotification(
                           message: "Hello",
                           onReply: () {
-                            OverlaySupportEntry.of(context).dismiss();
+                            OverlaySupportEntry.of(context)!.dismiss();
                           },
                           key: ModalKey(const Object()),
                         ),
@@ -150,7 +150,7 @@ class _Section extends StatelessWidget {
 
   final List<Widget> children;
 
-  const _Section({Key key, @required this.title, @required this.children}) : super(key: key);
+  const _Section({Key? key, required this.title, required this.children}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -171,7 +171,7 @@ class _Section extends StatelessWidget {
 class _Title extends StatelessWidget {
   final String title;
 
-  const _Title({Key key, @required this.title}) : super(key: key);
+  const _Title({Key? key, required this.title}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

example/pubspec.yaml

@@ -2,9 +2,10 @@ name: overlay_support_example
 description: example for overlay_support library
 
 version: 1.0.0+1
+publish_to: none
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: '>=2.12.0-0 <3.0.0'
 
 dependencies:
   flutter:

example/web/manifest.json

@@ -0,0 +1,23 @@
+{
+    "name": "example",
+    "short_name": "example",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+}