confirmation dialog invoked on submit (#269)

* confirmation dialog invoked on submit
coding-blocks · Jun 9, 2019 · 8dd37bc · 8dd37bc
1 parent 8e454be
commit 8dd37bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/app/src/main/java/com/codingblocks/cbonlineapp/adapters/ViewPagerAdapter.kt b/app/src/main/java/com/codingblocks/cbonlineapp/adapters/ViewPagerAdapter.kt
@@ -1,6 +1,5 @@
 package com.codingblocks.cbonlineapp.adapters
 
-import android.app.Activity
 import android.content.Context
 import android.util.SparseArray
 import android.view.LayoutInflater
@@ -22,7 +21,7 @@ import com.codingblocks.onlineapi.models.QuizSubmission
 import kotlinx.android.synthetic.main.quizlayout.view.*
 import org.jetbrains.anko.AnkoLogger
 
-class ViewPagerAdapter(private var mContext: Context, private var quizId: String, private var qaId: String, private var questionList: SparseArray<String>, submission: List<QuizSubmission>?, private var result: QuizResult?, private var viewModel: QuizViewModel) : PagerAdapter(), AnkoLogger {
+class ViewPagerAdapter(private var mContext: Context, private var quizId: String, private var qaId: String, private var questionList: SparseArray<String>, submission: List<QuizSubmission>?, private var result: QuizResult?, val listener: QuizInteractor, private var viewModel: QuizViewModel) : PagerAdapter(), AnkoLogger {
     private lateinit var choiceDataAdapter: QuizChoiceAdapter
     var submissionList: ArrayList<QuizSubmission> = submission as ArrayList<QuizSubmission>
 
@@ -124,9 +123,7 @@ class ViewPagerAdapter(private var mContext: Context, private var quizId: String
             }
         })
         view.submitButton.setOnClickListener {
-            Clients.onlineV2JsonApi.sumbitQuizById(qaId).enqueue(retrofitCallback { _, _ ->
-                (mContext as Activity).finish()
-            })
+            listener.onQuizSubmitted()
         }
     }
 
@@ -137,4 +134,8 @@ class ViewPagerAdapter(private var mContext: Context, private var quizId: String
     override fun getCount(): Int {
         return questionList.size()
     }
+
+    interface QuizInteractor {
+        fun onQuizSubmitted()
+    }
 }
diff --git a/app/src/main/java/com/codingblocks/cbonlineapp/fragments/QuizFragment.kt b/app/src/main/java/com/codingblocks/cbonlineapp/fragments/QuizFragment.kt
@@ -33,7 +33,7 @@ import org.jetbrains.anko.textColor
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
-class QuizFragment : Fragment(), AnkoLogger, ViewPager.OnPageChangeListener, View.OnClickListener {
+class QuizFragment : Fragment(), AnkoLogger, ViewPager.OnPageChangeListener, View.OnClickListener, ViewPagerAdapter.QuizInteractor {
 
     private lateinit var quizId: String
     private lateinit var qnaId: String
@@ -81,7 +81,7 @@ class QuizFragment : Fragment(), AnkoLogger, ViewPager.OnPageChangeListener, Vie
                     if (index == quiz.questions!!.size - 1) {
                         Clients.onlineV2JsonApi.getQuizAttemptById(quizAttemptId).enqueue(retrofitCallback { _, attemptResponse ->
                             attemptResponse?.body().let {
-                                mAdapter = ViewPagerAdapter(context!!, qnaId, quizAttemptId, questionList, it?.submission, it?.result, viewModel)
+                                mAdapter = ViewPagerAdapter(context!!, qnaId, quizAttemptId, questionList, it?.submission, it?.result, this, viewModel)
                                 quizViewPager.adapter = mAdapter
                                 quizViewPager.currentItem = 0
                                 quizViewPager.offscreenPageLimit = quiz.questions?.size ?: 0
@@ -222,6 +222,7 @@ class QuizFragment : Fragment(), AnkoLogger, ViewPager.OnPageChangeListener, Vie
                 QuizResultFragment.newInstance(quizId, qnaId, attemptId, quizAttemptId))
             fragmentTransaction.addToBackStack("")
             fragmentTransaction.commit()
+            fragmentTransaction.commit()
         })
     }
 
@@ -249,6 +250,10 @@ class QuizFragment : Fragment(), AnkoLogger, ViewPager.OnPageChangeListener, Vie
         }
     }
 
+    override fun onQuizSubmitted() {
+        confirmSubmitQuiz()
+    }
+
     companion object {
         @JvmStatic
         fun newInstance(quizId: String, qnaId: String, attemptId: String, quizAttemptId: String) =