Skip to content
Open
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
2 changes: 1 addition & 1 deletion lib/UI/exercise/add_new_exercise_alert.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class AddExerciseAlert extends StatelessWidget {
padding: const EdgeInsets.only(left: 20, right: 20),
child: nameWidget,
),
Container(
SizedBox(
height: screenHeight * 0.05,
width: screenWidth * 0.5,
child: addExercise,
Expand Down
6 changes: 3 additions & 3 deletions lib/UI/exercise/exercise_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class _ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClie
super.build(context);
return ThemeProvider(
builder: (BuildContext context, AppTheme theme) {
return Container(
return SizedBox(
height: height + screenHeight * 0.06,
child: Stack(
children: <Widget> [
Expand All @@ -126,7 +126,7 @@ class _ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClie
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget> [
Container(
SizedBox(
height: getHeight(),
width: screenWidth * 0.45,
child: Text(
Expand Down Expand Up @@ -213,7 +213,7 @@ class _ExerciseCardState extends State<ExerciseCard> with AutomaticKeepAliveClie
right: screenWidth * 0.43,
left: screenWidth * 0.43,
top: height - 15,
child: Container(
child: SizedBox(
height: screenHeight * 0.07,
child: DecoratedBox(
decoration: BoxDecoration(
Expand Down
3 changes: 2 additions & 1 deletion lib/UI/exercise/set_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ class _SetWidgetState extends State<SetWidget>
),
],
),
child: Container(

child: SizedBox(
height: screenHeight * 0.05,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
Expand Down
2 changes: 1 addition & 1 deletion lib/UI/exercise/totals_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class _ExerciseTotalsWidgetState extends State<ExerciseTotalsWidget> {
widget.totals.totalWeight,
widget.totals.avgWeight
];
return Container(
return SizedBox(
height: screenHeight * 0.04,
width: screenWidth * 0.3,
child: RaisedGradientButton(
Expand Down
2 changes: 1 addition & 1 deletion lib/UI/prev_workout/delete_prev_workout_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class _DeleteWorkoutAlertState extends State<DeleteWorkoutAlert> {
style: mediumTitleStyleWhite,
textAlign: TextAlign.center,
),
Container(
SizedBox(
height: screenHeight * 0.05,
width: screenWidth * 0.5,
child: widget.deleteWorkoutButton,
Expand Down
12 changes: 6 additions & 6 deletions lib/UI/prev_workout/prev_exercise_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
totalWidget = ExerciseTotalsWidget(totals: totalData, index: index);
return ThemeProvider(
builder: (BuildContext context, AppTheme theme) {
return Container(
return SizedBox(
height: height + screenHeight * 0.06,
child: Stack(
children: <Widget>[
Expand All @@ -90,7 +90,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Container(
SizedBox(
height: getHeight(),
width: screenWidth * 0.45,
child: Text(
Expand All @@ -116,7 +116,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
Container(
width: screenWidth * 0.08,
),
Container(
SizedBox(
width: screenWidth * 0.15,
child: Center(
child: Text(
Expand All @@ -125,7 +125,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
),
),
),
Container(
SizedBox(
width: screenWidth * 0.15,
child: Center(
child: Text(
Expand All @@ -134,7 +134,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
),
),
),
Container(
SizedBox(
width: screenWidth * 0.15,
child: Center(
child: Text(
Expand All @@ -143,7 +143,7 @@ class _PrevExerciseCardState extends State<PrevExerciseCard> with AutomaticKeepA
),
),
),
Container(
SizedBox(
width: screenWidth * 0.15,
child: Center(
child: Text(
Expand Down
16 changes: 8 additions & 8 deletions lib/UI/prev_workout/prev_set_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ class _PrevSetWidgetState extends State<PrevSetWidget>
return getSetWidget();
}

Container getSetWidget() {
return Container(
SizedBox getSetWidget() {
return SizedBox(
height: screenHeight * 0.05,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget> [
Container(
SizedBox(
width: screenWidth * 0.08,
child: Center(
child: Text(
Expand All @@ -67,23 +67,23 @@ class _PrevSetWidgetState extends State<PrevSetWidget>
),
),
),
Container(
SizedBox(
width: screenWidth * 0.145,
child: getText(0),
),
Container(
SizedBox(
width: screenWidth * 0.145,
child: getText(1),
),
Container(
SizedBox(
width: screenWidth * 0.145,
child: getText(2),
),
Container(
SizedBox(
width: screenWidth * 0.145,
child: getText(3),
),
Container(
SizedBox(
width: screenWidth * 0.08,
child: getText(4),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/UI/workout/add_new_workout_alert.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class AddWorkoutAlert extends StatelessWidget {
padding: const EdgeInsets.only(left: 20, right: 20),
child: nameWidget,
),
Container(
SizedBox(
height: screenHeight * 0.05,
width: screenWidth * 0.5,
child: addWorkout,
Expand Down
4 changes: 2 additions & 2 deletions lib/UI/workout/redo_workout_alert.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ class RedoWorkoutAlert extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget> [
Container(
SizedBox(
height: screenHeight * 0.05,
width: screenWidth * 0.3,
child: viewWorkout,
),
Container(
SizedBox(
height: screenHeight * 0.05,
width: screenWidth * 0.3,
child: redoWorkout,
Expand Down
2 changes: 1 addition & 1 deletion lib/UI/workout/save_workout_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class _SaveWorkoutAlertState extends State<SaveWorkoutAlert> {
],
),
),
Container(
SizedBox(
height: screenHeight * 0.05,
width: screenWidth * 0.5,
child: widget.saveWorkout,
Expand Down
2 changes: 1 addition & 1 deletion lib/UI/workout/workout_name_selection_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class _WorkoutNameSelectionWidgetState extends State<WorkoutTemplateSelectionWid
subtitle1: setStyle,
),
),
child: Container(
child: SizedBox(
width: screenWidth * 0.5,
child: DropdownButton<String>(
value: dropDownValue,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/feature/authentication/view/landing_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class _LandingScreenState extends ConsumerState<LandingScreen> with SingleTicker
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Container(
SizedBox(
height: 40,
child: TabBar(
tabs: tabs,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/custom_floating_action_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class CustomFloatingActionButton extends StatelessWidget {
child: InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(size),
child: Container(
child: SizedBox(
width: size,
height: size,
child: Center(
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/text_field.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class OutlinedTextField extends StatelessWidget {
hintStyle: setHintStyle.copyWith(
color: Colors.white.withOpacity(0.5),
),
prefixIcon: Container(
prefixIcon: SizedBox(
width: 40,
child: Icon(
leadingIcon,
Expand Down