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

Improved layout of month practice

Browse source
This commit is contained in:
BroodjeAap 2020-10-18 14:38:59 +02:00
parent b5267053c9
commit e23f1673b0
2 changed files with 93 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pages/practice/month/MonthPracticeAnswer.dart
View file

@ -1,5 +1,7 @@
import 'package:ohthatsa/util/Months.dart';
class MonthPracticeAnswer { class MonthPracticeAnswer {
final int month; final Month month;
final int answer; final int answer;
MonthPracticeAnswer(this.month, this.answer); MonthPracticeAnswer(this.month, this.answer);

190
lib/pages/practice/month/MonthPracticePage.dart
View file

@ -18,23 +18,31 @@ class _MonthPracticeState extends State<MonthPracticePage> {
int _correct = 0; int _correct = 0;
int _incorrect = 0; int _incorrect = 0;
static final _random = new Random(); static final _random = new Random();
String _month = Months.stringList[_random.nextInt(Months.length)]; Month _month = Months.getFromInt(_random.nextInt(Months.length));
List<MonthPracticeAnswer> answers = new List<MonthPracticeAnswer>(); List<MonthPracticeAnswer> answers = new List<MonthPracticeAnswer>();
Widget getAnswerRow(){ Widget getAnswerRow(){
List<Widget> answerBoxes = new List<Widget>(); List<Widget> answerBoxes = new List<Widget>();
double screenWidth = MediaQuery.of(context).size.width;
for(MonthPracticeAnswer answer in answers){ for(MonthPracticeAnswer answer in answers){
Color c = Colors.green; Color c = Colors.green;
if(answer.month != answer.answer){ if(answer.month.value != answer.answer){
c = Colors.red; c = Colors.red;
} }
answerBoxes.add( answerBoxes.add(
new SizedBox( new Expanded(
width: screenWidth / _startCount, child: new Container(
height: 100, height: 10,
child: new DecoratedBox( color: c
decoration: BoxDecoration(color: c) )
)
);
}
for(int i in Iterable.generate(_startCount - _count)) {
answerBoxes.add(
new Expanded(
child: new Container(
height: 10,
color: Colors.blue,
) )
) )
); );
@ -42,6 +50,42 @@ class _MonthPracticeState extends State<MonthPracticePage> {
return new Row(children: answerBoxes); return new Row(children: answerBoxes);
} }
Widget getButtons(){
List<Widget> buttons = new List<Widget>();
for(int i in [1,2,3,4,5,6]){
buttons.add(
new FlatButton(
onPressed: () {
checkMonth(i);
},
color: Colors.blue,
textColor: Colors.white,
child: new Text(i.toString())
)
);
}
buttons.add(Container());
buttons.add(new FlatButton(
onPressed: () {
checkMonth(0);
},
color: Colors.blue,
textColor: Colors.white,
child: new Text("0")
)
);
buttons.add(Container());
return new GridView.count(
primary: false,
crossAxisCount: 3,
padding: EdgeInsets.fromLTRB(0, 20, 0, 20),
mainAxisSpacing: 10,
crossAxisSpacing: 10,
shrinkWrap: true,
children: buttons
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
MonthPracticeSetup setup = ModalRoute.of(context).settings.arguments; MonthPracticeSetup setup = ModalRoute.of(context).settings.arguments;
@ -52,119 +96,65 @@ class _MonthPracticeState extends State<MonthPracticePage> {
title: Text("Practicing months"), title: Text("Practicing months"),
), ),
body: Center( body: Center(
child: new Column( child: new Container(
children: <Widget>[ padding: EdgeInsets.all(20),
new Container( child: new Column(
padding: EdgeInsets.all(20),
child: new Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
new Text(
"Correct: " + _correct.toString()
),
new Text(
(_startCount - _count).toString() + " left"
),
new Text(
"Incorrect: " + _incorrect.toString()
)
],
)
),
new Text(
_month
),
new GridView.count(
primary: false,
crossAxisCount: 3,
padding: EdgeInsets.all(50),
mainAxisSpacing: 10,
crossAxisSpacing: 10,
shrinkWrap: true,
children: <Widget>[ children: <Widget>[
new FlatButton( new Row(
onPressed: () { mainAxisAlignment: MainAxisAlignment.spaceBetween,
checkMonth(1); children: <Widget>[
}, new Text(
color: Colors.blue, "Correct: " + _correct.toString(),
textColor: Colors.white, style: TextStyle(
child: new Text("1") fontSize: 20,
)
),
new Text(
(_startCount - _count).toString() + " left",
style: TextStyle(
fontSize: 20,
)
),
new Text(
"Incorrect: " + _incorrect.toString(),
style: TextStyle(
fontSize: 20,
)
)
],
), ),
new FlatButton( new Text(
onPressed: () { _month.string,
checkMonth(2); style: TextStyle(
}, fontSize: 30,
color: Colors.blue, )
textColor: Colors.white,
child: new Text("2")
), ),
new FlatButton( getButtons(),
onPressed: () { new Align(
checkMonth(3); alignment: FractionalOffset.bottomCenter,
}, child: getAnswerRow()
color: Colors.blue,
textColor: Colors.white,
child: new Text("3")
),
new FlatButton(
onPressed: () {
checkMonth(4);
},
color: Colors.blue,
textColor: Colors.white,
child: new Text("4")
),
new FlatButton(
onPressed: () {
checkMonth(5);
},
color: Colors.blue,
textColor: Colors.white,
child: new Text("5")
),
new FlatButton(
onPressed: () {
checkMonth(6);
},
color: Colors.blue,
textColor: Colors.white,
child: new Text("6")
),
new FlatButton(
onPressed: () {
checkMonth(0);
},
color: Colors.blue,
textColor: Colors.white,
child: new Text("0")
) )
] ]
), )
new Align(
alignment: FractionalOffset.bottomCenter,
child: getAnswerRow()
)
],
) )
) )
); );
} }
void checkMonth(int answer){ void checkMonth(int answer){
int month = DayCalculator.getMonthValueByString(_month); if(answer == _month.value){
if(answer == month){
_correct += 1; _correct += 1;
} else { } else {
_incorrect += 1; _incorrect += 1;
} }
_count += 1; _count += 1;
answers.add(new MonthPracticeAnswer(month, answer)); answers.add(new MonthPracticeAnswer(_month, answer));
if((_startCount - _count) == 0) { if((_startCount - _count) == 0) {
Navigator.pop(context); Navigator.pop(context);
return; return;
} }
setState(() => { setState(() => {
_month = Months.stringList[_random.nextInt(Months.length)] _month = Months.getFromInt(_random.nextInt(Months.length))
}); });
} }
} }