diff --git a/lib/main.dart b/lib/main.dart index 9da142a..e1ed168 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,7 @@ import 'package:ohthatsa/pages/YearsPage.dart'; import 'package:ohthatsa/pages/practice/PracticeSetup.dart'; import 'package:ohthatsa/pages/practice/PracticeSetupPage.dart'; -import 'package:ohthatsa/pages/practice/month/MonthPracticePage.dart'; +import 'file:///D:/dev/projects/ohthatsa/lib/pages/practice/PracticePage.dart'; import 'package:ohthatsa/pages/MonthValuesPage.dart'; void main() { @@ -34,7 +34,7 @@ class RouteGenerator { return MaterialPageRoute(builder: (context) => PracticeSetupPage()); } case "/practice/month/practice": { - return MaterialPageRoute(builder: (context) => MonthPracticePage(settings.arguments)); + return MaterialPageRoute(builder: (context) => PracticePage(settings.arguments)); } default: { return MaterialPageRoute(builder: (context) => YearsPage()); diff --git a/lib/pages/practice/month/MonthPracticePage.dart b/lib/pages/practice/PracticePage.dart similarity index 93% rename from lib/pages/practice/month/MonthPracticePage.dart rename to lib/pages/practice/PracticePage.dart index feb4e3b..b867626 100644 --- a/lib/pages/practice/month/MonthPracticePage.dart +++ b/lib/pages/practice/PracticePage.dart @@ -5,18 +5,18 @@ import 'package:ohthatsa/pages/practice/PracticeThingMonth.dart'; import 'package:ohthatsa/AppDrawer.dart'; import 'package:ohthatsa/util/Extensions.dart'; -import 'MonthPracticeAnswer.dart'; +import 'month/MonthPracticeAnswer.dart'; -class MonthPracticePage extends StatefulWidget { +class PracticePage extends StatefulWidget { final PracticeSetup practiceSetup; - MonthPracticePage( + PracticePage( this.practiceSetup ); @override - _MonthPracticeState createState() => _MonthPracticeState(practiceSetup); + _PracticeState createState() => _PracticeState(practiceSetup); } -class _MonthPracticeState extends State { +class _PracticeState extends State { int _startCount = 0; bool _showCorrect = true; PracticeThing practiceThing; @@ -25,7 +25,7 @@ class _MonthPracticeState extends State { int _correct = 0; int _incorrect = 0; - _MonthPracticeState(PracticeSetup practiceSetup){ + _PracticeState(PracticeSetup practiceSetup){ this._startCount = practiceSetup.count; this._showCorrect = practiceSetup.showCorrect; this.practiceThing = PracticeThingMonth(); @@ -52,7 +52,7 @@ class _MonthPracticeState extends State { buttons.add( FlatButton( onPressed: () { - checkMonth(i); + checkAnswer(i); }, color: Colors.blue, textColor: Colors.white, @@ -121,7 +121,7 @@ class _MonthPracticeState extends State { return Scaffold( drawer: AppDrawer(), appBar: AppBar( - title: Text("Practicing months"), + title: practiceThing.getAppBarTitleText(), ), body: Center( child: Container( @@ -176,7 +176,7 @@ class _MonthPracticeState extends State { ); } - void checkMonth(int answer){ + void checkAnswer(int answer){ if(practiceThing.answer(answer)){ _correct += 1; } else { diff --git a/lib/pages/practice/PracticeThing.dart b/lib/pages/practice/PracticeThing.dart index 0b2833d..ab298d9 100644 --- a/lib/pages/practice/PracticeThing.dart +++ b/lib/pages/practice/PracticeThing.dart @@ -4,6 +4,7 @@ abstract class PracticeThing { bool answer(int answer); void next(); List getBoolAnswers(); + Text getAppBarTitleText(); Text getCurrentQuestionText(); Text getLastAnswerText(bool showCorrect); Text getSecondLastAnswerText(bool showCorrect); diff --git a/lib/pages/practice/PracticeThingMonth.dart b/lib/pages/practice/PracticeThingMonth.dart index d8d0d73..1a93442 100644 --- a/lib/pages/practice/PracticeThingMonth.dart +++ b/lib/pages/practice/PracticeThingMonth.dart @@ -28,6 +28,10 @@ class PracticeThingMonth extends PracticeThing { return answers.map((answer) => answer.month.value == answer.answer).toList(); } + Text getAppBarTitleText(){ + return Text("Practicing Months"); + } + Text getCurrentQuestionText(){ return Text( current.toString(),