Skip to content

Commit 3bbaf8c

Browse files
authored
[flutter_adaptive_scaffold] Use improved MediaQuery methods (#7565)
*Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.* *List which issues are fixed by this PR. You must list at least one issue.*
1 parent 08614a7 commit 3bbaf8c

File tree

7 files changed

+25
-21
lines changed

7 files changed

+25
-21
lines changed

packages/flutter_adaptive_scaffold/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.3.1
2+
3+
* Use improved MediaQuery methods.
4+
15
## 0.3.0
26

37
* Adds `inDuration`, `outDuration`, `inCurve`, and `outCurve` parameters for

packages/flutter_adaptive_scaffold/example/lib/main.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ class _ItemListTile extends StatelessWidget {
693693
style: Theme.of(context).textTheme.bodyLarge),
694694
const SizedBox(height: 9),
695695
SizedBox(
696-
width: MediaQuery.of(context).size.width,
696+
width: MediaQuery.sizeOf(context).width,
697697
child: (email.bodyImage != '')
698698
? Image.asset(email.bodyImage)
699699
: Container(),
@@ -717,7 +717,7 @@ class _DetailTile extends StatelessWidget {
717717
return Padding(
718718
padding: const EdgeInsets.all(8.0),
719719
child: SizedBox(
720-
height: MediaQuery.of(context).size.height,
720+
height: MediaQuery.sizeOf(context).height,
721721
child: Container(
722722
decoration: const BoxDecoration(
723723
color: Color.fromARGB(255, 245, 241, 248),
@@ -891,7 +891,7 @@ class _EmailTile extends StatelessWidget {
891891
color: Colors.grey[700], height: 1.35, fontSize: 14.5)),
892892
const SizedBox(height: 9),
893893
SizedBox(
894-
width: MediaQuery.of(context).size.width,
894+
width: MediaQuery.sizeOf(context).width,
895895
child:
896896
(bodyImage != '') ? Image.asset(bodyImage) : Container()),
897897
const SizedBox(height: 10),

packages/flutter_adaptive_scaffold/lib/src/adaptive_layout.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class _AdaptiveLayoutState extends State<AdaptiveLayout>
293293
});
294294

295295
Rect? hinge;
296-
for (final DisplayFeature e in MediaQuery.of(context).displayFeatures) {
296+
for (final DisplayFeature e in MediaQuery.displayFeaturesOf(context)) {
297297
if (e.type == DisplayFeatureType.hinge ||
298298
e.type == DisplayFeatureType.fold) {
299299
if (e.bounds.left != 0) {

packages/flutter_adaptive_scaffold/lib/src/adaptive_scaffold.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class AdaptiveScaffold extends StatefulWidget {
362362
padding: padding,
363363
child: SizedBox(
364364
width: width,
365-
height: MediaQuery.of(context).size.height,
365+
height: MediaQuery.sizeOf(context).height,
366366
child: LayoutBuilder(
367367
builder: (BuildContext context, BoxConstraints constraints) {
368368
return SingleChildScrollView(

packages/flutter_adaptive_scaffold/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_adaptive_scaffold
22
description: Widgets to easily build adaptive layouts, including navigation elements.
3-
version: 0.3.0
3+
version: 0.3.1
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_adaptive_scaffold%22
55
repository: https://github.com/flutter/packages/tree/main/packages/flutter_adaptive_scaffold
66

packages/flutter_adaptive_scaffold/test/adaptive_layout_test.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -443,35 +443,35 @@ void main() {
443443
class TestBreakpoint0 extends Breakpoint {
444444
@override
445445
bool isActive(BuildContext context) {
446-
return MediaQuery.of(context).size.width >= 0;
446+
return MediaQuery.sizeOf(context).width >= 0;
447447
}
448448
}
449449

450450
class TestBreakpoint400 extends Breakpoint {
451451
@override
452452
bool isActive(BuildContext context) {
453-
return MediaQuery.of(context).size.width > 400;
453+
return MediaQuery.sizeOf(context).width > 400;
454454
}
455455
}
456456

457457
class TestBreakpoint800 extends Breakpoint {
458458
@override
459459
bool isActive(BuildContext context) {
460-
return MediaQuery.of(context).size.width > 800;
460+
return MediaQuery.sizeOf(context).width > 800;
461461
}
462462
}
463463

464464
class TestBreakpoint1200 extends Breakpoint {
465465
@override
466466
bool isActive(BuildContext context) {
467-
return MediaQuery.of(context).size.width > 1200;
467+
return MediaQuery.sizeOf(context).width > 1200;
468468
}
469469
}
470470

471471
class TestBreakpoint1600 extends Breakpoint {
472472
@override
473473
bool isActive(BuildContext context) {
474-
return MediaQuery.of(context).size.width > 1600;
474+
return MediaQuery.sizeOf(context).width > 1600;
475475
}
476476
}
477477

packages/flutter_adaptive_scaffold/test/test_breakpoints.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,46 @@ import 'package:flutter_adaptive_scaffold/src/breakpoints.dart';
88
class TestBreakpoint0 extends Breakpoint {
99
@override
1010
bool isActive(BuildContext context) {
11-
return MediaQuery.of(context).size.width >= 0 &&
12-
MediaQuery.of(context).size.width < 800;
11+
return MediaQuery.sizeOf(context).width >= 0 &&
12+
MediaQuery.sizeOf(context).width < 800;
1313
}
1414
}
1515

1616
class TestBreakpoint400 extends Breakpoint {
1717
@override
1818
bool isActive(BuildContext context) {
19-
return MediaQuery.of(context).size.width > 400;
19+
return MediaQuery.sizeOf(context).width > 400;
2020
}
2121
}
2222

2323
class TestBreakpoint800 extends Breakpoint {
2424
@override
2525
bool isActive(BuildContext context) {
26-
return MediaQuery.of(context).size.width >= 800 &&
27-
MediaQuery.of(context).size.width < 1000;
26+
return MediaQuery.sizeOf(context).width >= 800 &&
27+
MediaQuery.sizeOf(context).width < 1000;
2828
}
2929
}
3030

3131
class TestBreakpoint1000 extends Breakpoint {
3232
@override
3333
bool isActive(BuildContext context) {
34-
return MediaQuery.of(context).size.width >= 1000 &&
35-
MediaQuery.of(context).size.width < 1200;
34+
return MediaQuery.sizeOf(context).width >= 1000 &&
35+
MediaQuery.sizeOf(context).width < 1200;
3636
}
3737
}
3838

3939
class TestBreakpoint1200 extends Breakpoint {
4040
@override
4141
bool isActive(BuildContext context) {
42-
return MediaQuery.of(context).size.width >= 1200 &&
43-
MediaQuery.of(context).size.width < 1600;
42+
return MediaQuery.sizeOf(context).width >= 1200 &&
43+
MediaQuery.sizeOf(context).width < 1600;
4444
}
4545
}
4646

4747
class TestBreakpoint1600 extends Breakpoint {
4848
@override
4949
bool isActive(BuildContext context) {
50-
return MediaQuery.of(context).size.width >= 1600;
50+
return MediaQuery.sizeOf(context).width >= 1600;
5151
}
5252
}
5353

0 commit comments

Comments
 (0)