Merge pull request #29 from GetStream/develop

Develop

.github/workflows/build.yml

@@ -30,6 +30,8 @@ jobs:
       - name: Flutter setup
         run: |
           flutter pub get
+      - name: Copy production config
+        run: echo ${{ secrets.PRODUCTION_CONFIG }} > lib/app_config.dart
       - name: Build and release
         env:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
@@ -54,6 +56,8 @@ jobs:
           channel: 'stable'
       - run: |
           flutter pub get
+      - name: Copy production config
+        run: echo ${{ secrets.PRODUCTION_CONFIG }} > lib/app_config.dart
       - name: Build
         run: |
           flutter build apk

packages/stream_chat_v1/.gitignore

@@ -44,3 +44,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+lib/production_app_config.dart

packages/stream_chat_v1/lib/app_config.dart

@@ -0,0 +1,81 @@
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+
+const kDefaultStreamApiKey = 'kv7mcsxr24p8';
+
+final defaultUsers = <String, User>{
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoic2FsdmF0b3JlIn0.pgiJz7sIc7iP29BHKFwe3nLm5-OaR_1l2P-SlgiC9a8':
+      User(
+    id: 'salvatore',
+    extraData: {
+      'name': 'Salvatore Giordano',
+      'image':
+          'https://avatars.githubusercontent.com/u/20601437?s=460&u=3f66c22a7483980624804054ae7f357cf102c784&v=4',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoic2FoaWwifQ.WnIUoB5gR2kcAsFhiDvkiD6zdHXZ-VSU2aQWWkhsvfo':
+      User(
+    id: 'sahil',
+    extraData: {
+      'name': 'Sahil Kumar',
+      'image':
+          'https://avatars.githubusercontent.com/u/25670178?s=400&u=30ded3784d8d2310c5748f263fd5e6433c119aa1&v=4',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiYmVuIn0.nAz2sNFGQwY7rl2Og2z3TGHUsdpnN53tOsUglJFvLmg':
+      User(
+    id: 'ben',
+    extraData: {
+      'name': 'Ben Golden',
+      'image': 'https://avatars.githubusercontent.com/u/1581974?s=400&v=4',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoidGhpZXJyeSJ9.lEq6TrZtHzjoNtf7HHRufUPyGo_pa8vg4_XhEBp4ckY':
+      User(
+    id: 'thierry',
+    extraData: {
+      'name': 'Thierry Schellenbach',
+      'image':
+          'https://avatars.githubusercontent.com/u/265409?s=400&u=2d0e3bb1820db992066196bff7b004f0eee8e28d&v=4',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoidG9tbWFzbyJ9.GLSI0ESshERMo2WjUpysD709NEtn1zmGimUN2an7g9o':
+      User(
+    id: 'tommaso',
+    extraData: {
+      'name': 'Tommaso Barbugli',
+      'image': 'https://avatars.githubusercontent.com/u/88735?s=400&v=4',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiZGV2ZW4ifQ.z3zI4PqJnNhc-1o-VKcmb6BnnQ0oxFNCRHwEulHqcWc':
+      User(
+    id: 'deven',
+    extraData: {
+      'name': 'Deven Joshi',
+      'image':
+          'https://avatars.githubusercontent.com/u/26357843?s=400&u=0c61d890866e67bf69f58878be58915e9bfd39ee&v=4',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoibmVldmFzaCJ9.3EdHegTxibrz3A9cTiKmpEyawwcCVB8FXnoFzr4eKvw':
+      User(
+    id: 'neevash',
+    extraData: {
+      'name': 'Neevash Ramdial',
+      'image':
+          'https://avatars.githubusercontent.com/u/25674767?s=400&u=1d7333baf7dd9d143db8bfcdb31a838b89cfff9c&v=4',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoicWF0ZXN0MSJ9.fnelU7HcP7QoEEsCGteNlF1fppofzNlrnpDQuIgeKCU':
+      User(
+    id: 'qatest1',
+    extraData: {
+      'name': 'QA test 1',
+    },
+  ),
+  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoicWF0ZXN0MiJ9.vSCqAEbs2WVmMWsOsa7065Fsjq-rsTih6qsHPynl7XM':
+      User(
+    id: 'qatest2',
+    extraData: {
+      'name': 'QA test 2',
+    },
+  ),
+};

packages/stream_chat_v1/lib/choose_user_page.dart

@@ -1,3 +1,4 @@
+import 'package:example/app_config.dart';
 import 'package:example/stream_version.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -10,88 +11,11 @@ import 'routes/routes.dart';
 const kStreamApiKey = 'STREAM_API_KEY';
 const kStreamUserId = 'STREAM_USER_ID';
 const kStreamToken = 'STREAM_TOKEN';
-const kDefaultStreamApiKey = 'kv7mcsxr24p8';
 
 class ChooseUserPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final users = <String, User>{
+    final users = defaultUsers;
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoic2FsdmF0b3JlIn0.pgiJz7sIc7iP29BHKFwe3nLm5-OaR_1l2P-SlgiC9a8':
-          User(
-        id: 'salvatore',
-        extraData: {
-          'name': 'Salvatore Giordano',
-          'image':
-              'https://avatars.githubusercontent.com/u/20601437?s=460&u=3f66c22a7483980624804054ae7f357cf102c784&v=4',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoic2FoaWwifQ.WnIUoB5gR2kcAsFhiDvkiD6zdHXZ-VSU2aQWWkhsvfo':
-          User(
-        id: 'sahil',
-        extraData: {
-          'name': 'Sahil Kumar',
-          'image':
-              'https://avatars.githubusercontent.com/u/25670178?s=400&u=30ded3784d8d2310c5748f263fd5e6433c119aa1&v=4',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiYmVuIn0.nAz2sNFGQwY7rl2Og2z3TGHUsdpnN53tOsUglJFvLmg':
-          User(
-        id: 'ben',
-        extraData: {
-          'name': 'Ben Golden',
-          'image': 'https://avatars.githubusercontent.com/u/1581974?s=400&v=4',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoidGhpZXJyeSJ9.lEq6TrZtHzjoNtf7HHRufUPyGo_pa8vg4_XhEBp4ckY':
-          User(
-        id: 'thierry',
-        extraData: {
-          'name': 'Thierry Schellenbach',
-          'image':
-              'https://avatars.githubusercontent.com/u/265409?s=400&u=2d0e3bb1820db992066196bff7b004f0eee8e28d&v=4',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoidG9tbWFzbyJ9.GLSI0ESshERMo2WjUpysD709NEtn1zmGimUN2an7g9o':
-          User(
-        id: 'tommaso',
-        extraData: {
-          'name': 'Tommaso Barbugli',
-          'image': 'https://avatars.githubusercontent.com/u/88735?s=400&v=4',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiZGV2ZW4ifQ.z3zI4PqJnNhc-1o-VKcmb6BnnQ0oxFNCRHwEulHqcWc':
-          User(
-        id: 'deven',
-        extraData: {
-          'name': 'Deven Joshi',
-          'image':
-              'https://avatars.githubusercontent.com/u/26357843?s=400&u=0c61d890866e67bf69f58878be58915e9bfd39ee&v=4',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoibmVldmFzaCJ9.3EdHegTxibrz3A9cTiKmpEyawwcCVB8FXnoFzr4eKvw':
-          User(
-        id: 'neevash',
-        extraData: {
-          'name': 'Neevash Ramdial',
-          'image':
-              'https://avatars.githubusercontent.com/u/25674767?s=400&u=1d7333baf7dd9d143db8bfcdb31a838b89cfff9c&v=4',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoicWF0ZXN0MSJ9.fnelU7HcP7QoEEsCGteNlF1fppofzNlrnpDQuIgeKCU':
-          User(
-        id: 'qatest1',
-        extraData: {
-          'name': 'QA test 1',
-        },
-      ),
-      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoicWF0ZXN0MiJ9.vSCqAEbs2WVmMWsOsa7065Fsjq-rsTih6qsHPynl7XM':
-          User(
-        id: 'qatest2',
-        extraData: {
-          'name': 'QA test 2',
-        },
-      ),
-    };
 
     return Scaffold(
       backgroundColor: StreamChatTheme.of(context).colorTheme.whiteSnow,

packages/stream_chat_v1/lib/main.dart

@@ -15,6 +15,7 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 import 'package:stream_chat_persistence/stream_chat_persistence.dart';
 import 'package:streaming_shared_preferences/streaming_shared_preferences.dart';
 
+import 'app_config.dart';
 import 'notifications_service.dart';
 import 'routes/app_routes.dart';
 import 'routes/routes.dart';

packages/stream_chat_v1/pubspec.yaml

@@ -10,8 +10,16 @@ dependencies:
   flutter_app_badger: ^1.1.2
   flutter:
     sdk: flutter
-  stream_chat_flutter: ^1.5.0
+  stream_chat_flutter:
-  stream_chat_persistence: ^1.5.0
+    git:
+      url: https://github.com/GetStream/stream-chat-flutter.git
+      ref: develop
+      path: packages/stream_chat_flutter
+  stream_chat_persistence:
+    git:
+      url: https://github.com/GetStream/stream-chat-flutter.git
+      ref: develop
+      path: packages/stream_chat_persistence
   flutter_local_notifications: ^2.0.2
   flutter_svg: ^0.19.3
   flutter_secure_storage: ^3.3.5
@@ -20,6 +28,18 @@ dependencies:
   streaming_shared_preferences: ^1.0.2
   lottie: ^0.7.0+1
 
+dependency_overrides:
+  stream_chat:
+    git:
+      url: https://github.com/GetStream/stream-chat-flutter.git
+      ref: develop
+      path: packages/stream_chat
+  stream_chat_flutter_core:
+    git:
+      url: https://github.com/GetStream/stream-chat-flutter.git
+      ref: develop
+      path: packages/stream_chat_flutter_core
+
 dev_dependencies:
   flutter_launcher_icons: ^0.8.1
   test: any