Merge pull request #134 from GetStream/release-0.3.0

Author: sachaarbonel

packages/stream_feed/analysis_options.yaml renamed to analysis_options.yaml

@@ -1,3 +1,11 @@
+
+# This is the default analysis_options.yaml for all packages and examples
+# If a package needs specific rules, create the analysis_options.yaml on it
+# include this file, like:
+#
+# include: ../../analysis_options.yaml
+#
+
 analyzer:
   exclude:
     - lib/**/*.g.dart

example/lib/activity_item.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:stream_feed/stream_feed.dart';
 import 'package:timeago/timeago.dart' as timeago;
 
-import 'dummy_app_user.dart';
+import 'app_user.dart';
 
 class ActivityCard extends StatelessWidget {
   final Activity activity;
@@ -11,8 +11,8 @@ class ActivityCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final user =
-        DummyAppUser.values.firstWhere((it) => it.id == activity.actor);
+    final user = appUsers
+        .firstWhere((it) => createUserReference(it.id) == activity.actor);
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
       child: Column(
@@ -21,15 +21,15 @@ class ActivityCard extends StatelessWidget {
           Row(
             children: [
               CircleAvatar(
-                child: Text(user.name![0]),
+                child: Text(user.name[0]),
               ),
               SizedBox(width: 16),
               Expanded(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Text(
-                      user.name!,
+                      user.name,
                       style: TextStyle(
                         fontSize: 18,
                       ),

example/lib/app_user.dart

@@ -0,0 +1,38 @@
+class AppUser {
+  final String id;
+  final String name;
+  final String token;
+
+  const AppUser.sahil()
+      : id = 'sahil-kumar',
+        name = 'Sahil Kumar',
+        token =
+            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoic2FoaWwta3VtYXIifQ.d6RW5eZedEl949w-IeZ40Ukji3yXfFnMw3baLsow028';
+
+  const AppUser.sacha()
+      : id = 'sacha-arbonel',
+        name = 'Sacha Arbonel',
+        token =
+            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoic2FjaGEtYXJib25lbCJ9.fzDKEyiQ40J4YYgtZxpeQhn6ajX-GEnKZOOmcb-xa7M';
+
+  const AppUser.nash()
+      : id = 'neevash-ramdial',
+        name = 'Neevash Ramdial',
+        token =
+            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoibmVldmFzaC1yYW1kaWFsIn0.yKqSehu_O5WJGh3-aa5qipnBRs7Qtue-1T9TZhT2ejw';
+
+  Map<String, Object> get data {
+    final parts = name.split(' ');
+    return {
+      'first_name': parts[0],
+      'last_name': parts[1],
+      'full_name': name,
+    };
+  }
+}
+
+const appUsers = [
+  AppUser.sahil(),
+  AppUser.sacha(),
+  AppUser.nash(),
+];

example/lib/utils/utils.dart renamed to example/lib/client_provider.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:stream_feed/stream_feed.dart';
 
@@ -10,16 +11,14 @@ class ClientProvider extends InheritedWidget {
 
   final StreamFeedClient client;
 
-  static ClientProvider? of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<ClientProvider>();
+  static ClientProvider of(BuildContext context) {
+    final client = context.dependOnInheritedWidgetOfExactType<ClientProvider>();
+    assert(client != null, 'Client not found in the widget tree');
+    return client!;
   }
 
   @override
   bool updateShouldNotify(ClientProvider old) {
     return old.child != child || old.client != client;
   }
 }
-
-extension ProviderX on BuildContext {
-  StreamFeedClient get client => ClientProvider.of(this)!.client;
-}

example/lib/dummy_app_user.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:stream_feed/stream_feed.dart';
+
+import 'client_provider.dart';
+
+extension ProviderX on BuildContext {
+  StreamFeedClient get client => ClientProvider.of(this).client;
+}
+
+extension Snackbar on BuildContext {
+  void showSnackBar(final String message) {
+    ScaffoldMessenger.of(this).showSnackBar(SnackBar(content: Text(message)));
+  }
+}

example/lib/extension.dart

@@ -5,9 +5,9 @@ import 'package:flutter/material.dart';
 import 'package:stream_feed/stream_feed.dart';
 
 class HomeScreen extends StatefulWidget {
-  final User streamUser;
+  final StreamUser currentUser;
 
-  const HomeScreen({Key? key, required this.streamUser}) : super(key: key);
+  const HomeScreen({Key? key, required this.currentUser}) : super(key: key);
 
   @override
   _HomeScreenState createState() => _HomeScreenState();
@@ -31,9 +31,9 @@ class _HomeScreenState extends State<HomeScreen> {
       body: IndexedStack(
         index: _currentIndex,
         children: [
-          TimelineScreen(streamUser: widget.streamUser),
-          ProfileScreen(streamUser: widget.streamUser),
-          PeopleScreen(streamUser: widget.streamUser),
+          TimelineScreen(currentUser: widget.currentUser),
+          ProfileScreen(currentUser: widget.currentUser),
+          PeopleScreen(currentUser: widget.currentUser),
         ],
       ),
       bottomNavigationBar: BottomNavigationBar(

example/lib/home.dart

@@ -1,14 +1,17 @@
-import 'package:example/dummy_app_user.dart';
-import 'package:example/utils/utils.dart';
+import 'package:example/app_user.dart';
+import 'package:example/client_provider.dart';
+import 'package:example/extension.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_feed/stream_feed.dart';
 
+import 'client_provider.dart';
 import 'home.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
   final _key = String.fromEnvironment('key');
   final _user_token = String.fromEnvironment('user_token');
+
   final client = StreamFeedClient.connect(_key, token: Token(_user_token));
   runApp(
     MyApp(
@@ -60,7 +63,7 @@ class _LoginScreenState extends State<LoginScreen> {
                 ),
               ),
               SizedBox(height: 42),
-              for (final user in DummyAppUser.values)
+              for (final user in appUsers)
                 Padding(
                   padding: const EdgeInsets.all(8.0),
                   child: RaisedButton(
@@ -70,8 +73,8 @@ class _LoginScreenState extends State<LoginScreen> {
                           content: Text('Loading User'),
                         ),
                       );
-                      final streamUser = await _client.user(user.id!).create(
-                            user.data!,
+                      final streamUser = await _client.user(user.id).create(
+                            user.data,
                             getOrCreate: true,
                           );
                       ScaffoldMessenger.of(context).showSnackBar(
@@ -82,7 +85,7 @@ class _LoginScreenState extends State<LoginScreen> {
                       Navigator.of(context).pushReplacement(
                         MaterialPageRoute(
                           builder: (_) => HomeScreen(
-                            streamUser: streamUser,
+                            currentUser: streamUser,
                           ),
                         ),
                       );
@@ -99,7 +102,7 @@ class _LoginScreenState extends State<LoginScreen> {
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
                           Text(
-                            user.name!,
+                            user.name,
                             style: TextStyle(
                               fontSize: 24,
                               color: Colors.blue,

example/lib/main.dart

@@ -1,13 +1,13 @@
-import 'package:example/dummy_app_user.dart';
-import 'package:example/utils/utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_feed/stream_feed.dart';
+import 'app_user.dart';
+import 'extension.dart';
 
 class PeopleScreen extends StatefulWidget {
-  final User streamUser;
+  final StreamUser currentUser;
 
-  const PeopleScreen({Key? key, required this.streamUser}) : super(key: key);
+  const PeopleScreen({Key? key, required this.currentUser}) : super(key: key);
 
   @override
   _PeopleScreenState createState() => _PeopleScreenState();
@@ -16,8 +16,8 @@ class PeopleScreen extends StatefulWidget {
 class _PeopleScreenState extends State<PeopleScreen> {
   @override
   Widget build(BuildContext context) {
-    final users = List<DummyAppUser>.from(DummyAppUser.values)
-      ..removeWhere((it) => it.id == widget.streamUser.id);
+    final users = List.from(appUsers)
+      ..removeWhere((it) => it.id == widget.currentUser.id);
     final _client = context.client;
 
     final followDialog = CupertinoAlertDialog(
@@ -50,29 +50,22 @@ class _PeopleScreenState extends State<PeopleScreen> {
                   builder: (_) => followDialog,
                 );
                 if (result != null) {
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(
-                      content: Text('Following User...'),
-                    ),
-                  );
+                  context.showSnackBar('Following User...');
 
                   final currentUserFeed =
-                      _client.flatFeed('timeline', widget.streamUser.id!);
-                  final selectedUserFeed = _client.flatFeed('user', user.id!);
+                      _client.flatFeed('timeline', widget.currentUser.id);
+                  final selectedUserFeed = _client.flatFeed('user', user.id);
                   await currentUserFeed.follow(selectedUserFeed);
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    SnackBar(
-                      content: Text('Followed User'),
-                    ),
-                  );
+
+                  context.showSnackBar('Followed User');
                 }
               },
               child: ListTile(
                 leading: CircleAvatar(
-                  child: Text(user.name![0]),
+                  child: Text(user.name[0]),
                 ),
                 title: Text(
-                  user.name!,
+                  user.name,
                   style: TextStyle(
                     fontSize: 24,
                     fontWeight: FontWeight.w300,

example/lib/people_screen.dart

@@ -1,4 +1,4 @@
-import 'package:example/utils/utils.dart';
+import 'extension.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_feed/stream_feed.dart';
 
@@ -8,9 +8,10 @@ import 'add_activity_dialog.dart';
 class ProfileScreen extends StatefulWidget {
   const ProfileScreen({
     Key? key,
-    required this.streamUser,
+    required this.currentUser,
   }) : super(key: key);
-  final User streamUser;
+
+  final StreamUser currentUser;
 
   @override
   _ProfileScreenState createState() => _ProfileScreenState();
@@ -25,7 +26,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
   Future<void> _loadActivities({bool pullToRefresh = false}) async {
     if (!pullToRefresh) setState(() => _isLoading = true);
 
-    final userFeed = _client.flatFeed('user', widget.streamUser.id!);
+    final userFeed = _client.flatFeed('user', widget.currentUser.id);
     final data = await userFeed.getActivities();
     if (!pullToRefresh) _isLoading = false;
     setState(() => activities = data);
@@ -40,7 +41,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final user = widget.streamUser;
+    final user = widget.currentUser;
     return Scaffold(
       floatingActionButton: FloatingActionButton(
         onPressed: () async {
@@ -49,28 +50,19 @@ class _ProfileScreenState extends State<ProfileScreen> {
             builder: (_) => AddActivityDialog(),
           );
           if (message != null) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text('Posting Activity...'),
-              ),
-            );
+            context.showSnackBar('Posting Activity...');
 
             final activity = Activity(
-              actor: user.id,
+              actor: user.ref,
               verb: 'tweet',
               object: '1',
-              extraData: {
-                'tweet': message,
-              },
+              extraData: {'tweet': message},
             );
-            final userFeed = _client.flatFeed('user', user.id!);
+
+            final userFeed = _client.flatFeed('timeline', user.id);
             await userFeed.addActivity(activity);
 
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text('Activity Posted...'),
-              ),
-            );
+            context.showSnackBar('Activity Posted...');
             _loadActivities();
           }
         },