Merge pull request #3 from jacksonjose4999/jack

Jack
jacksonjose4999 · Aug 6, 2019 · 1185f38 · 1185f38
2 parents f96b201 + 5e5c9d2
commit 1185f38
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
             android:theme="@style/AppTheme">
         <activity android:name="com.example.trigopdfsclasses.TrigonometricRatiosAndFunctions">
         </activity>
-        <activity android:name=".Main2Activity">
+        <activity android:name=".QuizActivity">
         </activity>
         <activity android:name="com.example.trigopdfsclasses.AdditionSubtractionFormulas">
         </activity>

diff --git a/app/src/main/assets/trigoratiosandfuncs.pdf b/app/src/main/assets/trigoratiosandfuncs.pdf
diff --git a/app/src/main/java/com/example/trigonometry/ConfirmQuizActivity.kt b/app/src/main/java/com/example/trigonometry/ConfirmQuizActivity.kt
@@ -18,7 +18,7 @@ class ConfirmQuizActivity : AppCompatActivity() {
         max_score_view.text = "Maximum Score Possible : " + quizInfo.maxQuizScore.toString()
 
         start_quiz_button.setOnClickListener {
-            val intent = Intent(this, Main2Activity::class.java)
+            val intent = Intent(this, QuizActivity::class.java)
             intent.putExtra("QuizStart", quizInfo)
             startActivity(intent)
         }

diff --git a/app/src/main/java/com/example/trigonometry/QuizActivity.kt b/app/src/main/java/com/example/trigonometry/QuizActivity.kt
@@ -8,7 +8,7 @@ import android.os.CountDownTimer
 import android.util.Log
 import kotlinx.android.synthetic.main.activity_main2.*
 
-class Main2Activity : AppCompatActivity() {
+class QuizActivity : AppCompatActivity() {
     val timeInMillis = 11000L
     var remainingtime: Long? = null
     var index = 0
@@ -19,7 +19,6 @@ class Main2Activity : AppCompatActivity() {
     var option3Selected = false
     var option4Selected = false
 
-
     companion object{
         var quiz: Quiz? = null
     }

diff --git a/app/src/main/java/com/example/trigonometry/ShowResult.kt b/app/src/main/java/com/example/trigonometry/ShowResult.kt
@@ -5,7 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.trigonometry.Main2Activity.Companion.quiz
+import com.example.trigonometry.QuizActivity.Companion.quiz
 import com.xwray.groupie.GroupAdapter
 import com.xwray.groupie.Item
 import com.xwray.groupie.ViewHolder

diff --git a/app/src/main/java/com/example/trigopdfsclasses/TrigonometricRatiosAndFunctions.kt b/app/src/main/java/com/example/trigopdfsclasses/TrigonometricRatiosAndFunctions.kt
@@ -10,7 +10,7 @@ class TrigonometricRatiosAndFunctions : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_trigonometry_ratios_and_funtions)
-        pdf_view_ratios_functions.fromAsset("trigonometricratiosandfunctions.pdf").load()
+        pdf_view_ratios_functions.fromAsset("trigoratiosandfuncs.pdf").load()
 
 
     }