Skip to content

Commit 221327e

Browse files
authored
Merge branch 'master' into cover2
2 parents 45f99cb + 8579e67 commit 221327e

File tree

9 files changed

+25
-34
lines changed

9 files changed

+25
-34
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ const apiKey = 'my-API-key';
4949
const secret = 'my-API-secret';
5050

5151
// Instantiate a new client (server side)
52-
var client = StreamClient.connect(apiKey, secret: secret);
52+
var client = StreamFeedClient.connect(apiKey, secret: secret);
5353

5454
// Optionally supply the app identifier and an options object specifying the data center to use and timeout for requests (15s)
55-
client = StreamClient.connect(apiKey,
55+
client = StreamFeedClient.connect(apiKey,
5656
secret: secret,
5757
appId: 'yourappid',
5858
options: StreamHttpClientOptions(
@@ -69,7 +69,7 @@ final userToken = client.frontendToken('the-user-id');
6969

7070
```dart
7171
// Instantiate new client with a user token
72-
var client = StreamClient.connect(apiKey, token: Token('userToken'));
72+
var client = StreamFeedClient.connect(apiKey, token: Token('userToken'));
7373
```
7474

7575
### 🔮 Examples
@@ -234,7 +234,7 @@ Stream uses [Faye](http://faye.jcoglan.com) for realtime notifications. Below is
234234
```dart
235235
236236
// ⚠️ userToken is generated server-side (see previous section)
237-
final client = StreamClient.connect('YOUR_API_KEY', token: userToken,appId: 'APP_ID');
237+
final client = StreamFeedClient.connect('YOUR_API_KEY', token: userToken,appId: 'APP_ID');
238238
final user1 = client.flatFeed('user', '1');
239239
240240
// subscribe to the changes

packages/faye_dart/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.buildlog/
99
.history
1010
.svn/
11+
coverage/
1112

1213
# IntelliJ related
1314
*.iml
@@ -26,9 +27,11 @@
2627
.flutter-plugins
2728
.flutter-plugins-dependencies
2829
.packages
30+
.metadata
2931
.pub-cache/
3032
.pub/
3133
build/
34+
pubspec.lock
3235

3336
# Android related
3437
**/android/**/gradle-wrapper.jar
@@ -71,4 +74,4 @@ build/
7174
!**/ios/**/default.mode1v3
7275
!**/ios/**/default.mode2v3
7376
!**/ios/**/default.pbxuser
74-
!**/ios/**/default.perspectivev3
77+
!**/ios/**/default.perspectivev3

packages/faye_dart/.metadata

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/faye_dart/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
## 0.0.1 TODO: Add release date.
1+
## [0.1.0] - (07-05-2021)
22

3-
- first beta version
3+
* Initial release.

packages/faye_dart/pubspec.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
name: faye_dart
22
description: Faye is a publish/subscribe messaging protocol that is built on the Bayeux protocol, a messaging system utilized for transporting asynchronous messages over HTTP.
3-
version: 0.0.1
4-
homepage: https://getstream.io/
3+
version: 0.1.0
4+
homepage: https://github.com/GetStream/stream-feed-flutter/blob/master/packages/faye_dart
5+
repository: https://github.com/GetStream/stream-feed-flutter/blob/master/packages/faye_dart
6+
issue_tracker: https://github.com/GetStream/stream-feed-flutter/issues
57

68
environment:
79
sdk: ">=2.12.0 <3.0.0"
810

911
dependencies:
10-
web_socket_channel: ^2.0.0
12+
web_socket_channel: ^2.1.0
1113
equatable: ^2.0.0
1214
logging: ^1.0.1
1315
uuid: ^3.0.4
16+
meta: ^1.3.0
1417

1518
dev_dependencies:
16-
test: ^1.16.8
17-
mocktail: ^0.1.1
19+
test: ^1.17.3
20+
mocktail: ^0.1.2
1821

1922
# For information on the generic Dart part of this file, see the
2023
# following page: https://dart.dev/tools/pub/pubspec

packages/stream_feed/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ There is a detailed Flutter example project in the `example` folder. You can dir
3333
First you need to instantiate a feed client. The Feed client will manage API calls. You should only create the client once and re-use it across your application.
3434

3535
```dart
36-
final client = StreamClient.connect("stream-feed-api-key",token:userToken);
36+
final client = StreamFeedClient.connect("stream-feed-api-key",token:userToken);
3737
```
3838
## Contributing
3939

packages/stream_feed/example/main.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Future<void> main() async {
77
final secret = env['secret'];
88
final apiKey = env['apiKey'];
99
final appId = env['appId'];
10-
final clientWithSecret = StreamClient.connect(
10+
final clientWithSecret = StreamFeedClient.connect(
1111
apiKey,
1212
secret: secret,
1313
runner: Runner.server,
@@ -72,7 +72,7 @@ Future<void> main() async {
7272
// response = await userFeed.getActivities(limit: 5, ranking: "popularity");//must be enabled
7373

7474
// Server-side
75-
var client = StreamClient.connect(
75+
var client = StreamFeedClient.connect(
7676
apiKey,
7777
secret: secret,
7878
appId: appId,
@@ -83,7 +83,7 @@ Future<void> main() async {
8383
final userToken = client.frontendToken('user.id');
8484

8585
// Client-side
86-
client = StreamClient.connect(
86+
client = StreamFeedClient.connect(
8787
apiKey,
8888
token: userToken,
8989
appId: appId,
@@ -338,7 +338,7 @@ Future<void> main() async {
338338
object: cheeseBurgerRef,
339339
));
340340

341-
client = StreamClient.connect(apiKey, token: frontendToken);
341+
client = StreamFeedClient.connect(apiKey, token: frontendToken);
342342
// ensure the user data is stored on Stream
343343
await client.setUser({
344344
'name': 'John Doe',

packages/stream_feed/pubspec.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@ name: stream_feed
22
description: Stream Feed official Dart SDK. Build your own feed experience using Dart and Flutter.
33
version: 0.0.1
44
homepage: https://getstream.io/
5-
publish_to: none
6-
75
environment:
86
sdk: '>=2.12.0 <3.0.0'
97

108
dependencies:
119
dio: ^4.0.0-prev2
1210
equatable: ^2.0.0
13-
faye_dart:
14-
git:
15-
url: https://github.com/GetStream/stream-feed-flutter.git
16-
path: ./packages/faye_dart
11+
faye_dart: ^0.1.0
1712
jose: ^0.3.0-nullsafety.2
1813
json_annotation: ^4.0.0
1914
meta: ^1.3.0

packages/stream_feed/test/stream_feed_client_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'mock.dart';
88
import 'utils.dart';
99

1010
void main() {
11-
group('StreamClientImpl', () {
11+
group('StreamFeedClientImpl', () {
1212
group('throw', () {
1313
test('throws an AssertionError when no secret or token provided', () {
1414
expect(

0 commit comments

Comments
 (0)