Skip to content

Commit

Permalink
added all my questions
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacksonjose4999
jacksonjose4999 committed Aug 11, 2019
1 parent b760bed commit 1bc251d
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 32 deletions.
Binary file added app/WordDocs/Addition and Subtraction Formulae.docx
View file
Binary file not shown.
Binary file added app/WordDocs/Conditional_Identities-converted.docx
View file
Binary file not shown.
Binary file added app/WordDocs/Double Angle Formulae.docx
View file
Binary file not shown.
Binary file added app/WordDocs/Transformation Formulae.docx
View file
Binary file not shown.
Binary file added app/WordDocs/Trigonometric ratios and functions.docx
View file
Binary file not shown.
Binary file modified app/src/main/assets/add_sub.pdf
View file
Binary file not shown.
73 changes: 42 additions & 31 deletions app/src/main/java/com/example/trigonometry/QuizActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,17 @@ class QuizActivity : AppCompatActivity() {
if (option != 4)
option4Selected = false
}
var justClicked = false


private fun loadQuestion(quiz : ArrayList<Questions>){
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}")
Expand Down Expand Up @@ -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))
Expand All @@ -273,24 +277,22 @@ 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" -> {


}
"Trigonometric Equations and general values" -> {
//Ishank
questionsArray.add(Questions("If 0 <t< 2π such that sin(t) = √2/2 and cot(t)<0,then t=?","π/4","3π/4","5π/4","7π/4",2))
questionsArray.add(Questions("If 0 <t< 2π and sin(t) = -1, then t=","π/2","3π/2","5π/4","π",2))
questionsArray.add(Questions("If 0 <α< π and cos(α) = -√3/2, then α =","π/6","-π/6","5π/6","7π/6",3))
Expand All @@ -300,7 +302,16 @@ class Quiz (quizName: String){
questionsArray.add(Questions("Find all values of t such that cos(πt) = 1","t = 2kπ ; k = 0","t = 2k ; k = 0","t = k ; k = 0","t = kπ ; k = 0",2))
}
"Addition and Subtraction" ->{
//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))
}

}
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/res/layout/activity_show_result.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">

<TextView
android:text="TextView"
android:layout_width="match_parent"
android:layout_height="61dp" android:id="@+id/textView3"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/result_recycler_view"
android:layout_width="match_parent"
Expand Down

0 comments on commit 1bc251d

Please sign in to comment.