fix: constrain sizing to environment and remove unused code

VGVentures · Jul 29, 2024 · 436acb6 · 436acb6
1 parent 5b762c8
commit 436acb6
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 242 deletions.
diff --git a/lib/demo/widgets/app_scaffold.dart b/lib/demo/widgets/app_scaffold.dart
@@ -29,6 +29,7 @@ class AppScaffold extends StatelessWidget {
     final textTheme = theme.textTheme;
 
     final title = Text(l10n.deviceFrameAppBarTitle);
+    final size = MediaQuery.sizeOf(context);
 
     return Scaffold(
       extendBodyBehindAppBar: extendBodyBehindAppBar,
@@ -38,34 +39,38 @@ class AppScaffold extends StatelessWidget {
         title: showTitleInAppBar ? title : null,
         titleTextStyle: textTheme.titleMedium,
       ),
-      body: SingleChildScrollView(
-        child: Padding(
-          padding: extendBodyBehindAppBar
-              ? EdgeInsets.only(
-                  top: AppBar().preferredSize.height + AppSpacing.lg,
-                  bottom: AppSpacing.lg,
-                )
-              : const EdgeInsets.all(AppSpacing.lg),
-          child: Column(
-            children: [
-              if (!showTitleInAppBar) ...[
-                DefaultTextStyle(
-                  style: textTheme.displayMedium!,
-                  child: Padding(
-                    padding: titlePadding,
-                    child: title,
+      body: SizedBox(
+        width: size.width,
+        height: size.height,
+        child: SingleChildScrollView(
+          child: Padding(
+            padding: extendBodyBehindAppBar
+                ? EdgeInsets.only(
+                    top: AppBar().preferredSize.height + AppSpacing.lg,
+                    bottom: AppSpacing.lg,
+                  )
+                : const EdgeInsets.all(AppSpacing.lg),
+            child: Column(
+              children: [
+                if (!showTitleInAppBar) ...[
+                  DefaultTextStyle(
+                    style: textTheme.displayMedium!,
+                    child: Padding(
+                      padding: titlePadding,
+                      child: title,
+                    ),
                   ),
-                ),
-                const SizedBox(height: AppSpacing.lg),
+                  const SizedBox(height: AppSpacing.lg),
+                ],
+                predictionChart,
+                if (goalStats != null) ...[
+                  const SizedBox(height: AppSpacing.lg),
+                  goalStats!,
+                  const SizedBox(height: AppSpacing.lg),
+                ],
+                transactions,
               ],
-              predictionChart,
-              if (goalStats != null) ...[
-                const SizedBox(height: AppSpacing.lg),
-                goalStats!,
-                const SizedBox(height: AppSpacing.lg),
-              ],
-              transactions,
-            ],
+            ),
           ),
         ),
       ),

diff --git a/lib/demo/widgets/device_frame.dart b/lib/demo/widgets/device_frame.dart
@@ -26,7 +26,12 @@ class DeviceFrame extends StatelessWidget {
 
     return Theme(
       data: data,
-      child: child,
+      child: Material(
+        elevation: elevation,
+        borderRadius: BorderRadius.circular(borderRadius),
+        clipBehavior: Clip.antiAlias,
+        child: child,
+      ),
     );
   }
 }
diff --git a/lib/thumbnail/thumbnail.dart b/lib/thumbnail/thumbnail.dart
diff --git a/lib/thumbnail/view/theme_potential_thumbnail.dart b/lib/thumbnail/view/theme_potential_thumbnail.dart
diff --git a/test/helpers/pump_experience.dart b/test/helpers/pump_experience.dart
@@ -26,7 +26,10 @@ extension PumpExperience on WidgetTester {
         child: MaterialApp(
           localizationsDelegates: AppLocalizations.localizationsDelegates,
           supportedLocales: AppLocalizations.supportedLocales,
-          home: widget,
+          home: MediaQuery(
+            data: const MediaQueryData(),
+            child: widget,
+          ),
         ),
       ),
     );

diff --git a/test/thumbnail/theme_potential_thumbnail_test.dart b/test/thumbnail/theme_potential_thumbnail_test.dart