From a9bbc19f5089d1205e301c9dc9e8bb6a88f2765c Mon Sep 17 00:00:00 2001 From: BroodjeAap Date: Sun, 4 Oct 2020 18:48:37 +0200 Subject: [PATCH] Moved files around --- lib/main.dart | 8 ++++---- lib/{ => pages}/MonthValuesPage.dart | 2 +- lib/{ => pages}/YearsPage.dart | 4 ++-- lib/{ => pages/practice/month}/MonthPracticePage.dart | 4 ++-- .../practice/month}/MonthPracticeSetupPage.dart | 2 +- lib/{ => util}/DayCalculator.dart | 0 test/widget_test.dart | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename lib/{ => pages}/MonthValuesPage.dart (97%) rename lib/{ => pages}/YearsPage.dart (92%) rename lib/{ => pages/practice/month}/MonthPracticePage.dart (97%) rename lib/{ => pages/practice/month}/MonthPracticeSetupPage.dart (97%) rename lib/{ => util}/DayCalculator.dart (100%) diff --git a/lib/main.dart b/lib/main.dart index 227dc15..c89affc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:ohthatsa/MonthPracticeSetupPage.dart'; -import 'package:ohthatsa/YearsPage.dart'; +import 'file:///D:/dev/projects/ohthatsa/lib/pages/practice/MonthPracticeSetupPage.dart'; +import 'file:///D:/dev/projects/ohthatsa/lib/pages/YearsPage.dart'; -import 'MonthPracticePage.dart'; -import 'MonthValuesPage.dart'; +import 'pages/practice/month/MonthPracticePage.dart'; +import 'pages/MonthValuesPage.dart'; void main() { runApp(OhThatsA()); diff --git a/lib/MonthValuesPage.dart b/lib/pages/MonthValuesPage.dart similarity index 97% rename from lib/MonthValuesPage.dart rename to lib/pages/MonthValuesPage.dart index a2c32d4..3391c05 100644 --- a/lib/MonthValuesPage.dart +++ b/lib/pages/MonthValuesPage.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'AppDrawer.dart'; +import '../AppDrawer.dart'; class MonthValuesPage extends StatelessWidget { final Map monthValues = { diff --git a/lib/YearsPage.dart b/lib/pages/YearsPage.dart similarity index 92% rename from lib/YearsPage.dart rename to lib/pages/YearsPage.dart index 9e72e60..b975b2e 100644 --- a/lib/YearsPage.dart +++ b/lib/pages/YearsPage.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:numberpicker/numberpicker.dart'; -import 'package:ohthatsa/DayCalculator.dart'; +import 'file:///D:/dev/projects/ohthatsa/lib/util/DayCalculator.dart'; -import 'AppDrawer.dart'; +import '../AppDrawer.dart'; class YearsPage extends StatefulWidget { @override diff --git a/lib/MonthPracticePage.dart b/lib/pages/practice/month/MonthPracticePage.dart similarity index 97% rename from lib/MonthPracticePage.dart rename to lib/pages/practice/month/MonthPracticePage.dart index c4deb5c..5934f59 100644 --- a/lib/MonthPracticePage.dart +++ b/lib/pages/practice/month/MonthPracticePage.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:numberpicker/numberpicker.dart'; -import 'package:ohthatsa/DayCalculator.dart'; -import 'AppDrawer.dart'; +import 'file:///D:/dev/projects/ohthatsa/lib/util/DayCalculator.dart'; +import '../../../AppDrawer.dart'; import "dart:math"; class MonthPracticePage extends StatefulWidget { diff --git a/lib/MonthPracticeSetupPage.dart b/lib/pages/practice/month/MonthPracticeSetupPage.dart similarity index 97% rename from lib/MonthPracticeSetupPage.dart rename to lib/pages/practice/month/MonthPracticeSetupPage.dart index 6a9a3d1..315fe22 100644 --- a/lib/MonthPracticeSetupPage.dart +++ b/lib/pages/practice/month/MonthPracticeSetupPage.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:numberpicker/numberpicker.dart'; -import 'AppDrawer.dart'; +import '../../../AppDrawer.dart'; class MonthPracticeSetupPage extends StatefulWidget { @override diff --git a/lib/DayCalculator.dart b/lib/util/DayCalculator.dart similarity index 100% rename from lib/DayCalculator.dart rename to lib/util/DayCalculator.dart diff --git a/test/widget_test.dart b/test/widget_test.dart index 737e598..057eb1f 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -1,5 +1,5 @@ import 'package:test/test.dart'; -import 'package:ohthatsa/DayCalculator.dart'; +import 'file:///D:/dev/projects/ohthatsa/lib/util/DayCalculator.dart'; void main() { group("DayCalculator getYearValue() ", () {