From 1a50f2ca0c4e962e2335117178706b8fb5f94e6a Mon Sep 17 00:00:00 2001 From: broodjeaap89 Date: Thu, 8 Jul 2021 21:35:55 +0200 Subject: [PATCH] renamed 'planned pizza' to 'pizza event' everywhere --- lib/entities/PizzaEvent.dart | 7 +++ lib/entities/PlannedPizza.dart | 7 --- lib/main.dart | 12 ++-- ...dPizzaPage.dart => AddPizzaEventPage.dart} | 8 +-- lib/pages/PizzaEventsPage.dart | 57 +++++++++++++++++++ lib/pages/PlannedPizzasPage.dart | 57 ------------------- ...PizzaWidget.dart => PizzaEventWidget.dart} | 14 ++--- 7 files changed, 81 insertions(+), 81 deletions(-) create mode 100644 lib/entities/PizzaEvent.dart delete mode 100644 lib/entities/PlannedPizza.dart rename lib/pages/{AddPlannedPizzaPage.dart => AddPizzaEventPage.dart} (93%) create mode 100644 lib/pages/PizzaEventsPage.dart delete mode 100644 lib/pages/PlannedPizzasPage.dart rename lib/widgets/{PlannedPizzaWidget.dart => PizzaEventWidget.dart} (89%) diff --git a/lib/entities/PizzaEvent.dart b/lib/entities/PizzaEvent.dart new file mode 100644 index 0000000..e7d604b --- /dev/null +++ b/lib/entities/PizzaEvent.dart @@ -0,0 +1,7 @@ + +class PizzaEvent { + final String name; + final DateTime dateTime; + + PizzaEvent(this.name, this.dateTime); +} \ No newline at end of file diff --git a/lib/entities/PlannedPizza.dart b/lib/entities/PlannedPizza.dart deleted file mode 100644 index 27f9223..0000000 --- a/lib/entities/PlannedPizza.dart +++ /dev/null @@ -1,7 +0,0 @@ - -class PlannedPizza { - final String name; - final DateTime dateTime; - - PlannedPizza(this.name, this.dateTime); -} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 7da9457..e897d98 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:pizzaplanner/pages/AddPlannedPizzaPage.dart'; -import 'package:pizzaplanner/pages/PlannedPizzasPage.dart'; +import 'package:pizzaplanner/pages/AddPizzaEventPage.dart'; +import 'package:pizzaplanner/pages/PizzaEventsPage.dart'; void main() { runApp(PizzaPlanner()); @@ -12,7 +12,7 @@ class PizzaPlanner extends StatelessWidget { Widget build(BuildContext context) { return MaterialApp( title: "PizzaPlanner", - home: PlannedPizzasPage(), + home: PizzaEventsPage(), onGenerateRoute: RouteGenerator.generateRoute, ); } @@ -22,14 +22,14 @@ class RouteGenerator { static Route generateRoute(RouteSettings settings){ switch(settings.name){ case "/": { - return MaterialPageRoute(builder: (context) => PlannedPizzasPage()); + return MaterialPageRoute(builder: (context) => PizzaEventsPage()); } case "/add": { - return MaterialPageRoute(builder: (context) => AddPlannedPizzaPage()); + return MaterialPageRoute(builder: (context) => AddPizzaEventPage()); } default: { - return MaterialPageRoute(builder: (context) => PlannedPizzasPage()); + return MaterialPageRoute(builder: (context) => PizzaEventsPage()); } } } diff --git a/lib/pages/AddPlannedPizzaPage.dart b/lib/pages/AddPizzaEventPage.dart similarity index 93% rename from lib/pages/AddPlannedPizzaPage.dart rename to lib/pages/AddPizzaEventPage.dart index c7871d0..1a5fa5f 100644 --- a/lib/pages/AddPlannedPizzaPage.dart +++ b/lib/pages/AddPizzaEventPage.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:fluttericon/font_awesome5_icons.dart'; -class AddPlannedPizzaPage extends StatefulWidget { +class AddPizzaEventPage extends StatefulWidget { @override - AddPlannedPizzaPageState createState() => AddPlannedPizzaPageState(); + AddPizzaEventPageState createState() => AddPizzaEventPageState(); } -class AddPlannedPizzaPageState extends State { +class AddPizzaEventPageState extends State { String name = ""; String pizzaType = "Neapolitan"; int pizzaCount = 1; @@ -17,7 +17,7 @@ class AddPlannedPizzaPageState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text("Add Planned Pizza"), + title: Text("Add Pizza Event"), ), body: Container( padding: EdgeInsets.fromLTRB(40, 10, 40, 10), diff --git a/lib/pages/PizzaEventsPage.dart b/lib/pages/PizzaEventsPage.dart new file mode 100644 index 0000000..f0ca0ba --- /dev/null +++ b/lib/pages/PizzaEventsPage.dart @@ -0,0 +1,57 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:pizzaplanner/entities/PizzaEvent.dart'; +import 'package:pizzaplanner/widgets/PizzaEventWidget.dart'; + +class PizzaEventsPage extends StatefulWidget { + @override + PizzaEventsState createState() => PizzaEventsState(); +} + +class PizzaEventsState extends State { + List pizzaEvents = [ + PizzaEvent("Movie Night", DateTime(2021, 6, 30, 12, 8)), + PizzaEvent("Birthday Pizza", DateTime(2021, 7, 14, 18, 30)), + PizzaEvent("Something else", DateTime(2021, 9, 3, 15, 3)), + ]; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text("Pizza Events"), + ), + body: ListView.separated( + padding: const EdgeInsets.all(8), + itemCount: pizzaEvents.length, + itemBuilder: (BuildContext context, int i) => PizzaEventWidget(pizzaEvents[i]), + separatorBuilder: (BuildContext context, int i) => const Divider(), + ), + floatingActionButton: FloatingActionButton( + onPressed: () { + Navigator.pushNamed( + context, + "/add", + ); + }, + tooltip: "Add Pizza Plans", + child: Center( + child: Row( + children: [ + Icon(Icons.add), + Icon(Icons.local_pizza_rounded), + ] + ) + ) + ), + ); + } + + void addPizzaEvent(){ + this.setState(() { + pizzaEvents.add( + PizzaEvent("Added Pizza Party", DateTime(2022, 3, 23, 17, 45)) + ); + }); + } +} \ No newline at end of file diff --git a/lib/pages/PlannedPizzasPage.dart b/lib/pages/PlannedPizzasPage.dart deleted file mode 100644 index bab43a2..0000000 --- a/lib/pages/PlannedPizzasPage.dart +++ /dev/null @@ -1,57 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:pizzaplanner/entities/PlannedPizza.dart'; -import 'package:pizzaplanner/widgets/PlannedPizzaWidget.dart'; - -class PlannedPizzasPage extends StatefulWidget { - @override - PlannedPizzasState createState() => PlannedPizzasState(); -} - -class PlannedPizzasState extends State { - List plannedPizzas = [ - PlannedPizza("Movie Night", DateTime(2021, 6, 30, 12, 8)), - PlannedPizza("Birthday Pizza", DateTime(2021, 7, 14, 18, 30)), - PlannedPizza("Something else", DateTime(2021, 9, 3, 15, 3)), - ]; - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: Text("Planned Pizzas"), - ), - body: ListView.separated( - padding: const EdgeInsets.all(8), - itemCount: plannedPizzas.length, - itemBuilder: (BuildContext context, int i) => PlannedPizzaWidget(plannedPizzas[i]), - separatorBuilder: (BuildContext context, int i) => const Divider(), - ), - floatingActionButton: FloatingActionButton( - onPressed: () { - Navigator.pushNamed( - context, - "/add", - ); - }, - tooltip: "Add Pizza Plans", - child: Center( - child: Row( - children: [ - Icon(Icons.add), - Icon(Icons.local_pizza_rounded), - ] - ) - ) - ), - ); - } - - void addPlannedPizza(){ - this.setState(() { - plannedPizzas.add( - PlannedPizza("Added Pizza Party", DateTime(2022, 3, 23, 17, 45)) - ); - }); - } -} \ No newline at end of file diff --git a/lib/widgets/PlannedPizzaWidget.dart b/lib/widgets/PizzaEventWidget.dart similarity index 89% rename from lib/widgets/PlannedPizzaWidget.dart rename to lib/widgets/PizzaEventWidget.dart index c713554..90ea46e 100644 --- a/lib/widgets/PlannedPizzaWidget.dart +++ b/lib/widgets/PizzaEventWidget.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:pizzaplanner/entities/PlannedPizza.dart'; +import 'package:pizzaplanner/entities/PizzaEvent.dart'; -class PlannedPizzaWidget extends StatelessWidget { +class PizzaEventWidget extends StatelessWidget { final DateFormat dateFormatter = DateFormat("yyyy-MM-dd hh:mm"); - final PlannedPizza plannedPizza; + final PizzaEvent pizzaEvent; - PlannedPizzaWidget(this.plannedPizza); + PizzaEventWidget(this.pizzaEvent); @override Widget build(BuildContext context){ @@ -21,7 +21,7 @@ class PlannedPizzaWidget extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text(plannedPizza.name), + Text(pizzaEvent.name), Text(this.getTimeRemainingString()) ], ), @@ -66,7 +66,7 @@ class PlannedPizzaWidget extends StatelessWidget { ] ), ), - Text(dateFormatter.format(plannedPizza.dateTime)), + Text(dateFormatter.format(pizzaEvent.dateTime)), ] ) ) @@ -75,7 +75,7 @@ class PlannedPizzaWidget extends StatelessWidget { String getTimeRemainingString(){ DateTime now = DateTime.now(); - Duration duration = plannedPizza.dateTime.difference(now); + Duration duration = pizzaEvent.dateTime.difference(now); Duration absDuration = duration.abs(); String durationString = ""; if (absDuration.inHours <= 0 && absDuration.inMinutes > 0) {