Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions lib/src/responsive_scaled_box.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,10 @@ class ResponsiveScaledBox extends StatelessWidget {
if (width != null) {
return LayoutBuilder(
builder: (context, constraints) {
MediaQueryData mediaQueryData = MediaQuery.of(context);

double aspectRatio = constraints.maxWidth / constraints.maxHeight;
double scaledWidth = width!;
double scaledHeight = width! / aspectRatio;

bool overrideMediaQueryData = autoCalculateMediaQueryData &&
(mediaQueryData.size ==
Size(constraints.maxWidth, constraints.maxHeight));

EdgeInsets scaledViewInsets = getScaledViewInsets(
mediaQueryData: mediaQueryData,
screenSize: mediaQueryData.size,
scaledSize: Size(scaledWidth, scaledHeight));
EdgeInsets scaledViewPadding = getScaledViewPadding(
mediaQueryData: mediaQueryData,
screenSize: mediaQueryData.size,
scaledSize: Size(scaledWidth, scaledHeight));
EdgeInsets scaledPadding = getScaledPadding(
padding: scaledViewPadding, insets: scaledViewInsets);

Widget childHolder = FittedBox(
fit: BoxFit.fitWidth,
alignment: Alignment.topCenter,
Expand All @@ -50,15 +33,33 @@ class ResponsiveScaledBox extends StatelessWidget {
),
);

if (overrideMediaQueryData) {
return MediaQuery(
data: mediaQueryData.copyWith(
size: Size(scaledWidth, scaledHeight),
viewInsets: scaledViewInsets,
viewPadding: scaledViewPadding,
padding: scaledPadding),
child: childHolder,
);
if (autoCalculateMediaQueryData) {
MediaQueryData mediaQueryData = MediaQuery.of(context);

bool overrideMediaQueryData = (mediaQueryData.size ==
Size(constraints.maxWidth, constraints.maxHeight));

EdgeInsets scaledViewInsets = getScaledViewInsets(
mediaQueryData: mediaQueryData,
screenSize: mediaQueryData.size,
scaledSize: Size(scaledWidth, scaledHeight));
EdgeInsets scaledViewPadding = getScaledViewPadding(
mediaQueryData: mediaQueryData,
screenSize: mediaQueryData.size,
scaledSize: Size(scaledWidth, scaledHeight));
EdgeInsets scaledPadding = getScaledPadding(
padding: scaledViewPadding, insets: scaledViewInsets);

if (overrideMediaQueryData) {
return MediaQuery(
data: mediaQueryData.copyWith(
size: Size(scaledWidth, scaledHeight),
viewInsets: scaledViewInsets,
viewPadding: scaledViewPadding,
padding: scaledPadding),
child: childHolder,
);
}
}

return childHolder;
Expand Down
2 changes: 0 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^4.0.0

flutter: