diff --git a/app/WordDocs/Addition and Subtraction Formulae.docx b/app/WordDocs/Addition and Subtraction Formulae.docx new file mode 100644 index 0000000..82cda2c Binary files /dev/null and b/app/WordDocs/Addition and Subtraction Formulae.docx differ diff --git a/app/WordDocs/Conditional_Identities-converted.docx b/app/WordDocs/Conditional_Identities-converted.docx new file mode 100644 index 0000000..00f968f Binary files /dev/null and b/app/WordDocs/Conditional_Identities-converted.docx differ diff --git a/app/WordDocs/Double Angle Formulae.docx b/app/WordDocs/Double Angle Formulae.docx new file mode 100644 index 0000000..95b48c6 Binary files /dev/null and b/app/WordDocs/Double Angle Formulae.docx differ diff --git a/app/WordDocs/Transformation Formulae.docx b/app/WordDocs/Transformation Formulae.docx new file mode 100644 index 0000000..f09546a Binary files /dev/null and b/app/WordDocs/Transformation Formulae.docx differ diff --git a/app/WordDocs/Trigonometric ratios and functions.docx b/app/WordDocs/Trigonometric ratios and functions.docx new file mode 100644 index 0000000..27f514f Binary files /dev/null and b/app/WordDocs/Trigonometric ratios and functions.docx differ diff --git a/app/src/main/assets/add_sub.pdf b/app/src/main/assets/add_sub.pdf index d2d69d1..4404046 100644 Binary files a/app/src/main/assets/add_sub.pdf and b/app/src/main/assets/add_sub.pdf differ diff --git a/app/src/main/java/com/example/trigonometry/QuizActivity.kt b/app/src/main/java/com/example/trigonometry/QuizActivity.kt index 7134882..daffa29 100644 --- a/app/src/main/java/com/example/trigonometry/QuizActivity.kt +++ b/app/src/main/java/com/example/trigonometry/QuizActivity.kt @@ -126,11 +126,17 @@ class QuizActivity : AppCompatActivity() { if (option != 4) option4Selected = false } + var justClicked = false + private fun loadQuestion(quiz : ArrayList){ setOtherButtonsToNormal(1) setOtherButtonsToNormal(2) if (index == quiz.size){ + if (justClicked){ + return + } + justClicked = true storeAnswer() displayResult() Log.wtf("TAGGG","index is $index and quizQ size is ${quiz.size}") @@ -235,31 +241,29 @@ class Quiz (quizName: String){ "Trigonometric Ratio's values" -> { questionsArray.add(Questions("Value of sin(0)", "1", "0", "-1", "-1",2)) questionsArray.add(Questions("Value of cos(0)", "1", "0", "-1", "-1",1)) - questionsArray.add(Questions("Value of tan(90)", "1", "not defined", "-1", "-1",2)) + questionsArray.add(Questions("Value of tan(90)", "1", "not defined", "1", "-1",2)) questionsArray.add(Questions("Value of sin(30)", "1/2", "0", "1", "-1",1)) - questionsArray.add(Questions("Value of cot(0)", "not defined", "0", "-1", "-1",1)) - questionsArray.add(Questions("Value of tan(0)", "1", "0", "-1", "-1",2)) - questionsArray.add(Questions("Value of cosec(90)", "1", "not defined", "-1", "-1",1)) + questionsArray.add(Questions("Value of cot(0)", "not defined", "0", "-1", "1",1)) + questionsArray.add(Questions("Value of tan(0)", "1", "0", "-1", "1",2)) + questionsArray.add(Questions("Value of cosec(90)", "1", "not defined", "-1", "1",1)) questionsArray.add(Questions("Value of sec(30)", "1/2", "0", "2/√3", "-1",1)) } "Basic Trigonometric Formulas" -> { - questionsArray.add(Questions("sin(x) * cosec(x) =", "0", "1","-1","1/2",2)) - questionsArray.add(Questions("cos(x) * sec(x)","1", "infinity","0","2",1)) - questionsArray.add(Questions("tan(x) * cot(x)","1", "infinity","0","2",1)) - questionsArray.add(Questions("tan(x) = ","cos(x)/sin(x)","sec(x)/cosec(x)", "sec(x)/cos(x)","cosec(x)/sin(x)",2)) - - questionsArray.add(Questions("sin^2(x) + cos^2(x) = ","0","2","3","1",4)) - questionsArray.add(Questions("1+tan^2(x) = ","cosec^2(x)","sin^2(x)","sec^2(x)","cot^2(x)",3)) - - questionsArray.add(Questions("1+cot^2(x) = ","cosec^2(x)","sin^2(x)","sec^2(x)","cot^2(x)",1)) + questionsArray.add(Questions("sin(x) * cosec(x) = ?", "0", "1","-1","1/2",2)) + questionsArray.add(Questions("cos(x) * sec(x) = ?","1", "infinity","0","2",1)) + questionsArray.add(Questions("tan(x) * cot(x) = ?","1", "infinity","0","2",1)) + questionsArray.add(Questions("tan(x) = ?","cos(x)/sin(x)","sec(x)/cosec(x)", "sec(x)/cos(x)","cosec(x)/sin(x)",2)) + questionsArray.add(Questions("sin^2(x) + cos^2(x) = ?","0","2","3","1",4)) + questionsArray.add(Questions("1+tan^2(x) = ?","cosec^2(x)","sin^2(x)","sec^2(x)","cot^2(x)",3)) + questionsArray.add(Questions("1+cot^2(x) = ?","cosec^2(x)","sin^2(x)","sec^2(x)","cot^2(x)",1)) } "Trigonometric ratios and functions" -> { - questionsArray.add(Questions("sin(x)","p/h","p/b","h/b","b/h",1)) - questionsArray.add(Questions("cos(x)","p/h","p/b","h/b","b/h",4)) - questionsArray.add(Questions("tan(x)","p/h","p/b","h/b","b/h",2)) - questionsArray.add(Questions("cosec(x)","p/h","p/b","h/p","b/h",3)) - questionsArray.add(Questions("sec(x)","p/h","p/b","h/b","b/h",3)) - questionsArray.add(Questions("cot(x)","b/p","p/b","h/b","b/h",1)) + questionsArray.add(Questions("sin(x) = ?","p/h","p/b","h/b","b/h",1)) + questionsArray.add(Questions("cos(x) = ?","p/h","p/b","h/b","b/h",4)) + questionsArray.add(Questions("tan(x) = ?","p/h","p/b","h/b","b/h",2)) + questionsArray.add(Questions("cosec(x) = ?","p/h","p/b","h/p","b/h",3)) + questionsArray.add(Questions("sec(x) = ?","p/h","p/b","h/b","b/h",3)) + questionsArray.add(Questions("cot(x) = ?","b/p","p/b","h/b","b/h",1)) } "Double Triple Half" -> { questionsArray.add(Questions("sin(2A) = ","2sin(A)sin(A)","2cos(A)sin(A)","2cos(A)cos(A)","2sin(A)cosec(A)",2)) @@ -273,16 +277,15 @@ class Quiz (quizName: String){ } "Transformation" -> { - questionsArray.add(Questions("2sin(A)cos(B) = ","sin(A+B) - sin(A-B)","sin(A-B) + sin(A-B)","sin(A+B) + sin(A+B)","sin(A+B) + sin(A-B)",4)) - questionsArray.add(Questions("2cos(A)sin(B) = ", "sin(A+B) - sin(A-B)", "sin(A+B) + sin(A-B)", "sin(A-B) + sin(A-B)", "sin(A+B) + sin(A+B)", 1)) - questionsArray.add(Questions("2cos(A)cos(B) = ", "sin(A+B) + cos(A-B)", "cos(A+B) + cos(A-B)", "sin(A+B) - cos(A-B)", "cos(A+B) - cos(A-B)",2)) - questionsArray.add(Questions("2sin(A)sin(B) = ", "sin(A+B) - sin(A-B)", "sin(A+B) - cos(A-B)", "cos(A+B) - cos(A-B)", "cos(A+B) + cos(A-B)",3)) - - questionsArray.add(Questions("sin(A) + sin(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A-B)/2)cos((A-B)/2)","2sin((A+B)/2)cos((A+B)/2)","2sin((A+B)/2)cos((A-B)/2)",4)) - questionsArray.add(Questions("sin(A) - sin(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A-B)/2)cos((A-B)/2)","2sin((A+B)/2)cos((A+B)/2)","2sin((A+B)/2)cos((A-B)/2)",1)) - questionsArray.add(Questions("cos(A) + cos(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A-B)/2)cos((A-B)/2)","2cos((A+B)/2)cos((A-B)/2)","2sin((A+B)/2)cos((A-B)/2)",3)) - questionsArray.add(Questions("cos(A) - cos(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A+B)/2)sin((A-B)/2)","2sin((A+B)/2)cos((A+B)/2)","cos((A+B)/2)cos((A-B)/2)",2)) - } + questionsArray.add(Questions("2sin(A)cos(B) = ","sin(A+B) - sin(A-B)","sin(A-B) + sin(A-B)","sin(A+B) + sin(A+B)","sin(A+B) + sin(A-B)",4)) + questionsArray.add(Questions("2cos(A)sin(B) = ", "sin(A+B) - sin(A-B)", "sin(A+B) + sin(A-B)", "sin(A-B) + sin(A-B)", "sin(A+B) + sin(A+B)", 1)) + questionsArray.add(Questions("2cos(A)cos(B) = ", "sin(A+B) + cos(A-B)", "cos(A+B) + cos(A-B)", "sin(A+B) - cos(A-B)", "cos(A+B) - cos(A-B)",2)) + questionsArray.add(Questions("2sin(A)sin(B) = ", "sin(A+B) - sin(A-B)", "sin(A+B) - cos(A-B)", "cos(A+B) - cos(A-B)", "cos(A+B) + cos(A-B)",3)) + questionsArray.add(Questions("sin(A) + sin(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A-B)/2)cos((A-B)/2)","2sin((A+B)/2)cos((A+B)/2)","2sin((A+B)/2)cos((A-B)/2)",4)) + questionsArray.add(Questions("sin(A) - sin(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A-B)/2)cos((A-B)/2)","2sin((A+B)/2)cos((A+B)/2)","2sin((A+B)/2)cos((A-B)/2)",1)) + questionsArray.add(Questions("cos(A) + cos(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A-B)/2)cos((A-B)/2)","2cos((A+B)/2)cos((A-B)/2)","2sin((A+B)/2)cos((A-B)/2)",3)) + questionsArray.add(Questions("cos(A) - cos(B) = ","2cos((A+B)/2)sin((A-B)/2)","2sin((A+B)/2)sin((A-B)/2)","2sin((A+B)/2)cos((A+B)/2)","cos((A+B)/2)cos((A-B)/2)",2)) + } "Conditional Identities" -> { @@ -290,7 +293,6 @@ class Quiz (quizName: String){ } "Trigonometric Equations and general values" -> { - //Ishank questionsArray.add(Questions("If 0 { - //Ishank + questionsArray.add(Questions("sin(A+B) = ?","sin(A)cos(B) - cos(A)sin(B)","sin(A)cos(B) + cos(A)sin(B)","sin(A)sin(B) + cos(A)cos(B)","sin(A)sin(B) - cos(A)cos(B)",2)) + questionsArray.add(Questions("cos(A+B) = ?","cos(A)cos(B) - sin(A)sin(B)","sin(A)cos(B) + cos(A)sin(B)","cos(A)cos(B) + sin(A)sin(B)","sin(A)cos(B) - cos(A)sin(B)",1)) + questionsArray.add(Questions("sin(A-B) = ?","sin(A)cos(B) + cos(A)sin(B)","sin(A)cos(B) - cos(A)sin(B)","sin(A)sin(B) - cos(A)cos(B)","sin(A)sin(B) + cos(A)cos(B)",2)) + questionsArray.add(Questions("cos(A-B) = ?","cos(A)cos(B) - sin(A)sin(B)","sin(A)cos(B) + cos(A)sin(B)","cos(A)cos(B) + sin(A)sin(B)","sin(A)cos(B) - cos(A)sin(B)",3)) + questionsArray.add(Questions("tan(A+B) = ?","tan(A)+tan(B)/1+tan(A)tan(B)","tan(A)-tan(B)/1+tan(A)tan(B)","tan(A)-tan(B)/1-tan(A)tan(B)","tan(A)+tan(B)/1-tan(A)tan(B)",4)) + questionsArray.add(Questions("tan(A-B) = ?","tan(A)+tan(B)/1+tan(A)tan(B)","tan(A)-tan(B)/1+tan(A)tan(B)","tan(A)-tan(B)/1-tan(A)tan(B)","tan(A)+tan(B)/1-tan(A)tan(B)",2)) + questionsArray.add(Questions("cot(A+B) = ?","cot(B)cot(A)-1/cot(B)+cot(A)","cot(B)cot(A)-1/cot(B)-cot(A)","cot(B)cot(A)+1/cot(B)+cot(A)","cot(B)cot(A)+1/cot(B)-cot(A)",1)) + questionsArray.add(Questions("cot(A-B) = ?","cot(B)cot(A)-1/cot(B)+cot(A)","cot(B)cot(A)-1/cot(B)-cot(A)","cot(B)cot(A)+1/cot(B)+cot(A)","cot(B)cot(A)+1/cot(B)-cot(A)",2)) + questionsArray.add(Questions("sin(A+B+C) = ?","sin(A)cos(B)cos(C) + cos(A)sin(B)cos(C) - cos(A)cos(B)sin(C) - sin(A)sin(B)sin(C)","sin(A)cos(B)cos(C) - cos(A)sin(B)cos(C) + cos(A)cos(B)sin(C) - sin(A)sin(B)sin(C)","sin(A)cos(B)cos(C) + cos(A)sin(B)cos(C) + cos(A)cos(B)sin(C) - sin(A)sin(B)sin(C)","sin(A)cos(B)cos(C) + cos(A)sin(B)cos(C) + cos(A)cos(B)sin(C) + sin(A)sin(B)sin(C)",3)) + questionsArray.add(Questions("cos(A+B+C) = ?","cos(A)cos(B)cos(C) - cos(A)sin(B)sin(C) - sin(A)cos(B)sin(C) - cos(A)sin(B)sin(C)","cos(A)cos(B)cos(C) + cos(A)sin(B)sin(C) + sin(A)cos(B)sin(C) - cos(A)sin(B)sin(C)","cos(A)cos(B)cos(C) + cos(A)sin(B)sin(C) - sin(A)cos(B)sin(C) - cos(A)sin(B)sin(C)","cos(A)cos(B)cos(C) - cos(A)sin(B)sin(C) - sin(A)cos(B)sin(C) + cos(A)sin(B)sin(C)",1)) } } diff --git a/app/src/main/res/layout/activity_show_result.xml b/app/src/main/res/layout/activity_show_result.xml index a6d97fe..48bc00f 100644 --- a/app/src/main/res/layout/activity_show_result.xml +++ b/app/src/main/res/layout/activity_show_result.xml @@ -5,8 +5,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ShowResult"> + tools:context=".ShowResult" android:orientation="vertical"> +