📝 Minor improvements

AlbatovK · Apr 4, 2022 · 40ca49a · 40ca49a
1 parent 314daf3
commit 40ca49a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/albatros/kquiz/ui/fragments/enter/EnterFragment.kt b/app/src/main/java/com/albatros/kquiz/ui/fragments/enter/EnterFragment.kt
@@ -89,11 +89,10 @@ class EnterFragment : Fragment(), MainActivity.IOnBackPressed {
         dialog.show()
     }
 
-    override fun onBackPressed(): Boolean {
+    override fun onBackPressed(): Boolean =
         activity?.let {
             it.finish()
             it.finishAffinity()
-        }
-        return true
-    }
+            true
+        } ?: false
 }
diff --git a/app/src/main/java/com/albatros/kquiz/ui/fragments/game/GameFragment.kt b/app/src/main/java/com/albatros/kquiz/ui/fragments/game/GameFragment.kt
@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.albatros.kquiz.R
 import com.albatros.kquiz.databinding.GameFragmentBinding
+import com.albatros.kquiz.ui.activity.MainActivity
 import com.albatros.kquiz.ui.adapter.answer.AnswerAdapter
 import com.albatros.kquiz.ui.adapter.answer.AnswerAdapterListener
 import kotlinx.coroutines.Dispatchers
@@ -25,14 +26,16 @@ import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class GameFragment : Fragment() {
+class GameFragment : Fragment(), MainActivity.IOnBackPressed {
 
     private lateinit var binding: GameFragmentBinding
     private val args by navArgs<GameFragmentArgs>()
     private val viewModel: GameViewModel by viewModel { parametersOf(args.question) }
     private var answered = false
     private var currentAnswer = ""
 
+    override fun onBackPressed(): Boolean = true
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

diff --git a/app/src/main/java/com/albatros/kquiz/ui/fragments/result/ResultFragment.kt b/app/src/main/java/com/albatros/kquiz/ui/fragments/result/ResultFragment.kt
@@ -11,16 +11,19 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.albatros.kquiz.R
 import com.albatros.kquiz.databinding.ResultFragmentBinding
 import com.albatros.kquiz.model.data.info.ClientInfo
+import com.albatros.kquiz.ui.activity.MainActivity
 import com.albatros.kquiz.ui.adapter.client.ResultAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class ResultFragment : Fragment() {
+class ResultFragment : Fragment(), MainActivity.IOnBackPressed {
 
     private lateinit var binding: ResultFragmentBinding
     private val args by navArgs<ResultFragmentArgs>()
     private val viewModel: ResultViewModel by viewModel { parametersOf(args.question) }
 
+    override fun onBackPressed(): Boolean = true
+
     private val onPassiveStateEndedObserver = Observer<Boolean> { value ->
         if (value) {
             viewModel.getNextQuestion()?.let {