Upgrade connectivity plugin version #27

fixes #24

Author: jogboms

.travis.yml

@@ -13,7 +13,7 @@ script:
   # abort on error
   - set -e
   - flutter packages get
-  - flutter format --set-exit-if-changed lib example
+  - flutter format --set-exit-if-changed -l lib -l 120 example
   - flutter analyze lib example
   - flutter test --no-pub --coverage
   # export coverage

README.md

@@ -8,13 +8,9 @@ A tidy utility to handle offline/online connectivity like a Boss. It provides su
 
 ```yaml
 dependencies:
-  flutter_offline: "^0.2.4"
+  flutter_offline: "^0.3.0"
 ```
 
-#### Note for AndroidX Apps
-
-Make sure to point to `0.2.4+1`
-
 ### ⚡️ Import
 
 ```dart

example/lib/demo_page.dart

@@ -10,9 +10,9 @@ class DemoPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return new Scaffold(
-      appBar: new AppBar(
-        title: new Text("Offline Demo"),
+    return Scaffold(
+      appBar: AppBar(
+        title: Text("Offline Demo"),
       ),
       body: child,
     );

example/lib/main.dart

@@ -5,14 +5,14 @@ import './widgets/demo_1.dart';
 import './widgets/demo_2.dart';
 import './widgets/demo_3.dart';
 
-void main() => runApp(new MyApp());
+void main() => runApp(MyApp());
 
 class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return new MaterialApp(
+    return MaterialApp(
       title: 'Offline Demo',
-      theme: new ThemeData.dark(),
+      theme: ThemeData.dark(),
       home: Builder(
         builder: (BuildContext context) {
           return Column(

example/lib/widgets/demo_1.dart

@@ -36,8 +36,7 @@ class Demo1 extends StatelessWidget {
                               height: 12.0,
                               child: CircularProgressIndicator(
                                 strokeWidth: 2.0,
-                                valueColor:
-                                    AlwaysStoppedAnimation<Color>(Colors.white),
+                                valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
                               ),
                             ),
                           ],
@@ -51,10 +50,10 @@ class Demo1 extends StatelessWidget {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
-          new Text(
+          Text(
             'There are no bottons to push :)',
           ),
-          new Text(
+          Text(
             'Just turn off your internet.',
           ),
         ],

example/lib/widgets/demo_2.dart

@@ -26,13 +26,13 @@ class Demo2 extends StatelessWidget {
       },
       builder: (BuildContext context) {
         return Center(
-          child: new Column(
+          child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              new Text(
+              Text(
                 'There are no bottons to push :)',
               ),
-              new Text(
+              Text(
                 'Just turn off your internet.',
               ),
             ],

example/lib/widgets/demo_3.dart

@@ -25,16 +25,16 @@ class Demo3 extends StatelessWidget {
         return child;
       },
       child: Center(
-        child: new Column(
+        child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
-            new Text(
+            Text(
               'There are no bottons to push :)',
             ),
-            new Text(
+            Text(
               'Just turn off your internet.',
             ),
-            new Text(
+            Text(
               'This one has a bit of a delay.',
             ),
           ],

flutter_offline.iml

@@ -9,6 +9,9 @@
       <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

lib/src/main.dart

@@ -4,15 +4,12 @@ import 'package:connectivity/connectivity.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_offline/src/utils.dart';
 
-const kOfflineDebounceDuration = const Duration(seconds: 3);
-
-typedef Widget ConnectivityBuilder(
-    BuildContext context, ConnectivityResult connectivity, Widget child);
+const kOfflineDebounceDuration = Duration(seconds: 3);
 
 class OfflineBuilder extends StatefulWidget {
   factory OfflineBuilder({
     Key key,
-    @required ConnectivityBuilder connectivityBuilder,
+    @required ValueWidgetBuilder<ConnectivityResult> connectivityBuilder,
     Duration debounceDuration = kOfflineDebounceDuration,
     WidgetBuilder builder,
     Widget child,
@@ -38,14 +35,10 @@ class OfflineBuilder extends StatefulWidget {
     this.builder,
     this.child,
     this.errorBuilder,
-  })  : assert(
-            connectivityBuilder != null, 'connectivityBuilder cannot be null'),
+  })  : assert(connectivityBuilder != null, 'connectivityBuilder cannot be null'),
         assert(debounceDuration != null, 'debounceDuration cannot be null'),
-        assert(
-            connectivityService != null, 'connectivityService cannot be null'),
-        assert(
-            !(builder is WidgetBuilder && child is Widget) &&
-                !(builder == null && child == null),
+        assert(connectivityService != null, 'connectivityService cannot be null'),
+        assert(!(builder is WidgetBuilder && child is Widget) && !(builder == null && child == null),
             'You should specify either a builder or a child'),
         super(key: key);
 
@@ -56,7 +49,7 @@ class OfflineBuilder extends StatefulWidget {
   final Duration debounceDuration;
 
   /// Used for building the Offline and/or Online UI
-  final ConnectivityBuilder connectivityBuilder;
+  final ValueWidgetBuilder<ConnectivityResult> connectivityBuilder;
 
   /// Used for building the child widget
   final WidgetBuilder builder;
@@ -78,37 +71,28 @@ class OfflineBuilderState extends State<OfflineBuilder> {
   void initState() {
     super.initState();
 
-    _connectivityStream = Stream.fromFuture(
-      widget.connectivityService.checkConnectivity(),
-    ).asyncExpand(
-      (ConnectivityResult data) {
-        return widget.connectivityService.onConnectivityChanged.transform(
-          startsWith(data),
-        );
-      },
-    ).transform(
-      debounce(widget.debounceDuration),
-    );
+    _connectivityStream = Stream.fromFuture(widget.connectivityService.checkConnectivity())
+        .asyncExpand((data) => widget.connectivityService.onConnectivityChanged.transform(startsWith(data)))
+        .transform(debounce(widget.debounceDuration));
   }
 
   @override
   Widget build(BuildContext context) {
     return StreamBuilder<ConnectivityResult>(
       stream: _connectivityStream,
-      builder: (
-        BuildContext context,
-        AsyncSnapshot<ConnectivityResult> snapshot,
-      ) {
-        final child = widget.child ?? widget.builder(context);
+      builder: (BuildContext context, AsyncSnapshot<ConnectivityResult> snapshot) {
         if (!snapshot.hasData && !snapshot.hasError) {
           return const SizedBox();
-        } else if (snapshot.hasError) {
+        }
+
+        if (snapshot.hasError) {
           if (widget.errorBuilder != null) {
             return widget.errorBuilder(context);
           }
           throw OfflineBuilderError(snapshot.error);
         }
-        return widget.connectivityBuilder(context, snapshot.data, child);
+
+        return widget.connectivityBuilder(context, snapshot.data, widget.child ?? widget.builder(context));
       },
     );
   }

lib/src/utils.dart

@@ -39,8 +39,7 @@ StreamTransformer<ConnectivityResult, ConnectivityResult> startsWith(
       controller = StreamController<ConnectivityResult>(
         sync: true,
         onListen: () => controller?.add(data),
-        onPause: ([Future<dynamic> resumeSignal]) =>
-            subscription.pause(resumeSignal),
+        onPause: ([Future<dynamic> resumeSignal]) => subscription.pause(resumeSignal),
         onResume: () => subscription.resume(),
         onCancel: () => subscription.cancel(),
       );