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

Fixes to use measurement provider with base provider as argument

Browse Source
This commit is contained in:
Roland Geider
2021-08-25 21:48:16 +02:00
parent 6cbe164ec8
commit 4e9ca1db6b
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/main.dart
View File

@@ -19,6 +19,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:wger/providers/base_provider.dart';
import 'package:wger/providers/body_weight.dart';
import 'package:wger/providers/exercises.dart';
import 'package:wger/providers/gallery.dart';
@@ -82,12 +83,12 @@ class MyApp extends StatelessWidget {
update: (context, auth, previous) =>
previous != null ? previous : NutritionPlansProvider(auth, []),
),
// ChangeNotifierProxyProvider<AuthProvider, MeasurementProvider>(
// create: (context) =>
// MeasurementProvider(Provider.of<AuthProvider>(context, listen: false)),
// update: (context, auth, previous) =>
// previous != null ? previous : MeasurementProvider(auth),
// ),
ChangeNotifierProxyProvider<AuthProvider, MeasurementProvider>(
create: (context) => MeasurementProvider(
WgerBaseProvider(Provider.of<AuthProvider>(context, listen: false))),
update: (context, base, previous) =>
previous != null ? previous : MeasurementProvider(WgerBaseProvider(base)),
),
ChangeNotifierProxyProvider<AuthProvider, BodyWeightProvider>(
create: (context) =>
BodyWeightProvider(Provider.of<AuthProvider>(context, listen: false), []),

6
lib/models/measurements/measurement_entry.g.dart
View File

@@ -7,8 +7,7 @@ part of 'measurement_entry.dart';
// **************************************************************************
MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
$checkKeys(json,
requiredKeys: const ['id', 'category', 'date', 'value', 'notes']);
$checkKeys(json, requiredKeys: const ['id', 'category', 'date', 'value', 'notes']);
return MeasurementEntry(
id: json['id'] as int?,
category: json['category'] as int,
@@ -18,8 +17,7 @@ MeasurementEntry _$MeasurementEntryFromJson(Map<String, dynamic> json) {
);
}
Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) =>
<String, dynamic>{
Map<String, dynamic> _$MeasurementEntryToJson(MeasurementEntry instance) => <String, dynamic>{
'id': instance.id,
'category': instance.category,
'date': toDate(instance.date),

2
lib/screens/dashboard.dart
View File

@@ -24,7 +24,7 @@ import 'package:wger/providers/auth.dart';
import 'package:wger/providers/body_weight.dart';
import 'package:wger/providers/exercises.dart';
import 'package:wger/providers/gallery.dart';
import 'package:wger/providers/measurements.dart';
import 'package:wger/providers/measurement.dart';
import 'package:wger/providers/nutrition.dart';
import 'package:wger/providers/workout_plans.dart';
import 'package:wger/widgets/core/app_bar.dart';

2
lib/widgets/measurements/categories.dart
View File

@@ -18,7 +18,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:wger/providers/measurements.dart';
import 'package:wger/providers/measurement.dart';
import 'package:wger/screens/measurement_entries_screen.dart';
class CategoriesList extends StatelessWidget {

5
lib/widgets/measurements/entries.dart
View File

@@ -20,7 +20,7 @@ import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import 'package:wger/models/measurements/measurement_category.dart';
import 'package:wger/providers/measurements.dart';
import 'package:wger/providers/measurement.dart';
class EntriesList extends StatelessWidget {
late MeasurementCategory _category;
@@ -28,7 +28,8 @@ class EntriesList extends StatelessWidget {
Future<void> _loadEntries(BuildContext context) async {
final provider = Provider.of<MeasurementProvider>(context, listen: false);
final int categoryId = ModalRoute.of(context)!.settings.arguments as int;
_category = await provider.fetchAndSetCategoryEntries(categoryId);
await provider.fetchAndSetCategoryEntries(categoryId);
_category = provider.findCategoryById(categoryId);
}
@override