diff --git a/lib/screens/dashboard/DashboardScreen.dart b/lib/screens/dashboard/DashboardScreen.dart index e15deab..b325673 100644 --- a/lib/screens/dashboard/DashboardScreen.dart +++ b/lib/screens/dashboard/DashboardScreen.dart @@ -31,51 +31,48 @@ class DashboardScreen extends StatelessWidget { Widget build(BuildContext context) { final projectsBloc = BlocProvider.of(context); final settingsBloc = BlocProvider.of(context); + final screenBorders = MediaQuery.of(context).padding; return BlocProvider( create: (_) => DashboardBloc(projectsBloc, settingsBloc), child: Scaffold( appBar: const TopBar(), - body: - Scrollable( - viewportBuilder: (BuildContext context, position) => - Column( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisSize: MainAxisSize.max, - children: [ - const Expanded( - flex: 1, - child: StoppedTimers(), - ), - const RunningTimers(), - Material( - elevation: 8.0, - color: Theme.of(context).bottomSheetTheme.backgroundColor, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisSize: MainAxisSize.max, - //crossAxisAlignment: CrossAxisAlignment.end, - children: const [ - ProjectSelectField(), - Expanded( - flex: 1, - child: Padding( - padding: EdgeInsets.fromLTRB(4.0, 0, 4.0, 0), - child: DescriptionField(), - ), - ), - SizedBox( - width: 72, - height: 72, - ) - ], + body: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisSize: MainAxisSize.max, + children: [ + const Expanded( + flex: 1, + child: StoppedTimers(), + ), + const RunningTimers(), + Material( + elevation: 8.0, + color: Theme.of(context).bottomSheetTheme.backgroundColor, + child: Padding( + padding: EdgeInsets.fromLTRB(8 + screenBorders.left, 8, + 8 + screenBorders.right, 8 + screenBorders.bottom), + child: const Row( + mainAxisSize: MainAxisSize.max, + children: [ + ProjectSelectField(), + Expanded( + flex: 1, + child: Padding( + padding: EdgeInsets.fromLTRB(4.0, 0, 4.0, 0), + child: DescriptionField(), ), ), - ) - ], + SizedBox( + width: 72, + height: 72, + ) + ], + ), ), + ) + ], ), floatingActionButton: const StartTimerButton(), ));