Skip to content

Commit

Permalink
RxDart update
Browse files Browse the repository at this point in the history
  • Loading branch information
funwithflutter committed Jan 30, 2020
1 parent 754130f commit 7f45ea1
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 23 deletions.
4 changes: 2 additions & 2 deletions lib/blocs/login/login_bloc.dart
Expand Up @@ -3,8 +3,8 @@ import 'package:bloc/bloc.dart';
import 'package:fun_with_flutter/utils/validator.dart';
import 'package:meta/meta.dart';
import 'package:fun_with_flutter/repository/user_repository.dart';
import 'package:rxdart/rxdart.dart';
import './bloc.dart';
import 'package:rxdart/rxdart.dart';

class LoginBloc extends Bloc<LoginEvent, LoginState> {
LoginBloc({
Expand All @@ -22,7 +22,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
Stream<LoginEvent> events,
Stream<LoginState> Function(LoginEvent event) next,
) {
final observableStream = events as Observable<LoginEvent>;
final observableStream = events;
final nonDebounceStream = observableStream.where((event) {
return event is! EmailChanged && event is! PasswordChanged;
});
Expand Down
22 changes: 21 additions & 1 deletion lib/blocs/login/login_event.dart
@@ -1,7 +1,8 @@
import 'package:equatable/equatable.dart';
import 'package:meta/meta.dart';

@immutable
abstract class LoginEvent {
abstract class LoginEvent extends Equatable{
const LoginEvent();
}

Expand All @@ -12,6 +13,9 @@ class EmailChanged extends LoginEvent {

@override
String toString() => 'EmailChanged { email :$email }';

@override
List<Object> get props => [email];
}

class PasswordChanged extends LoginEvent {
Expand All @@ -21,6 +25,10 @@ class PasswordChanged extends LoginEvent {

@override
String toString() => 'PasswordChanged { password: $password }';

@override
// TODO: implement props
List<Object> get props => throw UnimplementedError();
}

class Submitted extends LoginEvent {
Expand All @@ -33,11 +41,19 @@ class Submitted extends LoginEvent {
String toString() {
return 'Submitted { email: $email, password: $password }';
}

@override
// TODO: implement props
List<Object> get props => throw UnimplementedError();
}

class LoginWithGooglePressed extends LoginEvent {
@override
String toString() => 'LoginWithGooglePressed';

@override
// TODO: implement props
List<Object> get props => throw UnimplementedError();
}

class LoginWithCredentialsPressed extends LoginEvent {
Expand All @@ -51,4 +67,8 @@ class LoginWithCredentialsPressed extends LoginEvent {
String toString() {
return 'LoginWithCredentialsPressed { email: $email, password: $password }';
}

@override
// TODO: implement props
List<Object> get props => throw UnimplementedError();
}
2 changes: 1 addition & 1 deletion lib/blocs/register/register_bloc.dart
Expand Up @@ -21,7 +21,7 @@ class RegisterBloc extends Bloc<RegisterEvent, RegisterState> {
Stream<RegisterEvent> events,
Stream<RegisterState> Function(RegisterEvent event) next,
) {
final observableStream = events as Observable<RegisterEvent>;
final observableStream = events;
final nonDebounceStream = observableStream.where((event) {
return event is! EmailChanged && event is! PasswordChanged;
});
Expand Down
14 changes: 7 additions & 7 deletions lib/main.dart
Expand Up @@ -48,34 +48,34 @@ class AppInjector extends StatelessWidget {

return MultiBlocProvider(
providers: [
BlocProvider<AuthenticationBloc>(builder: (context) {
BlocProvider<AuthenticationBloc>(create: (context) {
return AuthenticationBloc(userRepository: _userRepository)
..add(AppStarted());
}),
BlocProvider<LoginBloc>(builder: (context) {
BlocProvider<LoginBloc>(create: (context) {
return LoginBloc(userRepository: _userRepository);
}),
BlocProvider<RegisterBloc>(
builder: (context) {
create: (context) {
return RegisterBloc(userRepository: _userRepository);
},
),
BlocProvider<BlogBloc>(
builder: (context) {
create: (context) {
return _blogBloc..add(Fetch());
},
),
BlocProvider<FilteredBlogBloc>(
builder: (context) {
create: (context) {
return FilteredBlogBloc(blogBloc: _blogBloc);
},
),
BlocProvider<PageBloc>(
builder: (context) {
create: (context) {
return PageBloc();
},
),
BlocProvider<AppStateBloc> (builder: (contect) {
BlocProvider<AppStateBloc> (create: (contect) {
return AppStateBloc();
},)
],
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/pages/blog/blog_page.dart
Expand Up @@ -108,7 +108,7 @@ class FilteredBlogPageState extends State<FilteredBlogPage>
crossAxisCount: crossAxisCount,
childAspectRatio: 10 / 9,
),
physics: _bouncingScrollPhysics,
// physics: _bouncingScrollPhysics,
itemCount: state.filteredBlog.pages.length,
itemBuilder: (context, index) {
return BlogPostCard(
Expand Down
28 changes: 21 additions & 7 deletions pubspec.lock
Expand Up @@ -42,7 +42,7 @@ packages:
name: bloc
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "3.0.0"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -99,6 +99,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
equatable:
dependency: "direct main"
description:
name: equatable
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
firebase:
dependency: "direct main"
description:
Expand All @@ -117,7 +124,7 @@ packages:
name: flutter_bloc
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "3.1.0"
flutter_test:
dependency: "direct dev"
description: flutter
Expand Down Expand Up @@ -172,6 +179,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.8"
nested:
dependency: transitive
description:
name: nested
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.4"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -199,7 +213,7 @@ packages:
name: provider
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
version: "4.0.2"
quiver:
dependency: transitive
description:
Expand All @@ -215,12 +229,12 @@ packages:
source: hosted
version: "1.0.3"
rxdart:
dependency: transitive
dependency: "direct main"
description:
name: rxdart
url: "https://pub.dartlang.org"
source: hosted
version: "0.22.2"
version: "0.23.1"
sky_engine:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -325,5 +339,5 @@ packages:
source: hosted
version: "0.1.1"
sdks:
dart: ">=2.4.0 <3.0.0"
flutter: ">=0.3.0 <2.0.0"
dart: ">=2.6.0 <3.0.0"
flutter: ">=1.12.1 <2.0.0"
6 changes: 4 additions & 2 deletions pubspec.yaml
Expand Up @@ -19,8 +19,8 @@ environment:
dependencies:
flutter:
sdk: flutter
flutter_bloc: ^2.0.0
bloc: ^2.0.0
flutter_bloc: ^3.1.0
bloc: ^3.0.0
animated_text_kit: ^1.3.1
universal_html: ^1.1.1
http: ^0.12.0+2
Expand All @@ -29,6 +29,8 @@ dependencies:
firebase: ^5.0.4
after_layout: ^1.0.7+2
confetti: ^0.3.0
equatable: ^1.0.2
rxdart: ^0.23.1

# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
Expand Down
4 changes: 2 additions & 2 deletions web/index.html
Expand Up @@ -15,8 +15,8 @@
<!-- <script src="/__/firebase/6.6.0/firebase-app.js"></script> -->


<script src="https://www.gstatic.com/firebasejs/6.6.0/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/6.6.0/firebase-auth.js"></script>
<!-- <script src="https://www.gstatic.com/firebasejs/6.6.0/firebase-app.js"></script> -->
<!-- <script src="https://www.gstatic.com/firebasejs/6.6.0/firebase-auth.js"></script> -->
<!-- <script src="https://www.gstatic.com/firebasejs/6.6.0/firebase-database.js"></script> -->

<!-- Add Firebase products that you want to use -->
Expand Down

0 comments on commit 7f45ea1

Please sign in to comment.