View Solutions feature added...

app/src/main/AndroidManifest.xml

@@ -15,42 +15,49 @@
         android:theme="@style/Theme.Queezy"
         tools:targetApi="31">
         <activity
-            android:name=".StatsActivity"
+            android:name=".activity.SolutionsActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".QuizActivity"
+            android:name=".activity.StatsActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".CreateAccountActivity"
+            android:name=".activity.QuizActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".LoginActivity"
+            android:name=".activity.CreateAccountActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".WelcomeActivity"
+            android:name=".activity.LoginActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
         <activity
-            android:name=".SplashActivity"
+            android:name=".activity.WelcomeActivity"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
+        <activity
+            android:name=".activity.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -63,7 +70,7 @@
                 android:value="" />
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".activity.MainActivity"
             android:exported="false">
             <meta-data
                 android:name="android.app.lib_name"

app/src/main/java/com/mr_17/queezy/CreateAccountActivity.kt → app/src/main/java/com/mr_17/queezy/activity/CreateAccountActivity.kt

@@ -1,7 +1,8 @@
-package com.mr_17.queezy
+package com.mr_17.queezy.activity
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.mr_17.queezy.R
 
 class CreateAccountActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/mr_17/queezy/LoginActivity.kt → app/src/main/java/com/mr_17/queezy/activity/LoginActivity.kt

@@ -1,7 +1,8 @@
-package com.mr_17.queezy
+package com.mr_17.queezy.activity
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.mr_17.queezy.R
 
 class LoginActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/mr_17/queezy/MainActivity.kt → app/src/main/java/com/mr_17/queezy/activity/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.mr_17.queezy
+package com.mr_17.queezy.activity
 
 import android.app.Activity
 import android.content.Intent
@@ -11,11 +11,12 @@ import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import com.mr_17.queezy.R
 import com.mr_17.queezy.api.Api
 import com.mr_17.queezy.api.ApiCount
 import com.mr_17.queezy.api.QuizQuestions
 import com.mr_17.queezy.api.Result
-import com.mr_17.queezy.question.Question
+import com.mr_17.queezy.model.Question
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -152,17 +153,28 @@ class MainActivity : AppCompatActivity() {
                         }
                         Log.v("answers", q!!.Answer.toString())
                     }
-                }
-                q!!.question?.get(0)?.let { Log.v("question1", it) }
+                    q!!.question!!.get(0)!!.let { Log.v("question1", it) }
 
-                loading!!.visibility = View.GONE
-                startQuizButton!!.visibility = View.VISIBLE
+                    loading!!.visibility = View.GONE
+                    startQuizButton!!.visibility = View.VISIBLE
+
+                    val intent = Intent(this@MainActivity, QuizActivity::class.java)
+                    intent.putExtra("question", q)
+                    intent.putExtra("category", categorySpinner!!.selectedItem.toString())
+                    intent.putExtra("difficulty", difficultySpinner!!.selectedItem.toString())
+                    startActivity(intent)
+                }
+                else {
+                    Toast.makeText(
+                        applicationContext,
+                        "No questions available in this particular Category & Difficulty",
+                        Toast.LENGTH_SHORT
+                    )
+                        .show()
+                    loading!!.visibility = View.GONE
+                    startQuizButton!!.visibility = View.VISIBLE
+                }
 
