Showing
1 changed file
with
12 additions
and
10 deletions
@@ -34,16 +34,19 @@ void main() { | @@ -34,16 +34,19 @@ void main() { | ||
34 | expect(isLandscape, context.isLandscape); | 34 | expect(isLandscape, context.isLandscape); |
35 | var mediaQueryShortestSide = mediaQuerySize.shortestSide; | 35 | var mediaQueryShortestSide = mediaQuerySize.shortestSide; |
36 | expect(mediaQueryShortestSide, context.mediaQueryShortestSide); | 36 | expect(mediaQueryShortestSide, context.mediaQueryShortestSide); |
37 | - var isLargeTablet = (mediaQueryShortestSide >= 720); | ||
38 | - expect(isLargeTablet, context.isLargeTablet); | ||
39 | - var isPhone = (mediaQueryShortestSide < 600); | ||
40 | - expect(isPhone, context.isPhone); | 37 | + var width = mediaQuerySize.width; |
38 | + expect(width, context.width); | ||
39 | + | ||
40 | + var isLargeTabletOrWider = (width >= 720); | ||
41 | + expect(isLargeTabletOrWider, context.isLargeTabletOrWider); | ||
42 | + var isPhoneOrLess = (width < 600); | ||
43 | + expect(isPhoneOrLess, context.isPhoneOrLess); | ||
41 | var isPortrait = orientation == Orientation.portrait; | 44 | var isPortrait = orientation == Orientation.portrait; |
42 | expect(isPortrait, context.isPortrait); | 45 | expect(isPortrait, context.isPortrait); |
43 | - var isSmallTablet = (mediaQueryShortestSide >= 600); | ||
44 | - expect(isSmallTablet, context.isSmallTablet); | ||
45 | - var isTablet = isSmallTablet || isLargeTablet; | ||
46 | - expect(isTablet, context.isTablet); | 46 | + var isSmallTabletOrWider = (width >= 600); |
47 | + expect(isSmallTabletOrWider, context.isSmallTabletOrWider); | ||
48 | + var isTablet = isSmallTabletOrWider || isLargeTabletOrWider; | ||
49 | + expect(isTablet, context.isSmallTabletOrWider); | ||
47 | var mediaQueryPadding = mediaQuery.padding; | 50 | var mediaQueryPadding = mediaQuery.padding; |
48 | expect(mediaQueryPadding, context.mediaQueryPadding); | 51 | expect(mediaQueryPadding, context.mediaQueryPadding); |
49 | var mediaQueryViewInsets = mediaQuery.viewInsets; | 52 | var mediaQueryViewInsets = mediaQuery.viewInsets; |
@@ -55,8 +58,7 @@ void main() { | @@ -55,8 +58,7 @@ void main() { | ||
55 | expect(widthTransformer, context.widthTransformer()); | 58 | expect(widthTransformer, context.widthTransformer()); |
56 | var ratio = heightTransformer / widthTransformer; | 59 | var ratio = heightTransformer / widthTransformer; |
57 | expect(ratio, context.ratio()); | 60 | expect(ratio, context.ratio()); |
58 | - var width = mediaQuerySize.width; | ||
59 | - expect(width, context.width); | 61 | + |
60 | var showNavbar = (width > 800); | 62 | var showNavbar = (width > 800); |
61 | expect(showNavbar, context.showNavbar); | 63 | expect(showNavbar, context.showNavbar); |
62 | var textScaleFactor = mediaQuery.textScaleFactor; | 64 | var textScaleFactor = mediaQuery.textScaleFactor; |
-
Please register or login to post a comment