fix categories

you-apps · Nov 13, 2022 · 2ece2e4 · 2ece2e4 · JonnyTech · Nov 13, 2022
1 parent 216b61e
commit 2ece2e4
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 20 deletions.
diff --git a/app/src/main/java/com/bnyro/trivia/api/opentriviadb/OpenTriviaDBHelper.kt b/app/src/main/java/com/bnyro/trivia/api/opentriviadb/OpenTriviaDBHelper.kt
@@ -41,7 +41,7 @@ class OpenTriviaDBHelper : ApiHelper() {
 
         val stats = mutableListOf<String>()
 
-        kotlin.runCatching {
+        runCatching {
             val json = mapper.readTree(
                 mapper.writeValueAsString(metadata.overall)
             )

diff --git a/...o/trivia/api/opentriviadb/obj/Question.kt → ...pi/opentriviadb/obj/OpenTriviaQuestion.kt b/...o/trivia/api/opentriviadb/obj/Question.kt → ...pi/opentriviadb/obj/OpenTriviaQuestion.kt
@@ -1,6 +1,6 @@
 package com.bnyro.trivia.api.opentriviadb.obj
 
-data class Question(
+data class OpenTriviaQuestion(
     val category: String? = null,
     val correct_answer: String? = null,
     val difficulty: String? = null,

diff --git a/...ro/trivia/api/opentriviadb/obj/Overall.kt → ...ivia/api/opentriviadb/obj/OverallStats.kt b/...ro/trivia/api/opentriviadb/obj/Overall.kt → ...ivia/api/opentriviadb/obj/OverallStats.kt
@@ -1,6 +1,6 @@
 package com.bnyro.trivia.api.opentriviadb.obj
 
-data class Overall(
+data class OverallStats(
     val total_num_of_pending_questions: Int? = null,
     val total_num_of_questions: Int? = null,
     val total_num_of_rejected_questions: Int? = null,

diff --git a/app/src/main/java/com/bnyro/trivia/api/opentriviadb/obj/QuestionResponse.kt b/app/src/main/java/com/bnyro/trivia/api/opentriviadb/obj/QuestionResponse.kt
@@ -2,5 +2,5 @@ package com.bnyro.trivia.api.opentriviadb.obj
 
 data class QuestionResponse(
     val response_code: Int? = null,
-    val results: List<Question>? = null
+    val results: List<OpenTriviaQuestion>? = null
 )
diff --git a/app/src/main/java/com/bnyro/trivia/api/opentriviadb/obj/StatsResponse.kt b/app/src/main/java/com/bnyro/trivia/api/opentriviadb/obj/StatsResponse.kt
@@ -2,5 +2,5 @@ package com.bnyro.trivia.api.opentriviadb.obj
 
 data class StatsResponse(
     val categories: Any? = null,
-    val overall: Overall? = null
+    val overall: OverallStats? = null
 )
diff --git a/app/src/main/java/com/bnyro/trivia/api/thetriviaapi/TheTriviaApiHelper.kt b/app/src/main/java/com/bnyro/trivia/api/thetriviaapi/TheTriviaApiHelper.kt
@@ -1,5 +1,6 @@
 package com.bnyro.trivia.api.thetriviaapi
 
+import android.util.Log
 import com.bnyro.trivia.extensions.formatStats
 import com.bnyro.trivia.obj.Category
 import com.bnyro.trivia.obj.Question
@@ -27,20 +28,21 @@ class TheTriviaApiHelper : ApiHelper() {
                 incorrectAnswers = it.incorrectAnswers
             )
         }
+        Log.e("category", apiQuestions.first().category.toString())
         return questions
     }
 
     override suspend fun getCategories(): List<Category> {
         val categories = RetrofitInstance.theTriviaApi.getCategories()
 
-        kotlin.runCatching {
+        runCatching {
             val response = mapper.readTree(
                 mapper.writeValueAsString(categories)
             )
             val categoriesList = mutableListOf<Category>()
             response.fields().forEach {
                 categoriesList += Category(
-                    id = it.value[0].toString(),
+                    id = it.value.firstOrNull().toString().replace("\"", ""),
                     name = it.key.toString()
                 )
             }
@@ -55,7 +57,7 @@ class TheTriviaApiHelper : ApiHelper() {
         val stats = mutableListOf<String>()
         val mapper = ObjectMapper()
 
-        kotlin.runCatching {
+        runCatching {
             val stateStats = mapper.readTree(
                 mapper.writeValueAsString(metadata.byState)
             )

diff --git a/app/src/main/java/com/bnyro/trivia/fragments/CategoriesFragment.kt b/app/src/main/java/com/bnyro/trivia/fragments/CategoriesFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView.OnItemClickListener
 import android.widget.ArrayAdapter
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.bnyro.trivia.R
@@ -18,12 +19,6 @@ import com.bnyro.trivia.util.BundleArguments
 class CategoriesFragment : Fragment() {
     private lateinit var binding: FragmentCategoriesBinding
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-        }
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -65,11 +60,9 @@ class CategoriesFragment : Fragment() {
             binding.categoriesLV.visibility = View.VISIBLE
 
             binding.categoriesLV.onItemClickListener = OnItemClickListener { _, _, index, _ ->
-                val category = categoryQueries[index]
-                val quizFragment = QuizFragment()
-                val bundle = Bundle()
-                bundle.putString(BundleArguments.category, category)
-                quizFragment.arguments = bundle
+                val quizFragment = QuizFragment().apply {
+                    arguments = bundleOf(BundleArguments.category to categoryQueries[index])
+                }
 
                 parentFragmentManager.navigate(quizFragment)
             }

diff --git a/app/src/main/java/com/bnyro/trivia/util/PreferenceHelper.kt b/app/src/main/java/com/bnyro/trivia/util/PreferenceHelper.kt
@@ -152,7 +152,7 @@ object PreferenceHelper {
             context.getString(R.string.questions_delay_default)
         )
         return when (questionsDelayPref) {
-            "auto" -> correctAnswer.wordCount() * 400L
+            "auto" -> correctAnswer.wordCount() * 1000L
             "infinite" -> null
             else -> questionsDelayPref.toLong()
         }