This is the latest commit

app/src/main/AndroidManifest.xml

@@ -36,6 +36,16 @@
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".MainActivity"/>
         </activity>
+        <activity android:name="com.example.trigopdfsclasses.conditionalIdentities">
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value=".MainActivity"/>
+        </activity>
+        <activity android:name="com.example.trigopdfsclasses.TrigoEquationsAndGeneralValues">
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value=".MainActivity"/>
+        </activity>
         <activity android:name="com.example.trigopdfsclasses.TrigonometricRatiosAndValues">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"

app/src/main/java/com/example/trigonometry/ConfirmQuizActivity.kt

@@ -1,5 +1,6 @@
 package com.example.trigonometry
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
@@ -11,13 +12,19 @@ class ConfirmQuizActivity : AppCompatActivity() {
         var quizName = ""
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_confirm_quiz)
 
         val quizInfo = intent.getParcelableExtra<QuizInfoClass>("QuizInfo")
 
-        quiz_topic_view.text = quizInfo.quizName!!
+        if(quizInfo.quizName == "Conditional Identities")
+            quizInfo.currQuizScore = 12
+        else
+            quizInfo.currQuizScore = 0
+
+        quiz_topic_view.text = quizInfo.quizName
         current_score_view.text = "Current Score : " + quizInfo.currQuizScore.toString()
         max_score_view.text = "Maximum Score Possible : " + quizInfo.maxQuizScore.toString()
 

app/src/main/java/com/example/trigonometry/MainActivity.kt

@@ -4,15 +4,12 @@ import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.trigopdfsclasses.*
 import com.xwray.groupie.GroupAdapter
 import com.xwray.groupie.Item
 import com.xwray.groupie.ViewHolder
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.home_recycler_view_item.view.*
-import com.example.trigopdfsclasses.AdditionSubtractionFormulas
-import com.example.trigopdfsclasses.TrigonometricRatiosAndValues
-import com.example.trigopdfsclasses.BasicTrigonometricFormulas
-import com.example.trigopdfsclasses.TrigonometricRatiosAndFunctions
 
 class MainActivity : AppCompatActivity() {
 
@@ -44,6 +41,14 @@ class MainActivity : AppCompatActivity() {
                     val intent = Intent(this, AdditionSubtractionFormulas::class.java)
                     startActivity(intent)
                 }
+                "Trigonometric Ratios and general Values" -> {
+                    val intent = Intent(this, TrigoEquationsAndGeneralValues::class.java)
+                    startActivity(intent)
+                }
+                "Conditional Identities" -> {
+                    val intent = Intent(this, conditionalIdentities::class.java)
+                    startActivity(intent)
+                }
 
             }
         }
@@ -54,6 +59,8 @@ class MainActivity : AppCompatActivity() {
         adapter.add(ActivitiesItem("Values of Trigonometric Ratios","Table of Trigonometric Standard Angles"))
         adapter.add(ActivitiesItem("Basic Trigonometric Functions", "Basic definitions"))
         adapter.add(ActivitiesItem("Addition and Subtraction Functions","The formulas with addition or subtraction in their angles"))
+        adapter.add(ActivitiesItem("Trigonometric Ratios and general Values","Basic Trigonometric equations"))
+        adapter.add(ActivitiesItem("Conditional Identities","The formulas with addition or subtraction in their angles"))
     }
 
 

app/src/main/java/com/example/trigonometry/QuizInfoClass.kt

@@ -4,4 +4,4 @@ import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
-class QuizInfoClass (val quizName : String, val currQuizScore : Int, val maxQuizScore : Int) : Parcelable
+class QuizInfoClass (val quizName : String, var currQuizScore : Int, val maxQuizScore : Int) : Parcelable

app/src/main/java/com/example/trigopdfsclasses/TrigoEquationsAndGeneralValues.kt

@@ -0,0 +1,29 @@
+package com.example.trigopdfsclasses
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.example.trigonometry.ConfirmQuizActivity
+import com.example.trigonometry.QuizInfoClass
+import com.example.trigonometry.R
+import kotlinx.android.synthetic.main.activity_trigonometric_rations_values.*
+import kotlinx.android.synthetic.main.activity_trigonometry_ratios_and_funtions.*
+
+class TrigoEquationsAndGeneralValues : AppCompatActivity() {
+    val currScore = 0
+    val quizName = "Trigonometric Equations and general values"
+    val maxScore = 20
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_trigonometry_ratios_and_funtions)
+        pdf_view_ratios_functions.fromAsset("Trigonometric _equations_and_general_values.pdf").load()
+
+        ratios_and_functions_quiz.setOnClickListener {
+            val intent = Intent(this, ConfirmQuizActivity::class.java)
+            val quizIntent = QuizInfoClass("Trigonometric ratios and functions",currScore,maxScore)
+            intent.putExtra("QuizInfo",quizIntent)
+            startActivity(intent)
+        }
+    }
+}

app/src/main/java/com/example/trigopdfsclasses/conditionalIdentities.kt

@@ -0,0 +1,29 @@
+package com.example.trigopdfsclasses
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.example.trigonometry.ConfirmQuizActivity
+import com.example.trigonometry.QuizInfoClass
+import com.example.trigonometry.R
+import kotlinx.android.synthetic.main.activity_trigonometric_rations_values.*
+import kotlinx.android.synthetic.main.activity_trigonometry_ratios_and_funtions.*
+
+class conditionalIdentities : AppCompatActivity() {
+    val currScore = 0
+    val quizName = "Trigonometric Ratio's and Functions"
+    val maxScore = 20
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_trigonometry_ratios_and_funtions)
+        pdf_view_ratios_functions.fromAsset("Conditional_Identities.pdf").load()
+
+        ratios_and_functions_quiz.setOnClickListener {
+            val intent = Intent(this, ConfirmQuizActivity::class.java)
+            val quizIntent = QuizInfoClass("Conditional Identities",currScore,maxScore)
+            intent.putExtra("QuizInfo",quizIntent)
+            startActivity(intent)
+        }
+    }
+}

app/src/main/res/drawable/rect_oval.xml

@@ -2,14 +2,12 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <gradient android:startColor="#00000000"
-              android:centerColor="#887BA8"
-              android:endColor="#917CB3"
-              android:angle="270" />
+    <solid android:color="#E0D4C8"></solid>
+
     <corners
             android:topRightRadius="20dp"
             android:topLeftRadius="20dp"
-            android:bottomRightRadius="0dp"
-            android:bottomLeftRadius="0dp"
+            android:bottomRightRadius="20dp"
+            android:bottomLeftRadius="20dp"
     />
 </shape>