Skip to content

Commit 79254ec

Browse files
tensor-programmingtensor-programming
committed
update rxDart and provider
1 parent 7c1cea3 commit 79254ec

File tree

8 files changed

+457
-6
lines changed

8 files changed

+457
-6
lines changed

‎.dart_tool/package_config.json

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
{
2+
"configVersion": 2,
3+
"packages": [
4+
{
5+
"name": "archive",
6+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.11",
7+
"packageUri": "lib/",
8+
"languageVersion": "2.0"
9+
},
10+
{
11+
"name": "args",
12+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.2",
13+
"packageUri": "lib/",
14+
"languageVersion": "2.0"
15+
},
16+
{
17+
"name": "async",
18+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.4.0",
19+
"packageUri": "lib/",
20+
"languageVersion": "2.0"
21+
},
22+
{
23+
"name": "boolean_selector",
24+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.5",
25+
"packageUri": "lib/",
26+
"languageVersion": "2.0"
27+
},
28+
{
29+
"name": "charcode",
30+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2",
31+
"packageUri": "lib/",
32+
"languageVersion": "1.0"
33+
},
34+
{
35+
"name": "collection",
36+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11",
37+
"packageUri": "lib/",
38+
"languageVersion": "2.0"
39+
},
40+
{
41+
"name": "convert",
42+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1",
43+
"packageUri": "lib/",
44+
"languageVersion": "1.17"
45+
},
46+
{
47+
"name": "crypto",
48+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.3",
49+
"packageUri": "lib/",
50+
"languageVersion": "2.1"
51+
},
52+
{
53+
"name": "cupertino_icons",
54+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3",
55+
"packageUri": "lib/",
56+
"languageVersion": "2.0"
57+
},
58+
{
59+
"name": "flutter",
60+
"rootUri": "file:///c:/flutter/packages/flutter",
61+
"packageUri": "lib/",
62+
"languageVersion": "2.2"
63+
},
64+
{
65+
"name": "flutter_test",
66+
"rootUri": "file:///c:/flutter/packages/flutter_test",
67+
"packageUri": "lib/",
68+
"languageVersion": "2.2"
69+
},
70+
{
71+
"name": "http",
72+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+4",
73+
"packageUri": "lib/",
74+
"languageVersion": "2.4"
75+
},
76+
{
77+
"name": "http_parser",
78+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3",
79+
"packageUri": "lib/",
80+
"languageVersion": "2.0"
81+
},
82+
{
83+
"name": "image",
84+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/image-2.1.4",
85+
"packageUri": "lib/",
86+
"languageVersion": "2.0"
87+
},
88+
{
89+
"name": "matcher",
90+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6",
91+
"packageUri": "lib/",
92+
"languageVersion": "2.2"
93+
},
94+
{
95+
"name": "meta",
96+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8",
97+
"packageUri": "lib/",
98+
"languageVersion": "1.12"
99+
},
100+
{
101+
"name": "path",
102+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.4",
103+
"packageUri": "lib/",
104+
"languageVersion": "2.0"
105+
},
106+
{
107+
"name": "pedantic",
108+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.8.0+1",
109+
"packageUri": "lib/",
110+
"languageVersion": "2.1"
111+
},
112+
{
113+
"name": "petitparser",
114+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0",
115+
"packageUri": "lib/",
116+
"languageVersion": "2.4"
117+
},
118+
{
119+
"name": "quiver",
120+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.5",
121+
"packageUri": "lib/",
122+
"languageVersion": "2.0"
123+
},
124+
{
125+
"name": "rxdart",
126+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/rxdart-0.23.1",
127+
"packageUri": "lib/",
128+
"languageVersion": "2.6"
129+
},
130+
{
131+
"name": "sky_engine",
132+
"rootUri": "file:///c:/flutter/bin/cache/pkg/sky_engine",
133+
"packageUri": "lib/",
134+
"languageVersion": "1.11"
135+
},
136+
{
137+
"name": "source_span",
138+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5",
139+
"packageUri": "lib/",
140+
"languageVersion": "1.8"
141+
},
142+
{
143+
"name": "stack_trace",
144+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3",
145+
"packageUri": "lib/",
146+
"languageVersion": "1.23"
147+
},
148+
{
149+
"name": "stream_channel",
150+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0",
151+
"packageUri": "lib/",
152+
"languageVersion": "2.0"
153+
},
154+
{
155+
"name": "string_scanner",
156+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5",
157+
"packageUri": "lib/",
158+
"languageVersion": "2.0"
159+
},
160+
{
161+
"name": "term_glyph",
162+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0",
163+
"packageUri": "lib/",
164+
"languageVersion": "1.8"
165+
},
166+
{
167+
"name": "test_api",
168+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.11",
169+
"packageUri": "lib/",
170+
"languageVersion": "2.2"
171+
},
172+
{
173+
"name": "typed_data",
174+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6",
175+
"packageUri": "lib/",
176+
"languageVersion": "2.0"
177+
},
178+
{
179+
"name": "vector_math",
180+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8",
181+
"packageUri": "lib/",
182+
"languageVersion": "2.0"
183+
},
184+
{
185+
"name": "xml",
186+
"rootUri": "file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/xml-3.5.0",
187+
"packageUri": "lib/",
188+
"languageVersion": "2.3"
189+
},
190+
{
191+
"name": "bloc_example",
192+
"rootUri": "../",
193+
"packageUri": "lib/"
194+
}
195+
],
196+
"generated": "2020-01-26T20:34:43.688480Z",
197+
"generator": "pub",
198+
"generatorVersion": "2.8.0-dev.3.0.flutter-ef0c7f16e6"
199+
}

