Merge pull request #18 from patjackson52/feature/generic

make game generic

Author: patjackson52

app/src/main/java/com/willowtreeapps/namegame/store/GameResultsFragment.kt

@@ -49,7 +49,7 @@ class GameResultsFragment : Fragment(), CoroutineScope, GameResultsView, MainAct
     }
 
     override fun showResults(viewState: GameResultsViewState) {
-        txt_results.text = viewState.resultsText
+        txt_questionTitle.text = viewState.resultsText
         txt_message.text = viewState.messageText
     }
 

app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt

@@ -190,8 +190,8 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
 
     private fun setProfileAndFadeIn(viewState: QuestionViewState) {
         with(viewState) {
-            txt_results.text = title
-            GlideApp.with(this@QuestionFragment).load(profileImageUrl)
+            txt_question_title.text = title
+            GlideApp.with(this@QuestionFragment).load(itemImageUrl)
                     .transition(DrawableTransitionOptions.withCrossFade())
                     .onComplete {
                         showButtons()

app/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt

@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import com.willowtreeapps.common.QuestionCategoryId
 import com.willowtreeapps.common.SettingsViewState
 import com.willowtreeapps.common.ui.SettingsPresenter
 import com.willowtreeapps.common.ui.SettingsView
@@ -41,6 +42,13 @@ class SettingsDialogFragment: DialogFragment(), SettingsView {
         numberPicker.setOnValueChangedListener { _, _, newVal ->
             presenter?.numQuestionsChanged(newVal)
         }
+
+        categoryPicker.displayedValues = QuestionCategoryId.displayNameList.toTypedArray()
+        categoryPicker.maxValue = 0
+        categoryPicker.maxValue = QuestionCategoryId.displayNameList.toTypedArray().size - 1
+        categoryPicker.setOnValueChangedListener { _, _, newVal ->
+            presenter?.categoryChanged(QuestionCategoryId.fromOrdinal(newVal))
+        }
         btn_ok.setOnClickListener { dismiss() }
     }
 
@@ -56,5 +64,6 @@ class SettingsDialogFragment: DialogFragment(), SettingsView {
 
     override fun showSettings(viewState: SettingsViewState) {
         numberPicker.value = viewState.numQuestions
+        categoryPicker.value = QuestionCategoryId.values().indexOf(viewState.categoryId)
     }
 }

app/src/main/res/layout/fragment_game_results.xml

@@ -13,7 +13,7 @@
 
 
   <TextView
-      android:id="@+id/txt_results"
+      android:id="@+id/txt_questionTitle"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="64dp"

app/src/main/res/layout/fragment_question.xml

@@ -12,7 +12,7 @@
     tools:context="com.willowtreeapps.namegame.MainActivity">
 
   <TextView
-      android:id="@+id/txt_results"
+      android:id="@+id/txt_question_title"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="64dp"
@@ -30,7 +30,7 @@
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHorizontal_bias="0.5"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/txt_results"
+      app:layout_constraintTop_toBottomOf="@+id/txt_question_title"
       tools:srcCompat="@tools:sample/avatars" />
 
   <Button
@@ -101,7 +101,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginBottom="64dp"
-      android:text="Next Tree"
+      android:text="Next"
       android:visibility="gone"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toStartOf="@+id/button2"

app/src/main/res/layout/fragment_settings.xml

@@ -5,8 +5,7 @@
     android:layout_width="300dp"
     android:layout_height="400dp"
     android:minWidth="300dp"
-    android:minHeight="400dp"
-    >
+    android:minHeight="400dp">
 
     <Button
         android:id="@+id/btn_ok"
@@ -24,21 +23,40 @@
         android:id="@+id/numberPicker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginTop="32dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/categoryPicker"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <NumberPicker
+        android:id="@+id/categoryPicker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        app:layout_constraintEnd_toStartOf="@+id/numberPicker"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/txt_num_questions"
-        android:layout_width="wrap_content"
+        android:layout_width="70dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:gravity="center"
         android:text="Number of Questions"
         app:layout_constraintEnd_toEndOf="@+id/numberPicker"
         app:layout_constraintStart_toStartOf="@+id/numberPicker"
         app:layout_constraintTop_toBottomOf="@+id/numberPicker" />
+
+    <TextView
+        android:id="@+id/txt_num_questions2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Category"
+        app:layout_constraintEnd_toEndOf="@+id/categoryPicker"
+        app:layout_constraintStart_toStartOf="@+id/categoryPicker"
+        app:layout_constraintTop_toBottomOf="@+id/categoryPicker" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/styles.xml

@@ -15,6 +15,7 @@
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent
         </item>
+        <item name="android:buttonStyle">@style/ChoiceButton</item>
     </style>
 
     <style name="AppTheme.TransparentTheme">

app/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt

@@ -1,8 +1,9 @@
 package com.willowtreeapps.namegame
 
 import com.willowtreeapps.common.*
-import com.willowtreeapps.common.boundary.displayName
 import com.willowtreeapps.common.repo.MockRepositoryFactory
+import com.willowtreeapps.common.repo.ProfileItemRepository
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.*
 import org.junit.Test
 import java.lang.Exception
@@ -32,34 +33,35 @@ class ReducersTest {
 
     @Test
     fun `generate N distinct random rounds`() {
-        val profiles = MockRepositoryFactory.getValidResponse()
-        val rounds = generateRounds(profiles, 10)
+
+        val itemHolder = runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response
+        val rounds = generateRounds(itemHolder?.items!!, 10)
 
         assertEquals(10, rounds.size)
-        assertEquals(10, rounds.distinctBy { it.profileId }.size)
+        assertEquals(10, rounds.distinctBy { it.itemId }.size)
     }
 
     @Test
     fun `isLoadingProfiles set true`() {
-        val final = reducer(generateInitialTestState(), Actions.FetchingProfilesStartedAction())
+        val final = reducer(generateInitialTestState(), Actions.FetchingItemsStartedAction())
 
-        assertTrue(final.isLoadingProfiles)
+        assertTrue(final.isLoadingItems)
     }
 
     @Test
     fun `isLoadingProfiles set false on success`() {
-        val initial = generateInitialTestState().copy(isLoadingProfiles = true)
-        val final = reducer(initial, Actions.FetchingProfilesSuccessAction(MockRepositoryFactory.getValidResponse()))
+        val initial = generateInitialTestState().copy(isLoadingItems = true)
+        val final = reducer(initial, Actions.FetchingItemsSuccessAction(runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response!!))
 
-        assertFalse(final.isLoadingProfiles)
+        assertFalse(final.isLoadingItems)
     }
 
     @Test
     fun `isLoadingProfiles set false on failure`() {
-        val initial = generateInitialTestState().copy(isLoadingProfiles = true)
-        val final = reducer(initial, Actions.FetchingProfilesFailedAction("Test failure"))
+        val initial = generateInitialTestState().copy(isLoadingItems = true)
+        val final = reducer(initial, Actions.FetchingItemsFailedAction("Test failure"))
 
-        assertFalse(final.isLoadingProfiles)
+        assertFalse(final.isLoadingItems)
     }
 
     @Test
@@ -81,7 +83,7 @@ class ReducersTest {
     @Test
     fun `mark current round as CORRECT when name matches`() {
         val initial = generateInitialTestState()
-        val answer = initial.currentQuestionProfile().displayName()
+        val answer = initial.currentQuestionItem().displayName()
 
         val final = reducer(initial, Actions.NamePickedAction(answer))
 
@@ -136,7 +138,7 @@ class ReducersTest {
     }
 
     private fun generateInitialTestState(): AppState {
-        val initialState = reducer(AppState(), Actions.FetchingProfilesSuccessAction(MockRepositoryFactory.getValidResponse()))
+        val initialState = reducer(AppState(), Actions.FetchingItemsSuccessAction(runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response!!))
         return initialState
     }
 }

app/src/test/java/com/willowtreeapps/namegame/ExampleUnitTest.kt renamed to app/src/test/java/com/willowtreeapps/namegame/RepositoriesTest.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.parse
 import org.junit.Assert.*
+import org.junit.Ignore
 import org.junit.Test
 
 
@@ -15,29 +16,37 @@ import org.junit.Test
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
-class ExampleUnitTest {
+class RepositoriesTest {
     private val repo = KtorProfilesRepository()
 
+    @Ignore
     @Test
     fun fetchProfiles() {
-        GlobalScope.launch {
-            async {
-                val result = repo.profiles()
-                if (result.isSuccessful) {
-                    assertNotNull(result.response)
-                    assertTrue(result.response?.isNotEmpty() ?: false)
-                } else {
-                    fail("Failure response from profiles repo: ${result.message}")
-                }
-            }.await()
+        val result = runBlocking { repo.profiles() }
+        if (result.isSuccessful) {
+            assertNotNull(result.response)
+            assertTrue(result.response?.isNotEmpty() ?: false)
+        } else {
+            fail("Failure response from cats repo: ${result.message}")
         }
-        Thread.sleep(5000)
     }
 
     @Test
     fun deserializeProfilesResponse() {
         val response = Json.nonstrict.parse(ProfileListHolderSerializer(), MockRepositoryFactory.VALID_RESPONSE_JSON)
         assertNotNull(response.profiles)
     }
+
+    @Ignore
+    @Test
+    fun fetchDogs() {
+        val result = runBlocking { repo.profiles() }
+        if (result.isSuccessful) {
+            assertNotNull(result.response)
+            assertTrue(result.response?.isNotEmpty() ?: false)
+        } else {
+            fail("Failure response from cats repo: ${result.message}")
+        }
+    }
 }
 

common/src/androidMain/kotlin/com/willowtreeapps/common/PlatformDispatcher.kt

@@ -7,6 +7,6 @@ import kotlin.coroutines.CoroutineContext
 
 actual object PlatformDispatcher : CoroutineDispatcher() {
     override fun dispatch(context: CoroutineContext, block: Runnable) {
-        Dispatchers.Main.dispatch(context, block)
+        Dispatchers.IO.dispatch(context, block)
     }
 }