Skip to content

Commit

Permalink
streamlining
Browse files Browse the repository at this point in the history
deleted and modified code for efficiency
  • Loading branch information
Wsutton424 committed Apr 24, 2023
1 parent fd04a5f commit 598ba45
Show file tree
Hide file tree
Showing 38 changed files with 228 additions and 279 deletions.
1 change: 0 additions & 1 deletion app/integration_test/Future_Questions_test.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/pages/result_page.dart';

Expand Down
1 change: 0 additions & 1 deletion app/integration_test/LearnScreen_test.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/LearnScreen.dart';

Expand Down
2 changes: 0 additions & 2 deletions app/integration_test/Log_in_Page_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/loginPage.dart';
import 'package:pohnpeian_language_app/screens/pages/result_page.dart';

void main() {
Expand Down
1 change: 0 additions & 1 deletion app/integration_test/Questions2_test.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/pages/result_page.dart';

Expand Down
1 change: 0 additions & 1 deletion app/integration_test/Questions3_test.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/pages/result_page.dart';

Expand Down
1 change: 0 additions & 1 deletion app/integration_test/Questions4_test.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/pages/result_page.dart';

Expand Down
1 change: 0 additions & 1 deletion app/integration_test/Questions5_test.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/pages/result_page.dart';

Expand Down
2 changes: 0 additions & 2 deletions app/integration_test/Result_Page_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:pohnpeian_language_app/screens/loginPage.dart';
import 'package:pohnpeian_language_app/screens/pages/result_page.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion app/lib/data/catergories.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ final categories = <Category>[
Category(
questions: getQuestions4(),
categoryName: 'Objects',
backgroundColor: Color.fromARGB(255, 216, 98, 137),
backgroundColor: const Color.fromARGB(255, 216, 98, 137),
icon: FontAwesomeIcons.book,
description: 'Test your knowledge on random objects',
),
Expand Down
56 changes: 28 additions & 28 deletions app/lib/data/futurequestions1.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,70 +10,70 @@ List<Question> getQuestions() {
list.add(Question(
text: 'Which of the following is "Kalahngan" ?',
options: [
Option(code: 'A', text: 'Please', isCorrect: false),
Option(code: 'B', text: 'Thank you (formal)', isCorrect: true),
Option(code: 'C', text: 'Help', isCorrect: false),
Option(code: 'D', text: 'Leave', isCorrect: false),
const Option(code: 'A', text: 'Please', isCorrect: false),
const Option(code: 'B', text: 'Thank you (formal)', isCorrect: true),
const Option(code: 'C', text: 'Help', isCorrect: false),
const Option(code: 'D', text: 'Leave', isCorrect: false),
],
solution: 'The correct answer is "Thank You" ',
));
list.add(Question(
text: 'Which of the following is E-yung ?',
options: [
Option(code: 'A', text: 'Dog', isCorrect: false),
Option(code: 'B', text: 'Go', isCorrect: false),
Option(code: 'C', text: 'Beach', isCorrect: false),
Option(code: 'D', text: 'Thanks" (informal)', isCorrect: true),
const Option(code: 'A', text: 'Dog', isCorrect: false),
const Option(code: 'B', text: 'Go', isCorrect: false),
const Option(code: 'C', text: 'Beach', isCorrect: false),
const Option(code: 'D', text: 'Thanks" (informal)', isCorrect: true),
],
solution: 'The correct answer is Thanks (informal)',
));
list.add(Question(
text: 'Which of the following is "Kaselehlie"?',
options: [
Option(code: 'A', text: 'Kidi', isCorrect: false),
Option(code: 'B', text: 'Malek', isCorrect: false),
Option(code: 'C', text: 'Waterfall', isCorrect: false),
Option(code: 'D', text: 'Hello', isCorrect: true),
const Option(code: 'A', text: 'Kidi', isCorrect: false),
const Option(code: 'B', text: 'Malek', isCorrect: false),
const Option(code: 'C', text: 'Waterfall', isCorrect: false),
const Option(code: 'D', text: 'Hello', isCorrect: true),
],
solution: 'The correct answer is Hello',
));
list.add(Question(
text: 'Which of the following is "La iromw" ?',
options: [
Option(code: 'A', text: "How are you?", isCorrect: true),
Option(code: 'B', text: 'Where are you going?', isCorrect: false),
Option(code: 'C', text: "How old are you?", isCorrect: false),
Option(code: 'D', text: "How much?", isCorrect: false),
const Option(code: 'A', text: "How are you?", isCorrect: true),
const Option(code: 'B', text: 'Where are you going?', isCorrect: false),
const Option(code: 'C', text: "How old are you?", isCorrect: false),
const Option(code: 'D', text: "How much?", isCorrect: false),
],
solution: 'The correct answer is "How are you?"',
));
list.add(Question(
text: 'Which of the following is Menseng mwahu?',
options: [
Option(code: 'A', text: 'Good day', isCorrect: false),
Option(code: 'B', text: 'Good night', isCorrect: false),
Option(code: 'C', text: 'Good morning', isCorrect: true),
Option(code: 'D', text: 'Good afternoon', isCorrect: false),
const Option(code: 'A', text: 'Good day', isCorrect: false),
const Option(code: 'B', text: 'Good night', isCorrect: false),
const Option(code: 'C', text: 'Good morning', isCorrect: true),
const Option(code: 'D', text: 'Good afternoon', isCorrect: false),
],
solution: 'The correct answer is "Good morning"',
));
list.add(Question(
text: 'Which of the following is Menseng mwahu?',
options: [
Option(code: 'A', text: 'Good day', isCorrect: false),
Option(code: 'B', text: 'Good night', isCorrect: false),
Option(code: 'C', text: 'Good morning', isCorrect: true),
Option(code: 'D', text: 'Good afternoon', isCorrect: false),
const Option(code: 'A', text: 'Good day', isCorrect: false),
const Option(code: 'B', text: 'Good night', isCorrect: false),
const Option(code: 'C', text: 'Good morning', isCorrect: true),
const Option(code: 'D', text: 'Good afternoon', isCorrect: false),
],
solution: 'The correct answer is "Good day"',
));
list.add(Question(
text: 'Which of the following is "Pwohng mwahu"?',
options: [
Option(code: 'A', text: 'Good afternoon', isCorrect: false),
Option(code: 'B', text: 'Good morning', isCorrect: false),
Option(code: 'C', text: 'Good day', isCorrect: false),
Option(code: 'D', text: 'Good night', isCorrect: true),
const Option(code: 'A', text: 'Good afternoon', isCorrect: false),
const Option(code: 'B', text: 'Good morning', isCorrect: false),
const Option(code: 'C', text: 'Good day', isCorrect: false),
const Option(code: 'D', text: 'Good night', isCorrect: true),
],
solution: 'The correct answer is "Good night "',
));
Expand Down
56 changes: 28 additions & 28 deletions app/lib/data/questions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,70 @@ List<Question> getQuestions() {
list.add(Question(
text: 'Which of the following is "Thank you" (formal)?',
options: [
Option(code: 'A', text: 'Ehng', isCorrect: false),
Option(code: 'B', text: 'Kalahngan', isCorrect: true),
Option(code: 'C', text: 'Mwenge', isCorrect: false),
Option(code: 'D', text: 'Malek', isCorrect: false),
const Option(code: 'A', text: 'Ehng', isCorrect: false),
const Option(code: 'B', text: 'Kalahngan', isCorrect: true),
const Option(code: 'C', text: 'Mwenge', isCorrect: false),
const Option(code: 'D', text: 'Malek', isCorrect: false),
],
solution: 'The correct answer is "Kalahngan" ',
));
list.add(Question(
text: 'Which of the following is "Thanks" (informal)?',
options: [
Option(code: 'A', text: 'Kahlail', isCorrect: false),
Option(code: 'B', text: 'Mwahu', isCorrect: false),
Option(code: 'C', text: 'Menlau', isCorrect: false),
Option(code: 'D', text: 'E-yung', isCorrect: true),
const Option(code: 'A', text: 'Kahlail', isCorrect: false),
const Option(code: 'B', text: 'Mwahu', isCorrect: false),
const Option(code: 'C', text: 'Menlau', isCorrect: false),
const Option(code: 'D', text: 'E-yung', isCorrect: true),
],
solution: 'The correct answer is "E-yung" ',
));
list.add(Question(
text: 'Which of the following is "Hello"?',
options: [
Option(code: 'A', text: 'Kidi', isCorrect: false),
Option(code: 'B', text: 'Malek', isCorrect: false),
Option(code: 'C', text: 'A kis', isCorrect: false),
Option(code: 'D', text: 'Kaselehlie', isCorrect: true),
const Option(code: 'A', text: 'Kidi', isCorrect: false),
const Option(code: 'B', text: 'Malek', isCorrect: false),
const Option(code: 'C', text: 'A kis', isCorrect: false),
const Option(code: 'D', text: 'Kaselehlie', isCorrect: true),
],
solution: 'The correct answer is Kaselehlie',
));
list.add(Question(
text: 'Which of the following is "How are you?" ?',
options: [
Option(code: 'A', text: 'La iromw', isCorrect: true),
Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
Option(code: 'C', text: "A kis", isCorrect: false),
Option(code: 'D', text: "E-yung", isCorrect: false),
const Option(code: 'A', text: 'La iromw', isCorrect: true),
const Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
const Option(code: 'C', text: "A kis", isCorrect: false),
const Option(code: 'D', text: "E-yung", isCorrect: false),
],
solution: 'The correct answer is La iromw',
));
list.add(Question(
text: 'Which of the following is "Good morning"?',
options: [
Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
Option(code: 'C', text: 'Menseng mwahu', isCorrect: true),
Option(code: 'D', text: 'Souwas mwahu', isCorrect: false),
const Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
const Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
const Option(code: 'C', text: 'Menseng mwahu', isCorrect: true),
const Option(code: 'D', text: 'Souwas mwahu', isCorrect: false),
],
solution: 'The correct answer is "Menseng mwahu"',
));
list.add(Question(
text: ' Which of the following is "Good afternoon"?',
options: [
Option(code: 'A', text: 'Menseng mwahu', isCorrect: false),
Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
Option(code: 'C', text: 'Souwas mwahu', isCorrect: true),
Option(code: 'D', text: 'Soutik mwahu', isCorrect: false),
const Option(code: 'A', text: 'Menseng mwahu', isCorrect: false),
const Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
const Option(code: 'C', text: 'Souwas mwahu', isCorrect: true),
const Option(code: 'D', text: 'Soutik mwahu', isCorrect: false),
],
solution: 'The correct answer is "Souwas mwahu"',
));
list.add(Question(
text: 'It\'s getting dark. It was nice meeting you. _______.',
options: [
Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
Option(code: 'B', text: 'Menseng mwahu', isCorrect: false),
Option(code: 'C', text: 'Souwas mwahu', isCorrect: false),
Option(code: 'D', text: 'Pwohng mwahu', isCorrect: true),
const Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
const Option(code: 'B', text: 'Menseng mwahu', isCorrect: false),
const Option(code: 'C', text: 'Souwas mwahu', isCorrect: false),
const Option(code: 'D', text: 'Pwohng mwahu', isCorrect: true),
],
solution: 'The correct answer is "Pwohng mwahu"',
));
Expand Down
56 changes: 28 additions & 28 deletions app/lib/data/questions2.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,70 @@ List<Question> getQuestions2() {
list.add(Question(
text: 'Which of the following is "Mother"?',
options: [
Option(code: 'A', text: 'Ehng', isCorrect: false),
Option(code: 'B', text: 'Mwenge', isCorrect: false),
Option(code: 'C', text: 'Nohno', isCorrect: true),
Option(code: 'D', text: 'Malek', isCorrect: false),
const Option(code: 'A', text: 'Ehng', isCorrect: false),
const Option(code: 'B', text: 'Mwenge', isCorrect: false),
const Option(code: 'C', text: 'Nohno', isCorrect: true),
const Option(code: 'D', text: 'Malek', isCorrect: false),
],
solution: 'The correct answer is "Nohno" ',
));
list.add(Question(
text: 'Which of the following is "Father"?',
options: [
Option(code: 'A', text: 'Pahpa', isCorrect: true),
Option(code: 'B', text: 'Kahlail', isCorrect: false),
Option(code: 'C', text: 'Mwahu', isCorrect: false),
Option(code: 'D', text: 'E-yung', isCorrect: false),
const Option(code: 'A', text: 'Pahpa', isCorrect: true),
const Option(code: 'B', text: 'Kahlail', isCorrect: false),
const Option(code: 'C', text: 'Mwahu', isCorrect: false),
const Option(code: 'D', text: 'E-yung', isCorrect: false),
],
solution: 'The correct answer is "Pahpa" ',
));
list.add(Question(
text: 'Which of the following is "My spouse"?',
options: [
Option(code: 'A', text: 'Kidi', isCorrect: false),
Option(code: 'B', text: 'Malek', isCorrect: false),
Option(code: 'C', text: 'A kis', isCorrect: false),
Option(code: 'D', text: 'Ahi pwoud', isCorrect: true),
const Option(code: 'A', text: 'Kidi', isCorrect: false),
const Option(code: 'B', text: 'Malek', isCorrect: false),
const Option(code: 'C', text: 'A kis', isCorrect: false),
const Option(code: 'D', text: 'Ahi pwoud', isCorrect: true),
],
solution: 'The correct answer is "Ahi pwoud"',
));
list.add(Question(
text: 'Which of the following is "My child/children" ?',
options: [
Option(code: 'A', text: 'Pwohng mwahu', isCorrect: false),
Option(code: 'B', text: 'Nei seri', isCorrect: true),
Option(code: 'C', text: "A kis", isCorrect: false),
Option(code: 'D', text: "E-yung", isCorrect: false),
const Option(code: 'A', text: 'Pwohng mwahu', isCorrect: false),
const Option(code: 'B', text: 'Nei seri', isCorrect: true),
const Option(code: 'C', text: "A kis", isCorrect: false),
const Option(code: 'D', text: "E-yung", isCorrect: false),
],
solution: 'The correct answer is "Nei seri"',
));
list.add(Question(
text: 'Which of the following is "My brother"?',
options: [
Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
Option(code: 'C', text: 'Riei pwutak', isCorrect: true),
Option(code: 'D', text: 'Souwas mwahu', isCorrect: false),
const Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
const Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
const Option(code: 'C', text: 'Riei pwutak', isCorrect: true),
const Option(code: 'D', text: 'Souwas mwahu', isCorrect: false),
],
solution: 'The correct answer is "Riei pwutak"',
));
list.add(Question(
text: ' Which of the following is "My sister"?',
options: [
Option(code: 'A', text: 'Menseng mwahu', isCorrect: false),
Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
Option(code: 'C', text: 'Miei serepein', isCorrect: true),
Option(code: 'D', text: 'Soutik mwahu', isCorrect: false,),
const Option(code: 'A', text: 'Menseng mwahu', isCorrect: false),
const Option(code: 'B', text: 'Pwohng mwahu', isCorrect: false),
const Option(code: 'C', text: 'Miei serepein', isCorrect: true),
const Option(code: 'D', text: 'Soutik mwahu', isCorrect: false,),
],
solution: 'The correct answer is "Miei serepein"',
));
list.add(Question(
text: 'Which of the following is "Grandmother"?',
options: [
Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
Option(code: 'B', text: 'Nohno kahlap', isCorrect: true),
Option(code: 'C', text: 'Menseng mwahu', isCorrect: false),
Option(code: 'D', text: 'Souwas mwahu', isCorrect: false),
const Option(code: 'A', text: 'Soutik mwahu', isCorrect: false),
const Option(code: 'B', text: 'Nohno kahlap', isCorrect: true),
const Option(code: 'C', text: 'Menseng mwahu', isCorrect: false),
const Option(code: 'D', text: 'Souwas mwahu', isCorrect: false),
],
solution: 'The correct answer is "Nohno kahlap"',
));
Expand Down
Loading

0 comments on commit 598ba45

Please sign in to comment.