broodjeaap/pizzaplanner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed scattered definitions of date formatter

Browse source
This commit is contained in:
broodjeaap89 2021-07-13 20:32:14 +02:00
parent 0fb0c97a44
commit c73b352d1e
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/entities/PizzaRecipe/PizzaRecipe.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:intl/intl.dart'; import 'package:pizzaplanner/util.dart';
import 'package:pizzaplanner/entities/PizzaRecipe/Ingredient.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/Ingredient.dart';
import 'package:pizzaplanner/entities/PizzaRecipe/Ingredients.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/Ingredients.dart';
@ -12,7 +12,6 @@ class PizzaRecipe {
final String name; final String name;
final String description; final String description;
final Ingredients ingredients; final Ingredients ingredients;
final DateFormat dateFormatter = DateFormat("yyyy-MM-dd H:mm");
final List<RecipeStep> recipeSteps; final List<RecipeStep> recipeSteps;
@ -104,7 +103,7 @@ class PizzaRecipe {
TableRow( TableRow(
children: <TableCell>[ children: <TableCell>[
TableCell(child: Center(child: Text(recipeStep.name))), TableCell(child: Center(child: Text(recipeStep.name))),
TableCell(child: Center(child: Text(dateFormatter.format(dateTime.subtract(stepWaitDuration))))) TableCell(child: Center(child: Text(getDateFormat().format(dateTime.subtract(stepWaitDuration)))))
] ]
) )
); );

6
lib/pages/AddPizzaEventPage.dart
View file

@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:fluttericon/font_awesome5_icons.dart'; import 'package:fluttericon/font_awesome5_icons.dart';
import 'package:intl/intl.dart';
import 'package:pizzaplanner/entities/PizzaEvent.dart'; import 'package:pizzaplanner/entities/PizzaEvent.dart';
import 'package:pizzaplanner/entities/PizzaRecipe/PizzaRecipe.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/PizzaRecipe.dart';
import 'package:pizzaplanner/util.dart'; import 'package:pizzaplanner/util.dart';
@ -231,7 +230,6 @@ class ConfirmPizzaEventDialog extends StatefulWidget {
} }
class ConfirmPizzaEventState extends State<ConfirmPizzaEventDialog> { class ConfirmPizzaEventState extends State<ConfirmPizzaEventDialog> {
final DateFormat dateFormatter = DateFormat("yyyy-MM-dd H:mm");
late DateTime eventTime; late DateTime eventTime;
late final DateTime minTime; late final DateTime minTime;
@ -270,7 +268,7 @@ class ConfirmPizzaEventState extends State<ConfirmPizzaEventDialog> {
children: <Widget>[ children: <Widget>[
Icon(FontAwesome5.calendar_alt, color: Colors.white), Icon(FontAwesome5.calendar_alt, color: Colors.white),
SizedBox(width: 10), SizedBox(width: 10),
Text(dateFormatter.format(this.eventTime), style: TextStyle(color: Colors.white, fontSize: 25)), Text(getDateFormat().format(this.eventTime), style: TextStyle(color: Colors.white, fontSize: 25)),
] ]
), ),
onPressed: () { onPressed: () {
@ -281,7 +279,7 @@ class ConfirmPizzaEventState extends State<ConfirmPizzaEventDialog> {
maxTime: DateTime.now().add(Duration(days: 365*10)), maxTime: DateTime.now().add(Duration(days: 365*10)),
onConfirm: (newEventTime) { onConfirm: (newEventTime) {
setState((){ this.eventTime = newEventTime; }); setState((){ this.eventTime = newEventTime; });
print(dateFormatter.format(newEventTime)); print(getDateFormat().format(newEventTime));
} }
); );
} }

5
lib/util.dart
View file

@ -1,6 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/services.dart' show rootBundle; import 'package:flutter/services.dart' show rootBundle;
import 'package:intl/intl.dart';
import 'package:pizzaplanner/entities/PizzaRecipe/PizzaRecipe.dart'; import 'package:pizzaplanner/entities/PizzaRecipe/PizzaRecipe.dart';
Future<List<PizzaRecipe>> getRecipes() async { Future<List<PizzaRecipe>> getRecipes() async {
@ -26,3 +27,7 @@ extension StringExtensions on String {
return this[0].toUpperCase() + this.substring(1); return this[0].toUpperCase() + this.substring(1);
} }
} }
DateFormat getDateFormat(){
return DateFormat("yyyy-MM-dd H:mm");
}

3
lib/widgets/PizzaEventWidget.dart
View file

@ -3,7 +3,6 @@ import 'package:intl/intl.dart';
import 'package:pizzaplanner/entities/PizzaEvent.dart'; import 'package:pizzaplanner/entities/PizzaEvent.dart';
class PizzaEventWidget extends StatelessWidget { class PizzaEventWidget extends StatelessWidget {
final DateFormat dateFormatter = DateFormat("yyyy-MM-dd hh:mm");
final PizzaEvent pizzaEvent; final PizzaEvent pizzaEvent;
PizzaEventWidget(this.pizzaEvent); PizzaEventWidget(this.pizzaEvent);
@ -69,7 +68,7 @@ class PizzaEventWidget extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Text(dateFormatter.format(pizzaEvent.dateTime)), Text(util.get.format(pizzaEvent.dateTime)),
Text(pizzaEvent.recipe.name) Text(pizzaEvent.recipe.name)
], ],
), ),