Skip to content

Commit f45c335

Browse files
nathansdevnathansdev
authored
Merge pull request #21 from nathansdev/integration/widgetbook
updated flutter outdated packages
2 parents 22374e6 + 5f5e7e4 commit f45c335

File tree

5 files changed

+176
-119
lines changed

5 files changed

+176
-119
lines changed

‎lib/blog/blog_staggered_grid_page.dart

+15-16
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:contraflutterkit/custom_widgets/custom_app_bar.dart';
33
import 'package:contraflutterkit/custom_widgets/custom_search_text.dart';
44
import 'package:contraflutterkit/login/contra_text.dart';
55
import 'package:contraflutterkit/utils/colors.dart';
6-
import 'package:flutter/cupertino.dart';
76
import 'package:flutter/material.dart';
87
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
98

@@ -121,21 +120,21 @@ class _BlogStaggeredGridPageState extends State<BlogStaggeredGridPage> {
121120
controller: _textEditingController,
122121
),
123122
),
124-
StaggeredGridView.countBuilder(
125-
padding: const EdgeInsets.all(4.0),
126-
staggeredTileBuilder: (int index) =>
127-
new StaggeredTile.count(2, index.isEven ? 2 : 1),
128-
crossAxisCount: 4,
129-
mainAxisSpacing: 4.0,
130-
shrinkWrap: true,
131-
physics: NeverScrollableScrollPhysics(),
132-
crossAxisSpacing: 4.0,
133-
itemCount: _blogs.length,
134-
itemBuilder: (BuildContext context, int index) {
135-
return BlogStaggeredItem(
136-
blog: _blogs[index],
137-
);
138-
}),
123+
StaggeredGrid.count(
124+
crossAxisCount: 4,
125+
mainAxisSpacing: 4,
126+
crossAxisSpacing: 4,
127+
children: _blogs.map((blog) {
128+
int index = _blogs.indexOf(blog);
129+
return StaggeredGridTile.count(
130+
crossAxisCellCount: 2,
131+
mainAxisCellCount: index.isEven ? 2 : 1,
132+
child: BlogStaggeredItem(
133+
blog: blog,
134+
),
135+
);
136+
}).toList(),
137+
),
139138
],
140139
),
141140
),

‎pubspec.lock

