From 78c70c7918ede5df2a24d44cb8da65accd8bd689 Mon Sep 17 00:00:00 2001
From: Roland Geider <roland@geider.net>
Date: Sat, 10 Apr 2021 12:25:34 +0200
Subject: [PATCH] Move gym mode content into a SafeArea widget

---
 lib/screens/gym_mode.dart          | 16 ++++++++--------
 lib/widgets/workouts/gym_mode.dart |  5 -----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/screens/gym_mode.dart b/lib/screens/gym_mode.dart
index 8fb6b6eb..3b457a16 100644
--- a/lib/screens/gym_mode.dart
+++ b/lib/screens/gym_mode.dart
@@ -22,22 +22,22 @@ import 'package:wger/models/workouts/day.dart';
 import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/widgets/workouts/gym_mode.dart';
 
-class GymModeScreen extends StatefulWidget {
+class GymModeScreen extends StatelessWidget {
   static const routeName = '/gym-mode';
 
-  @override
-  _GymModeScreenState createState() => _GymModeScreenState();
-}
-
-class _GymModeScreenState extends State<GymModeScreen> {
   @override
   Widget build(BuildContext context) {
     final _day = ModalRoute.of(context)!.settings.arguments as Day;
 
     return Scaffold(
       backgroundColor: Colors.white,
-      body: Consumer<WorkoutPlans>(
-        builder: (context, value, child) => GymMode(_day),
+      body: SafeArea(
+        child: Consumer<WorkoutPlans>(
+          builder: (context, value, child) => Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 30),
+            child: GymMode(_day),
+          ),
+        ),
       ),
     );
   }
diff --git a/lib/widgets/workouts/gym_mode.dart b/lib/widgets/workouts/gym_mode.dart
index a9960bbd..63283c17 100644
--- a/lib/widgets/workouts/gym_mode.dart
+++ b/lib/widgets/workouts/gym_mode.dart
@@ -132,7 +132,6 @@ class StartPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      padding: EdgeInsets.symmetric(horizontal: 20, vertical: 20),
       child: Column(
         children: [
           Padding(
@@ -231,7 +230,6 @@ class _LogPageState extends State<LogPage> {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      padding: EdgeInsets.symmetric(horizontal: 20, vertical: 20),
       child: Column(
         children: [
           Padding(
@@ -412,7 +410,6 @@ class ExerciseOverview extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      padding: EdgeInsets.symmetric(horizontal: 20, vertical: 20),
       child: Column(
         children: [
           Padding(
@@ -471,7 +468,6 @@ class _SessionPageState extends State<SessionPage> {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      padding: EdgeInsets.symmetric(horizontal: 20, vertical: 20),
       child: Column(
         children: [
           Padding(
@@ -664,7 +660,6 @@ class _TimerWidgetState extends State<TimerWidget> {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      padding: EdgeInsets.symmetric(horizontal: 20, vertical: 20),
       child: Column(
         children: [
           Expanded(