Skip to content

tiny nutrition fixes #549

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

Merged
merged 1 commit into from
Apr 12, 2024
Merged

tiny nutrition fixes #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class MyApp extends StatelessWidget {
HomeTabsScreen.routeName: (ctx) => HomeTabsScreen(),
MeasurementCategoriesScreen.routeName: (ctx) => MeasurementCategoriesScreen(),
MeasurementEntriesScreen.routeName: (ctx) => MeasurementEntriesScreen(),
NutritionScreen.routeName: (ctx) => NutritionScreen(),
NutritionalPlansScreen.routeName: (ctx) => NutritionalPlansScreen(),
NutritionalDiaryScreen.routeName: (ctx) => NutritionalDiaryScreen(),
NutritionalPlanScreen.routeName: (ctx) => NutritionalPlanScreen(),
WeightScreen.routeName: (ctx) => WeightScreen(),
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/home_tabs_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
final _screenList = [
DashboardScreen(),
WorkoutPlansScreen(),
NutritionScreen(),
NutritionalPlansScreen(),
WeightScreen(),
const GalleryScreen(),
];
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/nutritional_plans_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import 'package:wger/widgets/core/app_bar.dart';
import 'package:wger/widgets/nutrition/forms.dart';
import 'package:wger/widgets/nutrition/nutritional_plans_list.dart';

class NutritionScreen extends StatelessWidget {
class NutritionalPlansScreen extends StatelessWidget {
static const routeName = '/nutrition';

@override
Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/nutrition/nutritional_plans_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class NutritionalPlansList extends StatelessWidget {
icon: const Icon(Icons.delete),
tooltip: AppLocalizations.of(context).delete,
onPressed: () async {
// Delete workout from DB
// Delete the plan from DB
await showDialog(
context: context,
builder: (BuildContext contextDialog) {
Expand All @@ -80,7 +80,7 @@ class NutritionalPlansList extends StatelessWidget {
TextStyle(color: Theme.of(context).colorScheme.error),
),
onPressed: () {
// Confirmed, delete the workout
// Confirmed, delete the plan
_nutritionProvider.deletePlan(currentPlan.id!);

// Close the popup
Expand Down
2 changes: 1 addition & 1 deletion test/nutrition/nutritional_plans_screen_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void main() {
locale: Locale(locale),
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
home: NutritionScreen(),
home: NutritionalPlansScreen(),
routes: {
FormScreen.routeName: (ctx) => FormScreen(),
},
Expand Down