diff --git a/lib/models/fruit_model.dart b/lib/models/fruit_model.dart new file mode 100644 index 0000000..39fe9c7 --- /dev/null +++ b/lib/models/fruit_model.dart @@ -0,0 +1,15 @@ +import 'package:flutter/material.dart'; + +class Fruit { + final String name; + final String svgAsset; + final bool isfruit; + final Color backgroundColor; + + Fruit({ + required this.name, + required this.isfruit, + required this.svgAsset, + required this.backgroundColor, + }); +} diff --git a/lib/models/questions/animal_question.dart b/lib/models/questions/animal_question.dart new file mode 100644 index 0000000..1126518 --- /dev/null +++ b/lib/models/questions/animal_question.dart @@ -0,0 +1,11 @@ +class AnimalQuestion { + final String imageAsset; + final List options; + final String correctAnswer; + + AnimalQuestion({ + required this.imageAsset, + required this.options, + required this.correctAnswer, + }); +} diff --git a/lib/models/questions/bird_question.dart b/lib/models/questions/bird_question.dart new file mode 100644 index 0000000..d0a099c --- /dev/null +++ b/lib/models/questions/bird_question.dart @@ -0,0 +1,11 @@ +class BirdQuestion { + final String imageAsset; + final List options; + final String correctAnswer; + + BirdQuestion({ + required this.imageAsset, + required this.options, + required this.correctAnswer, + }); +} diff --git a/lib/models/questions/flower_question.dart b/lib/models/questions/flower_question.dart new file mode 100644 index 0000000..2f515d2 --- /dev/null +++ b/lib/models/questions/flower_question.dart @@ -0,0 +1,11 @@ +class FlowerQuestion { + final String imageAsset; + final List options; + final String correctAnswer; + + FlowerQuestion({ + required this.imageAsset, + required this.options, + required this.correctAnswer, + }); +} diff --git a/lib/models/questions/occupation_question.dart b/lib/models/questions/occupation_question.dart new file mode 100644 index 0000000..99fb457 --- /dev/null +++ b/lib/models/questions/occupation_question.dart @@ -0,0 +1,11 @@ +class OccupationQuestion { + final String imageAsset; + final List options; + final String correctAnswer; + + OccupationQuestion({ + required this.imageAsset, + required this.options, + required this.correctAnswer, + }); +} diff --git a/lib/models/questions/part_question.dart b/lib/models/questions/part_question.dart new file mode 100644 index 0000000..3d9a83a --- /dev/null +++ b/lib/models/questions/part_question.dart @@ -0,0 +1,11 @@ +class PartQuestion { + final String imageAsset; + final List options; + final String correctAnswer; + + PartQuestion({ + required this.imageAsset, + required this.options, + required this.correctAnswer, + }); +} diff --git a/lib/models/questions/planet_question.dart b/lib/models/questions/planet_question.dart new file mode 100644 index 0000000..9ccabca --- /dev/null +++ b/lib/models/questions/planet_question.dart @@ -0,0 +1,11 @@ +class PlanetQuestion { + final String imageAsset; + final List options; + final String correctAnswer; + + PlanetQuestion({ + required this.imageAsset, + required this.options, + required this.correctAnswer, + }); +} diff --git a/lib/models/questions/question.dart b/lib/models/questions/question.dart new file mode 100644 index 0000000..1818fa5 --- /dev/null +++ b/lib/models/questions/question.dart @@ -0,0 +1,13 @@ +class Questions { + String question; + List options; + String? image; + int answer; + + Questions({ + required this.question, + required this.options, + required this.answer, + this.image, + }); +} diff --git a/lib/pages/explore/quiz.dart b/lib/pages/explore/quiz.dart index 9e4378d..8cd1293 100644 --- a/lib/pages/explore/quiz.dart +++ b/lib/pages/explore/quiz.dart @@ -11,21 +11,6 @@ class Quiz extends StatefulWidget { @override State createState() => _QuizState(); } - -class Questions { - String question; - List options; - String? image; - int answer; - - Questions({ - required this.question, - required this.options, - required this.answer, - this.image, - }); -} - class _QuizState extends State { int _score = 0; int SelectedIndex = -1; diff --git a/lib/pages/fruits.dart b/lib/pages/fruits.dart index 5e5e6e6..a5033ae 100644 --- a/lib/pages/fruits.dart +++ b/lib/pages/fruits.dart @@ -9,20 +9,6 @@ import 'package:learn/utils/functions.dart'; import '../utils/const_dimensions.dart'; -class Fruit { - final String name; - final String svgAsset; - final bool isfruit; - final Color backgroundColor; - - Fruit({ - required this.name, - required this.isfruit, - required this.svgAsset, - required this.backgroundColor, - }); -} - class FruitsPage extends StatefulWidget { FruitsPage({Key? key}) : super(key: key); diff --git a/lib/pages/modules/animals_test.dart b/lib/pages/modules/animals_test.dart index 2bc5200..7f3c3ec 100644 --- a/lib/pages/modules/animals_test.dart +++ b/lib/pages/modules/animals_test.dart @@ -2,18 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - -class AnimalQuestion { - final String imageAsset; - final List options; - final String correctAnswer; - - AnimalQuestion({ - required this.imageAsset, - required this.options, - required this.correctAnswer, - }); -} +import 'package:learn/models/questions/animal_question.dart'; class AnimalsTestPage extends StatefulWidget { const AnimalsTestPage({Key? key}) : super(key: key); diff --git a/lib/pages/modules/birds_test.dart b/lib/pages/modules/birds_test.dart index ec40af0..3a5b5cc 100644 --- a/lib/pages/modules/birds_test.dart +++ b/lib/pages/modules/birds_test.dart @@ -2,18 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - -class BirdQuestion { - final String imageAsset; - final List options; - final String correctAnswer; - - BirdQuestion({ - required this.imageAsset, - required this.options, - required this.correctAnswer, - }); -} +import 'package:learn/models/questions/bird_question.dart'; class BirdsTestPage extends StatefulWidget { const BirdsTestPage({Key? key}) : super(key: key); diff --git a/lib/pages/modules/flowers_test.dart b/lib/pages/modules/flowers_test.dart index d2f49aa..df5d81c 100644 --- a/lib/pages/modules/flowers_test.dart +++ b/lib/pages/modules/flowers_test.dart @@ -2,18 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - -class FlowerQuestion { - final String imageAsset; - final List options; - final String correctAnswer; - - FlowerQuestion({ - required this.imageAsset, - required this.options, - required this.correctAnswer, - }); -} +import 'package:learn/models/questions/flower_question.dart'; class FlowersTestPage extends StatefulWidget { const FlowersTestPage({Key? key}) : super(key: key); diff --git a/lib/pages/modules/occupations_test.dart b/lib/pages/modules/occupations_test.dart index 04a1b41..300649d 100644 --- a/lib/pages/modules/occupations_test.dart +++ b/lib/pages/modules/occupations_test.dart @@ -2,18 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - -class OccupationQuestion { - final String imageAsset; - final List options; - final String correctAnswer; - - OccupationQuestion({ - required this.imageAsset, - required this.options, - required this.correctAnswer, - }); -} +import 'package:learn/models/questions/occupation_question.dart'; class OccupationsTestPage extends StatefulWidget { const OccupationsTestPage({Key? key}) : super(key: key); diff --git a/lib/pages/modules/parts_test.dart b/lib/pages/modules/parts_test.dart index a59824c..870dcba 100644 --- a/lib/pages/modules/parts_test.dart +++ b/lib/pages/modules/parts_test.dart @@ -2,18 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - -class PartQuestion { - final String imageAsset; - final List options; - final String correctAnswer; - - PartQuestion({ - required this.imageAsset, - required this.options, - required this.correctAnswer, - }); -} +import 'package:learn/models/questions/part_question.dart'; class PartsTestPage extends StatefulWidget { const PartsTestPage({Key? key}) : super(key: key); diff --git a/lib/pages/modules/planets_test.dart b/lib/pages/modules/planets_test.dart index f726ed4..f249264 100644 --- a/lib/pages/modules/planets_test.dart +++ b/lib/pages/modules/planets_test.dart @@ -2,18 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; - -class PlanetQuestion { - final String imageAsset; - final List options; - final String correctAnswer; - - PlanetQuestion({ - required this.imageAsset, - required this.options, - required this.correctAnswer, - }); -} +import 'package:learn/models/questions/planet_question.dart'; class PlanetsTestPage extends StatefulWidget { const PlanetsTestPage({Key? key}) : super(key: key); diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart index 9f0eb64..8912405 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -2,8 +2,10 @@ import 'package:learn/models/animal_model.dart'; import 'package:learn/models/bird_model.dart'; +import 'package:learn/models/fruit_model.dart'; import 'package:learn/models/itemdata_model.dart'; import 'package:learn/models/occupation_model.dart'; +import 'package:learn/models/questions/question.dart'; import 'package:learn/models/season_model.dart'; // ignore: unused_import import 'package:learn/models/number_model.dart';