From b5267053c9d7b42cbeefa106a31c26c17b13258e Mon Sep 17 00:00:00 2001 From: BroodjeAap Date: Sat, 17 Oct 2020 17:31:17 +0200 Subject: [PATCH] Updated MonthPracticePage to use Months util --- .../practice/month/MonthPracticePage.dart | 19 +++---------------- lib/util/Months.dart | 2 ++ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/lib/pages/practice/month/MonthPracticePage.dart b/lib/pages/practice/month/MonthPracticePage.dart index 4ec6c89..7489df7 100644 --- a/lib/pages/practice/month/MonthPracticePage.dart +++ b/lib/pages/practice/month/MonthPracticePage.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:ohthatsa/pages/practice/month/MonthPracticeSetup.dart'; import 'package:ohthatsa/util/DayCalculator.dart'; import 'package:ohthatsa/AppDrawer.dart'; +import 'package:ohthatsa/util/Months.dart'; import "dart:math"; import 'MonthPracticeAnswer.dart'; @@ -17,21 +18,7 @@ class _MonthPracticeState extends State { int _correct = 0; int _incorrect = 0; static final _random = new Random(); - static List _months = [ - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December" - ]; - String _month = _months[_random.nextInt(_months.length)]; + String _month = Months.stringList[_random.nextInt(Months.length)]; List answers = new List(); Widget getAnswerRow(){ @@ -177,7 +164,7 @@ class _MonthPracticeState extends State { return; } setState(() => { - _month = _months[_random.nextInt(_months.length)] + _month = Months.stringList[_random.nextInt(Months.length)] }); } } \ No newline at end of file diff --git a/lib/util/Months.dart b/lib/util/Months.dart index e0d3860..5e5d4c7 100644 --- a/lib/util/Months.dart +++ b/lib/util/Months.dart @@ -12,6 +12,8 @@ class Months { static final Month november = new Month("november", 10, 3); static final Month december = new Month("december", 11, 5); + static final int length = 12; + static final List list = List.unmodifiable([ january, february,