Skip to content
Merged
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: 2 additions & 0 deletions lib/helpers/consts.dart
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,5 @@ enum EXERCISE_IMAGE_ART_STYLE {
/// Colors used for muscles
const COLOR_MAIN_MUSCLES = Colors.red;
const COLOR_SECONDARY_MUSCLES = Colors.orange;

const days = 14;
14 changes: 13 additions & 1 deletion lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -648,5 +648,17 @@
"quads": "Quads",
"arms": "Arms",
"sz_bar": "SZ-Bar",
"aboutPageTitle": "About Wger"
"aboutPageTitle": "About Wger",
"verify": "Verify Email",
"foo" : "Profile Screen",
"foo2" : "You can only contribute exercises if your account is older than {days} days and have verified your email",
"@foo2": {
"description" : "Number of days before which a person can add exercise",
"placeholders": {
"days": {
"type" : "String",
"example" : "world"
}
}
}
}
154 changes: 108 additions & 46 deletions lib/screens/add_exercise_screen.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:wger/helpers/consts.dart';
import 'package:wger/providers/add_exercise.dart';
import 'package:wger/providers/exercises.dart';
import 'package:wger/screens/exercise_screen.dart';
Expand All @@ -11,6 +12,11 @@ import 'package:wger/widgets/add_exercise/steps/step4translations.dart';
import 'package:wger/widgets/add_exercise/steps/step5images.dart';
import 'package:wger/widgets/core/app_bar.dart';

import '../models/user/profile.dart';
import '../providers/user.dart';
import '../widgets/user/forms.dart';
import 'form_screen.dart';

class AddExerciseScreen extends StatefulWidget {
const AddExerciseScreen({Key? key}) : super(key: key);

Expand Down Expand Up @@ -46,10 +52,14 @@ class _AddExerciseScreenState extends State<AddExerciseScreen> {
if (_currentStep == lastStepIndex)
ElevatedButton(
onPressed: () async {
final id = await context.read<AddExerciseProvider>().addExercise();
final base = await context.read<ExercisesProvider>().fetchAndSetExerciseBase(id);
final id =
await context.read<AddExerciseProvider>().addExercise();
final base = await context
.read<ExercisesProvider>()
.fetchAndSetExerciseBase(id);

Navigator.pushNamed(context, ExerciseDetailScreen.routeName, arguments: base);
Navigator.pushNamed(context, ExerciseDetailScreen.routeName,
arguments: base);
},
child: Text(AppLocalizations.of(context).save),
)
Expand All @@ -66,56 +76,108 @@ class _AddExerciseScreenState extends State<AddExerciseScreen> {

@override
Widget build(BuildContext context) {
return Scaffold(
appBar: EmptyAppBar(AppLocalizations.of(context).contributeExercise),
body: Stepper(
controlsBuilder: _controlsBuilder,
steps: [
Step(
title: Text(AppLocalizations.of(context).baseData),
content: Step1Basics(formkey: _keys[0]),
),
Step(
title: Text(AppLocalizations.of(context).variations),
content: Step2Variations(formkey: _keys[1]),
),
Step(
title: Text(AppLocalizations.of(context).description),
content: Step3Description(formkey: _keys[2]),
),
Step(
title: Text(AppLocalizations.of(context).translation),
content: Step4Translation(formkey: _keys[3]),
),
Step(
title: Text(AppLocalizations.of(context).images),
content: Step5Images(formkey: _keys[4]),
),
],
currentStep: _currentStep,
onStepContinue: () {
if (_keys[_currentStep].currentState?.validate() ?? false) {
_keys[_currentStep].currentState?.save();
Profile? _user = Provider.of<UserProvider>(context, listen: false).profile;

if (_currentStep != lastStepIndex) {
setState(() {
_currentStep += 1;
});
}
}
},
onStepCancel: () => setState(() {
if (_currentStep != 0) {
_currentStep -= 1;
}
}),
/*
return !_user!.emailVerified
? EmailNotVerified(context)
: Scaffold(
appBar:
EmptyAppBar(AppLocalizations.of(context).contributeExercise),
body: Stepper(
controlsBuilder: _controlsBuilder,
steps: [
Step(
title: Text(AppLocalizations.of(context).baseData),
content: Step1Basics(formkey: _keys[0]),
),
Step(
title: Text(AppLocalizations.of(context).variations),
content: Step2Variations(formkey: _keys[1]),
),
Step(
title: Text(AppLocalizations.of(context).description),
content: Step3Description(formkey: _keys[2]),
),
Step(
title: Text(AppLocalizations.of(context).translation),
content: Step4Translation(formkey: _keys[3]),
),
Step(
title: Text(AppLocalizations.of(context).images),
content: Step5Images(formkey: _keys[4]),
),
],
currentStep: _currentStep,
onStepContinue: () {
if (_keys[_currentStep].currentState?.validate() ?? false) {
_keys[_currentStep].currentState?.save();

if (_currentStep != lastStepIndex) {
setState(() {
_currentStep += 1;
});
}
}
},
onStepCancel: () => setState(() {
if (_currentStep != 0) {
_currentStep -= 1;
}
}),
/*
onStepTapped: (int index) {
setState(() {
_currentStep = index;
});
},
*/
),
);
}

Widget EmailNotVerified(context) {
Profile? _user = Provider.of<UserProvider>(context, listen: false).profile;

return Scaffold(
appBar: EmptyAppBar('Verify Email'),
body: Container(
padding: EdgeInsets.all(25),
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
AppLocalizations.of(context).foo2(days.toString()),
style: Theme.of(context).textTheme.headline4,
),
SizedBox(
height: 16,
),
TextButton(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Colors.blue),
),
onPressed: () {
Navigator.pushReplacementNamed(
context,
FormScreen.routeName,
arguments: FormScreenArguments(
AppLocalizations.of(context).userProfile,
UserProfileForm(_user!),
),
);
},
child: Container(
padding: EdgeInsets.all(15),
child: Text(
AppLocalizations.of(context).foo,
style: Theme.of(context).textTheme.headlineSmall,
),
),
),
],
),
),
),
);
}
Expand Down
Loading