‎.packages

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Generated by pub on 2020-01-26 15:34:43.658492.
2+
archive:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.11/lib/
3+
args:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.2/lib/
4+
async:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.4.0/lib/
5+
boolean_selector:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.5/lib/
6+
charcode:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib/
7+
collection:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib/
8+
convert:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib/
9+
crypto:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.3/lib/
10+
cupertino_icons:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/
11+
flutter:file:///c:/flutter/packages/flutter/lib/
12+
flutter_test:file:///c:/flutter/packages/flutter_test/lib/
13+
http:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+4/lib/
14+
http_parser:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/
15+
image:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/image-2.1.4/lib/
16+
matcher:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6/lib/
17+
meta:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/lib/
18+
path:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/lib/
19+
pedantic:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.8.0+1/lib/
20+
petitparser:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0/lib/
21+
quiver:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.5/lib/
22+
rxdart:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/rxdart-0.23.1/lib/
23+
sky_engine:file:///c:/flutter/bin/cache/pkg/sky_engine/lib/
24+
source_span:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5/lib/
25+
stack_trace:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib/
26+
stream_channel:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0/lib/
27+
string_scanner:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/lib/
28+
term_glyph:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib/
29+
test_api:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.11/lib/
30+
typed_data:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/
31+
vector_math:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib/
32+
xml:file:///c:/flutter/.pub-cache/hosted/pub.dartlang.org/xml-3.5.0/lib/
33+
bloc_example:lib/

‎android/local.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
sdk.dir=C:\\Users\\jking\\AppData\\Local\\Android\\sdk
2-
flutter.sdk=C:\\flutter
1+
sdk.dir=C:\\Users\\jking\\AppData\\Local\\Android\\Sdk
2+
flutter.sdk=c:\\flutter
33
flutter.buildMode=debug

‎ios/Runner/GeneratedPluginRegistrant.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77

88
#import <Flutter/Flutter.h>
99

10+
NS_ASSUME_NONNULL_BEGIN
11+
1012
@interface GeneratedPluginRegistrant : NSObject
1113
+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
1214
@end
1315

16+
NS_ASSUME_NONNULL_END
1417
#endif /* GeneratedPluginRegistrant_h */

‎lib/bloc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class MovieBloc {
1919
MovieBloc(this.api) {
2020
_results = _query.distinct().asyncMap(api.get).asBroadcastStream();
2121

22-
_log = Observable(results)
22+
_log = Stream.castFrom(results)
2323
.withLatestFrom(_query.stream, (_, query) => 'Results for $query')
2424
.asBroadcastStream();
2525
}

‎lib/provider.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ class MovieProvider extends InheritedWidget {
1010
bool updateShouldNotify(InheritedWidget oldWidget) => true;
1111

1212
static MovieBloc of(BuildContext context) =>
13-
(context.inheritFromWidgetOfExactType(MovieProvider) as MovieProvider)
14-
.movieBloc;
13+
(context.dependOnInheritedWidgetOfExactType() as MovieProvider).movieBloc;
1514

1615
MovieProvider({Key key, MovieBloc movieBloc, Widget child})
1716
: this.movieBloc = movieBloc ?? MovieBloc(API()),

0 commit comments

Comments
 (0)