-                val intent = Intent(this@MainActivity, QuizActivity::class.java)
-                intent.putExtra("question", q)
-                intent.putExtra("category", categorySpinner!!.selectedItem.toString())
-                intent.putExtra("difficulty", difficultySpinner!!.selectedItem.toString())
-                startActivity(intent)
             }
 
             override fun onFailure(call: Call<QuizQuestions?>, t: Throwable) {

app/src/main/java/com/mr_17/queezy/QuizActivity.kt → app/src/main/java/com/mr_17/queezy/activity/QuizActivity.kt

@@ -1,14 +1,14 @@
-package com.mr_17.queezy
+package com.mr_17.queezy.activity
 
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.get
 import com.google.android.material.progressindicator.CircularProgressIndicator
-import com.mr_17.queezy.question.Question
+import com.mr_17.queezy.R
+import com.mr_17.queezy.model.Question
 
 class QuizActivity : AppCompatActivity() {
 
@@ -54,6 +54,7 @@ class QuizActivity : AppCompatActivity() {
             val intent = Intent(this@QuizActivity, StatsActivity::class.java)
             intent.putExtra("qAndA", qAndA)
             intent.putIntegerArrayListExtra("selectedOptions", selectedOptions)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
             startActivity(intent)
         }
     }

app/src/main/java/com/mr_17/queezy/activity/SolutionsActivity.kt

@@ -0,0 +1,72 @@
+package com.mr_17.queezy.activity
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.mr_17.queezy.R
+import com.mr_17.queezy.adapter.SolutionsActivityRecyclerViewAdapter
+import com.mr_17.queezy.model.Question
+import com.mr_17.queezy.model.SolutionsActivityRecyclerViewModel
+
+class SolutionsActivity : AppCompatActivity() {
+
+    private var qAndA: Question? = null
+
+    private var toolbar: Toolbar? = null
+
+    private var selectedOptions: ArrayList<Int>? = null
+    private var answer: ArrayList<Int>? = null
+
+    private var recyclerView: RecyclerView? = null
+    private var list: java.util.ArrayList<SolutionsActivityRecyclerViewModel>? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_solutions)
+
+        InitializeFields()
+        InitializeSolutionsRecyclerView()
+    }
+
+    private fun InitializeFields()
+    {
+        qAndA = intent.getSerializableExtra("qAndA") as Question?
+        selectedOptions = intent.getSerializableExtra("selectedOptions") as ArrayList<Int>?
+        answer = intent.getIntegerArrayListExtra("answers") as ArrayList<Int>
+
+        recyclerView = findViewById(R.id.recycler_view)
+
+        toolbar = findViewById(R.id.toolbar)
+        toolbar!!.setNavigationOnClickListener { onBackPressed() }
+
+    }
+
+    private fun InitializeSolutionsRecyclerView() {
+        recyclerView!!.layoutManager = LinearLayoutManager(this)
+        list = ArrayList()
+
+        for (i in answer!!.indices) {
+            list!!.add(SolutionsActivityRecyclerViewModel(
+                "Question " + (i+1).toString() + " of " + answer!!.size,
+                "",
+                qAndA!!.question!!.get(i),
+                qAndA!!.optA!!.get(i),
+                qAndA!!.optB!!.get(i),
+                qAndA!!.optC!!.get(i),
+                qAndA!!.optD!!.get(i),
+                answer!!.get(i),
+                selectedOptions!!.get(i)
+                )
+            )
+        }
+
+        // This will pass the ArrayList to our Adapter
+        val adapter = SolutionsActivityRecyclerViewAdapter(list!!)
+
+        // Setting the Adapter with the recyclerview
+        recyclerView!!.adapter = adapter
+    }
+}

app/src/main/java/com/mr_17/queezy/SplashActivity.kt → app/src/main/java/com/mr_17/queezy/activity/SplashActivity.kt

@@ -1,9 +1,10 @@
-package com.mr_17.queezy
+package com.mr_17.queezy.activity
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Handler
+import com.mr_17.queezy.R
 
 class SplashActivity : AppCompatActivity() {
 

app/src/main/java/com/mr_17/queezy/StatsActivity.kt → app/src/main/java/com/mr_17/queezy/activity/StatsActivity.kt

@@ -1,9 +1,12 @@
-package com.mr_17.queezy
+package com.mr_17.queezy.activity
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
 import android.widget.TextView
-import com.mr_17.queezy.question.Question
+import com.mr_17.queezy.R
+import com.mr_17.queezy.model.Question
 
 class StatsActivity : AppCompatActivity() {
 
@@ -23,6 +26,8 @@ class StatsActivity : AppCompatActivity() {
     private var completionPercentageTextView: TextView? = null
     private var skippedTextView: TextView? = null
 
+    private var viewSolutionsButton: Button? = null
+    private var homeButton: Button? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -31,6 +36,19 @@ class StatsActivity : AppCompatActivity() {
         InitializeFields()
         GetStats()
         SetStats()
+
+        viewSolutionsButton!!.setOnClickListener {
+            val intent = Intent(this@StatsActivity, SolutionsActivity::class.java)
+            intent.putExtra("qAndA", qAndA)
+            intent.putIntegerArrayListExtra("answers", answer)
+            intent.putIntegerArrayListExtra("selectedOptions", selectedOptions)
+            startActivity(intent)
+        }
+
+        homeButton!!.setOnClickListener {
+            val intent = Intent(this@StatsActivity, MainActivity::class.java)
+            startActivity(intent)
+        }
     }
 
     private fun InitializeFields()
@@ -44,6 +62,8 @@ class StatsActivity : AppCompatActivity() {
         incorrectAnswerCountTextView = findViewById(R.id.incorrect_answers_count)
         completionPercentageTextView = findViewById(R.id.completion_percent)
         skippedTextView = findViewById(R.id.skipped_count)
+        viewSolutionsButton = findViewById(R.id.view_solutions_button)
+        homeButton = findViewById(R.id.home_button)
     }
 
     private fun GetStats()

app/src/main/java/com/mr_17/queezy/WelcomeActivity.kt → app/src/main/java/com/mr_17/queezy/activity/WelcomeActivity.kt

@@ -1,14 +1,12 @@
-package com.mr_17.queezy
+package com.mr_17.queezy.activity
 
 import android.app.Activity
-import android.app.ProgressDialog
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.util.Log
 import android.widget.Button
 import android.widget.TextView
-import android.widget.Toast
+import com.mr_17.queezy.R
 
 class WelcomeActivity : AppCompatActivity() {