wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Roland Geider
2025-01-31 16:25:03 +01:00
parent 5058498c4f
commit 2e62fdee83
3 changed files with 91 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/widgets/dashboard/calendar.dart
View File

@@ -115,8 +115,8 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
}
// Process workout sessions
final RoutinesProvider plans = Provider.of<RoutinesProvider>(context, listen: false);
await plans.fetchSessionData().then((sessions) {
final routinesProvider = context.read<RoutinesProvider>();
await routinesProvider.fetchSessionData().then((sessions) {
for (final session in sessions) {
final date = DateFormatLists.format(session.date);
if (!_events.containsKey(date)) {

10
lib/widgets/routines/app_bar.dart
View File

@@ -35,7 +35,6 @@ enum _RoutineDetailBarOptions {
edit,
delete,
logs,
reload,
}
class RoutineListAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -96,10 +95,6 @@ class RoutineDetailAppBar extends StatelessWidget implements PreferredSizeWidget
PopupMenuButton(
itemBuilder: (context) {
return [
const PopupMenuItem<_RoutineDetailBarOptions>(
value: _RoutineDetailBarOptions.reload,
child: Text('debug / reload'),
),
PopupMenuItem<_RoutineDetailBarOptions>(
value: _RoutineDetailBarOptions.logs,
child: Text(i18n.labelWorkoutLogs),
@@ -114,7 +109,7 @@ class RoutineDetailAppBar extends StatelessWidget implements PreferredSizeWidget
),
];
},
onSelected: (value) async {
onSelected: (value) {
switch (value) {
case _RoutineDetailBarOptions.edit:
Navigator.pushNamed(
@@ -133,9 +128,6 @@ class RoutineDetailAppBar extends StatelessWidget implements PreferredSizeWidget
case _RoutineDetailBarOptions.delete:
provider.deleteRoutine(routine.id!);
Navigator.of(context).pop();
case _RoutineDetailBarOptions.reload:
await provider.fetchAndSetRoutineFull(routine.id!);
}
},
),

150
lib/widgets/routines/routines_list.dart
View File

@@ -24,96 +24,122 @@ import 'package:wger/providers/routines.dart';
import 'package:wger/screens/routine_screen.dart';
import 'package:wger/widgets/core/text_prompt.dart';
class RoutinesList extends StatelessWidget {
class RoutinesList extends StatefulWidget {
final RoutinesProvider _routineProvider;
const RoutinesList(this._routineProvider);
@override
State<RoutinesList> createState() => _RoutinesListState();
}
class _RoutinesListState extends State<RoutinesList> {
int? _loadingRoutine;
@override
Widget build(BuildContext context) {
return RefreshIndicator(
onRefresh: () => _routineProvider.fetchAndSetAllRoutinesFull(),
child: _routineProvider.items.isEmpty
onRefresh: () => widget._routineProvider.fetchAndSetAllPlansSparse(),
child: widget._routineProvider.items.isEmpty
? const TextPrompt()
: ListView.builder(
padding: const EdgeInsets.all(10.0),
itemCount: _routineProvider.items.length,
itemCount: widget._routineProvider.items.length,
itemBuilder: (context, index) {
final currentRoutine = _routineProvider.items[index];
final currentRoutine = widget._routineProvider.items[index];
return Card(
child: ListTile(
onTap: () async {
_routineProvider.setCurrentPlan(currentRoutine.id!);
final routine =
await _routineProvider.fetchAndSetRoutineFull(currentRoutine.id!);
widget._routineProvider.setCurrentPlan(currentRoutine.id!);
Navigator.of(context).pushNamed(
RoutineScreen.routeName,
arguments: routine,
);
setState(() {
_loadingRoutine = currentRoutine.id;
});
await widget._routineProvider.fetchAndSetRoutineFull(currentRoutine.id!);
if (mounted) {
setState(() {
_loadingRoutine = null;
});
Navigator.of(context).pushNamed(
RoutineScreen.routeName,
arguments: currentRoutine.id,
);
}
},
title: Text(currentRoutine.name),
subtitle: Text(
'${DateFormat.yMd(Localizations.localeOf(context).languageCode).format(currentRoutine.start)}'
' - ${DateFormat.yMd(Localizations.localeOf(context).languageCode).format(currentRoutine.end)}',
),
trailing: Row(mainAxisSize: MainAxisSize.min, children: [
const VerticalDivider(),
IconButton(
icon: const Icon(Icons.delete),
tooltip: AppLocalizations.of(context).delete,
onPressed: () async {
// Delete workout from DB
await showDialog(
context: context,
builder: (BuildContext contextDialog) {
return AlertDialog(
content: Text(
AppLocalizations.of(context).confirmDelete(currentRoutine.name),
),
actions: [
TextButton(
child: Text(
MaterialLocalizations.of(context).cancelButtonLabel,
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
const VerticalDivider(),
if (_loadingRoutine == currentRoutine.id)
const IconButton(
icon: CircularProgressIndicator(),
onPressed: null,
)
else
IconButton(
icon: const Icon(Icons.delete),
tooltip: AppLocalizations.of(context).delete,
onPressed: () async {
// Delete workout from DB
await showDialog(
context: context,
builder: (BuildContext contextDialog) {
return AlertDialog(
content: Text(
AppLocalizations.of(context)
.confirmDelete(currentRoutine.name),
),
onPressed: () => Navigator.of(contextDialog).pop(),
),
TextButton(
child: Text(
AppLocalizations.of(context).delete,
style: TextStyle(
color: Theme.of(context).colorScheme.error,
actions: [
TextButton(
child: Text(
MaterialLocalizations.of(context).cancelButtonLabel,
),
onPressed: () => Navigator.of(contextDialog).pop(),
),
),
onPressed: () {
// Confirmed, delete the workout
Provider.of<RoutinesProvider>(
context,
listen: false,
).deleteRoutine(currentRoutine.id!);
// Close the popup
Navigator.of(contextDialog).pop();
// and inform the user
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
AppLocalizations.of(context).successfullyDeleted,
textAlign: TextAlign.center,
TextButton(
child: Text(
AppLocalizations.of(context).delete,
style: TextStyle(
color: Theme.of(context).colorScheme.error,
),
),
);
},
),
],
onPressed: () {
// Confirmed, delete the workout
Provider.of<RoutinesProvider>(
context,
listen: false,
).deleteRoutine(currentRoutine.id!);
// Close the popup
Navigator.of(contextDialog).pop();
// and inform the user
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
AppLocalizations.of(context).successfullyDeleted,
textAlign: TextAlign.center,
),
),
);
},
),
],
);
},
);
},
);
},
),
]),
),
],
),
),
);
},