Skip to content

feat: start from template button on calendar page #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ckelwin wants to merge 2 commits into
base: alpha
Choose a base branch
from
Open

feat: start from template button on calendar page #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8f1401
Added `Start from template` button on calendar_screen.dart. Can still…
ckelwin Oct 10, 2022
57ca5c5
Merge remote-tracking branch 'remotes/forkowner/alpha' into feature/2…
ckelwin Oct 10, 2022
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
5 changes: 3 additions & 2 deletions lib/UI/workout/workout_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import 'package:exerlog/src/widgets/theme/theme_provider.dart';
import 'package:flutter/material.dart';

class WorkoutPage extends StatefulWidget {
WorkoutPage(this.workout, {Key? key}) : super(key: key);
WorkoutPage(this.workout, {Key? key, this.isTemplateMode = false}) : super(key: key);

Workout? workout;
bool isTemplateMode;

@override
_WorkoutPageState createState() => _WorkoutPageState();
Expand Down Expand Up @@ -139,7 +140,7 @@ class _WorkoutPageState extends State<WorkoutPage> {
child: Text('Something went wrong'),
);
} else {
if (snapshot.data!.isEmpty) {
if (!widget.isTemplateMode) {
firstLoad = false;
Future<void>.delayed(
Duration.zero,
Expand Down
39 changes: 31 additions & 8 deletions lib/src/feature/calendar/view/calendar_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,28 @@ class _CalendarScreenState extends ConsumerState<CalendarScreen> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget> [
CalendarWidget(),
RaisedGradientButton(
width: context.width * .8,
onPressed: _navigateToWorkoutScreen,
child: Text(
Texts.startNewWorkout.toUpperCase(),
style: buttonTextSmall,
),
Column(
children: [
RaisedGradientButton(
width: context.width * .8,
onPressed: _navigateToExerciseScreen,
child: Text(
Texts.startNewWorkout.toUpperCase(),
style: buttonTextSmall,
),
),
const SizedBox(
height: 15,
),
RaisedGradientButton(
width: context.width * .8,
onPressed: _navigateToWorkoutScreen,
child: Text(
Texts.startFromTemplate.toUpperCase(),
style: buttonTextSmall,
),
),
],
)
],
),
Expand All @@ -68,14 +83,22 @@ class _CalendarScreenState extends ConsumerState<CalendarScreen> {
);
}

void _navigateToWorkoutScreen() {
void _navigateToExerciseScreen() {
Navigator.of(context).push(
MaterialPageRoute<void>(
builder: (BuildContext context) => WorkoutPage(null),
),
);
}

void _navigateToWorkoutScreen() {
Navigator.of(context).push(
MaterialPageRoute<void>(
builder: (BuildContext context) => WorkoutPage(null, isTemplateMode: true),
),
);
}

void _showNoNetworkConnectionSnackBar() =>
ScaffoldMessenger.of(context).showSnackBar(
noNetworkConnectionSnackBar(AppTheme.of(context)),
Expand Down
1 change: 1 addition & 0 deletions lib/src/utils/text_constants.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Texts {

/// Calendar Screen
static const String startNewWorkout = 'Start new workout';
static const String startFromTemplate = 'Start from template';
/// Workout Screen

}