+158-46
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4+
args:
5+
dependency: transitive
6+
description:
7+
name: args
8+
sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
9+
url: "https://pub.dev"
10+
source: hosted
11+
version: "2.5.0"
412
async:
513
dependency: transitive
614
description:
@@ -21,10 +29,10 @@ packages:
2129
dependency: "direct main"
2230
description:
2331
name: card_swiper
24-
sha256: "0c94c538f47be1dab52d018d4900a7046b4cb0700dc7f95b8628da89d1212b35"
32+
sha256: "21e52a144decbf0054e7cfed8bbe46fc89635e6c86b767eaccfe7d5aeba32528"
2533
url: "https://pub.dev"
2634
source: hosted
27-
version: "2.0.4"
35+
version: "3.0.1"
2836
characters:
2937
dependency: transitive
3038
description:
@@ -49,14 +57,22 @@ packages:
4957
url: "https://pub.dev"
5058
source: hosted
5159
version: "1.18.0"
60+
csslib:
61+
dependency: transitive
62+
description:
63+
name: csslib
64+
sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
65+
url: "https://pub.dev"
66+
source: hosted
67+
version: "1.0.0"
5268
cupertino_icons:
5369
dependency: "direct main"
5470
description:
5571
name: cupertino_icons
56-
sha256: "1989d917fbe8e6b39806207df5a3fdd3d816cbd090fac2ce26fb45e9a71476e5"
72+
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
5773
url: "https://pub.dev"
5874
source: hosted
59-
version: "1.0.4"
75+
version: "1.0.8"
6076
equatable:
6177
dependency: transitive
6278
description:
@@ -90,26 +106,26 @@ packages:
90106
dependency: transitive
91107
description:
92108
name: flutter_plugin_android_lifecycle
93-
sha256: "7ad4cb6dd9f2dc91db9385154b40681098fea9af9f944592a88d6351b2b8ebda"
109+
sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e
94110
url: "https://pub.dev"
95111
source: hosted
96-
version: "2.0.4"
112+
version: "2.0.20"
97113
flutter_staggered_grid_view:
98114
dependency: "direct main"
99115
description:
100116
name: flutter_staggered_grid_view
101-
sha256: f0b6d8c0fa7b4b444985cdde68492c0138a4fb6fc57a641b24cb234b7ee0f5c4
117+
sha256: "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395"
102118
url: "https://pub.dev"
103119
source: hosted
104-
version: "0.4.1"
120+
version: "0.7.0"
105121
flutter_svg:
106122
dependency: "direct main"
107123
description:
108124
name: flutter_svg
109-
sha256: "4d557c7923add388b674af1691498e13df66b1997dd0c5234f062dfe7585f544"
125+
sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
110126
url: "https://pub.dev"
111127
source: hosted
112-
version: "0.21.0+1"
128+
version: "2.0.10+1"
113129
flutter_test:
114130
dependency: "direct dev"
115131
description: flutter
@@ -128,22 +144,94 @@ packages:
128144
description: flutter
129145
source: sdk
130146
version: "0.0.0"
147+
google_maps:
148+
dependency: transitive
149+
description:
150+
name: google_maps
151+
sha256: "47eef3836b49bb030d5cb3afc60b8451408bf34cf753e571b645d6529eb4251a"
152+
url: "https://pub.dev"
153+
source: hosted
154+
version: "7.1.0"
131155
google_maps_flutter:
132156
dependency: "direct main"
133157
description:
134158
name: google_maps_flutter
135-
sha256: "6d5a374ab7ac75cf6d9de68eaef6702f1b9670b3943b5041ad98abc98e9870f4"
159+
sha256: acf0ec482d86b2ac55ade80597ce7f797a47971f5210ebfd030f0d58130e0a94
136160
url: "https://pub.dev"
137161
source: hosted
138-
version: "2.1.1"
162+
version: "2.7.0"
163+
google_maps_flutter_android:
164+
dependency: transitive
165+
description:
166+
name: google_maps_flutter_android
167+
sha256: b9ddc35f8b55fd70a196e43a61594abce5c41bc0843ea078a97679a9791749fe
168+
url: "https://pub.dev"
169+
source: hosted
170+
version: "2.9.0"
171+
google_maps_flutter_ios:
172+
dependency: transitive
173+
description:
174+
name: google_maps_flutter_ios
175+
sha256: d2d63ae17297a5b045ec115572c5a86fa4e53bb6eceaa0c6d200ac5ca69bfca4
176+
url: "https://pub.dev"
177+
source: hosted
178+
version: "2.7.0"
139179
google_maps_flutter_platform_interface:
140180
dependency: transitive
141181
description:
142182
name: google_maps_flutter_platform_interface
143-
sha256: "5f13cc8b9dd29b7bf842d765c8b8b2ee6faa757ccda90b3b8463f4a288f51949"
183+
sha256: "2bf21aa97edba4461282af5de693b354e589d09f695f7a6f80437d084a29687e"
184+
url: "https://pub.dev"
185+
source: hosted
186+
version: "2.7.1"
187+
google_maps_flutter_web:
188+
dependency: transitive
189+
description:
190+
name: google_maps_flutter_web
191+
sha256: f3155c12119d8a5c2732fdf39ceb5cc095bc662059a03b4ea23294ecebe1d199
144192
url: "https://pub.dev"
145193
source: hosted
146-
version: "2.1.3"
194+
version: "0.5.8"
195+
html:
196+
dependency: transitive
197+
description:
198+
name: html
199+
sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
200+
url: "https://pub.dev"
201+
source: hosted
202+
version: "0.15.4"
203+
http:
204+
dependency: transitive
205+
description:
206+
name: http
207+
sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
208+
url: "https://pub.dev"
209+
source: hosted
210+
version: "1.2.1"
211+
http_parser:
212+
dependency: transitive
213+
description:
214+
name: http_parser
215+
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
216+
url: "https://pub.dev"
217+
source: hosted
218+
version: "4.0.2"
219+
js:
220+
dependency: transitive
221+
description:
222+
name: js
223+
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
224+
url: "https://pub.dev"
225+
source: hosted
226+
version: "0.6.7"
227+
js_wrapping:
228+
dependency: transitive
229+
description:
230+
name: js_wrapping
231+
sha256: e385980f7c76a8c1c9a560dfb623b890975841542471eade630b2871d243851c
232+
url: "https://pub.dev"
233+
source: hosted
234+
version: "0.7.4"
147235
leak_tracker:
148236
dependency: transitive
149237
description:
@@ -200,38 +288,38 @@ packages:
200288
url: "https://pub.dev"
201289
source: hosted
202290
version: "1.9.0"
203-
path_drawing:
204-
dependency: transitive
205-
description:
206-
name: path_drawing
207-
sha256: "3bdd251dae9ffaef944450b73f168610db7e968e7b20daf0c3907f8b4aafc8a2"
208-
url: "https://pub.dev"
209-
source: hosted
210-
version: "0.5.1+1"
211291
path_parsing:
212292
dependency: transitive
213293
description:
214294
name: path_parsing
215-
sha256: ee5c47c1058ad66b4a41746ec3996af9593d0858872807bcd64ac118f0700337
295+
sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
216296
url: "https://pub.dev"
217297
source: hosted
218-
version: "0.2.1"
298+
version: "1.0.1"
219299
petitparser:
220300
dependency: transitive
221301
description:
222302
name: petitparser
223-
sha256: "1a914995d4ef10c94ff183528c120d35ed43b5eaa8713fc6766a9be4570782e2"
303+
sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
224304
url: "https://pub.dev"
225305
source: hosted
226-
version: "4.4.0"
306+
version: "6.0.2"
227307
plugin_platform_interface:
228308
dependency: transitive
229309
description:
230310
name: plugin_platform_interface
231-
sha256: f843e0027496f0d841166707029237a0bef39cfc0c79b93b1bb1a10beae73244
311+
sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
232312
url: "https://pub.dev"
233313
source: hosted
234-
version: "2.0.2"
314+
version: "2.1.8"
315+
sanitize_html:
316+
dependency: transitive
317+
description:
318+
name: sanitize_html
319+
sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989"
320+
url: "https://pub.dev"
321+
source: hosted
322+
version: "2.1.0"
235323
sky_engine:
236324
dependency: transitive
237325
description: flutter
@@ -265,10 +353,10 @@ packages:
265353
dependency: transitive
266354
description:
267355
name: stream_transform
268-
sha256: ed464977cb26a1f41537e177e190c67223dbd9f4f683489b6ab2e5d211ec564e
356+
sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
269357
url: "https://pub.dev"
270358
source: hosted
271-
version: "2.0.0"
359+
version: "2.1.0"
272360
string_scanner:
273361
dependency: transitive
274362
description:
@@ -293,6 +381,38 @@ packages:
293381
url: "https://pub.dev"
294382
source: hosted
295383
version: "0.7.0"
384+
typed_data:
385+
dependency: transitive
386+
description:
387+
name: typed_data
388+
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
389+
url: "https://pub.dev"
390+
source: hosted
391+
version: "1.3.2"
392+
vector_graphics:
393+
dependency: transitive
394+
description:
395+
name: vector_graphics
396+
sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
397+
url: "https://pub.dev"
398+
source: hosted
399+
version: "1.1.11+1"
400+
vector_graphics_codec:
401+
dependency: transitive
402+
description:
403+
name: vector_graphics_codec
404+
sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
405+
url: "https://pub.dev"
406+
source: hosted
407+
version: "1.1.11+1"
408+
vector_graphics_compiler:
409+
dependency: transitive
410+
description:
411+
name: vector_graphics_compiler
412+
sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
413+
url: "https://pub.dev"
414+
source: hosted
415+
version: "1.1.11+1"
296416
vector_math:
297417
dependency: transitive
298418
description:
@@ -309,30 +429,22 @@ packages:
309429
url: "https://pub.dev"
310430
source: hosted
311431
version: "14.2.1"
312-
widgetbook:
313-
dependency: "direct main"
314-
description:
315-
name: widgetbook
316-
sha256: "94c91b0ed4f216fa2337b43f9077400376db794c9e8bb0b1138fcf35387d8106"
317-
url: "https://pub.dev"
318-
source: hosted
319-
version: "1.0.2"
320-
widgetbook_models:
432+
web:
321433
dependency: transitive
322434
description:
323-
name: widgetbook_models
324-
sha256: da1465a16478920027b4a5029e43c1af8e1b902c9985d1fdd8b7836d103f3d72
435+
name: web
436+
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
325437
url: "https://pub.dev"
326438
source: hosted
327-
version: "0.0.3"
439+
version: "0.5.1"
328440
xml:
329441
dependency: transitive
330442
description:
331443
name: xml
332-
sha256: baa23bcba1ba4ce4b22c0c7a1d9c861e7015cb5169512676da0b85138e72840c
444+
sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
333445
url: "https://pub.dev"
334446
source: hosted
335-
version: "5.3.1"
447+
version: "6.5.0"
336448
sdks:
337-
dart: ">=3.3.0 <4.0.0"
338-
flutter: ">=3.18.0-18.0.pre.54"
449+
dart: ">=3.4.0 <4.0.0"
450+
flutter: ">=3.22.0"

‎pubspec.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ dependencies:
1212
sdk: flutter
1313

1414
cupertino_icons: ^1.0.4
15-
flutter_svg: ^0.21.0
16-
flutter_staggered_grid_view: ^0.4.1
15+
flutter_svg: ^2.0.10+1
16+
flutter_staggered_grid_view: ^0.7.0
1717
flutter_time_picker_spinner: ^2.0.0
1818
fl_chart: ^0.68.0
1919
google_maps_flutter: ^2.1.1
20-
widgetbook: ^1.0.2
21-
card_swiper: ^2.0.1
20+
card_swiper: ^3.0.1
2221

2322
dev_dependencies:
2423
flutter_test:

‎widgetbook/main.dart

-7
This file was deleted.

0 commit comments

Comments
 (0)