clean up

Author: patjackson52

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

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

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

@@ -41,9 +41,10 @@
 
     <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/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt

@@ -38,30 +38,30 @@ class ReducersTest {
         val rounds = generateRounds(profiles!!, 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(runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response!!))
+        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
@@ -138,7 +138,7 @@ class ReducersTest {
     }
 
     private fun generateInitialTestState(): AppState {
-        val initialState = reducer(AppState(), Actions.FetchingProfilesSuccessAction(runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response!!))
+        val initialState = reducer(AppState(), Actions.FetchingItemsSuccessAction(runBlocking {  ProfileItemRepository(MockRepositoryFactory().success()).fetchItems()}.response!!))
         return initialState
     }
 }

common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt

@@ -5,9 +5,9 @@ import com.willowtreeapps.common.repo.Profile
 
 sealed class Actions : Action {
 
-    class FetchingProfilesStartedAction
-    class FetchingProfilesSuccessAction(val profiles: List<Item>)
-    class FetchingProfilesFailedAction(val message: String)
+    class FetchingItemsStartedAction
+    class FetchingItemsSuccessAction(val items: List<Item>)
+    class FetchingItemsFailedAction(val message: String)
 
     class NamePickedAction(val name: String)
 

common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt

@@ -1,8 +1,8 @@
 package com.willowtreeapps.common
 
-data class AppState(val isLoadingProfiles: Boolean = false,
+data class AppState(val isLoadingItems: Boolean = false,
                     val items: List<Item> = listOf(),
-                    val errorLoadingProfiles: Boolean = false,
+                    val errorLoadingItems: Boolean = false,
                     val errorMsg: String = "",
                     val currentQuestionIndex: Int = 0,
                     val waitingForNextQuestion: Boolean = false,
@@ -23,20 +23,20 @@ data class AppState(val isLoadingProfiles: Boolean = false,
         else
             null
 
-    fun getItem(id: ProfileId?) = items.find { it.id == id }
+    fun getItem(id: ItemId?) = items.find { it.id == id }
 
-    fun currentQuestionItem() = getItem(currentQuestion?.profileId)!!
+    fun currentQuestionItem() = getItem(currentQuestion?.itemId)!!
 
     fun isGameComplete(): Boolean = currentQuestionIndex >= questions.size || (currentQuestionIndex == questions.size - 1 && questions[currentQuestionIndex].status != Question.Status.UNANSWERED)
 
     val numCorrect: Int
         get() = questions.count { it.status == Question.Status.CORRECT }
 }
 
-inline class ProfileId(val id: String)
+inline class ItemId(val id: String)
 
-data class Question(val profileId: ProfileId,
-                    val choices: List<ProfileId>,
+data class Question(val itemId: ItemId,
+                    val choices: List<ItemId>,
                     val status: Status = Status.UNANSWERED,
                     val answerName: String? = null) {
     enum class Status {
@@ -47,7 +47,7 @@ data class Question(val profileId: ProfileId,
     }
 }
 
-data class Item(val id: ProfileId,
+data class Item(val id: ItemId,
                 val imageUrl: String,
                 val firstName: String,
                 val lastName: String) {

common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt

@@ -26,14 +26,14 @@ class NetworkThunks(private val networkContext: CoroutineContext,
         val repo = repoForCategory(categoryId)
         Logger.d("Fetching StoreInfo and Feed")
         launch {
-            store.dispatch(Actions.FetchingProfilesStartedAction())
+            store.dispatch(Actions.FetchingItemsStartedAction())
             val result = repo.fetchItems()
             if (result.isSuccessful) {
                 Logger.d("Success")
-                store.dispatch(Actions.FetchingProfilesSuccessAction(result.response!!))
+                store.dispatch(Actions.FetchingItemsSuccessAction(result.response!!))
             } else {
                 Logger.d("Failure")
-                store.dispatch(Actions.FetchingProfilesFailedAction(result.message!!))
+                store.dispatch(Actions.FetchingItemsFailedAction(result.message!!))
             }
             Logger.d("DONE")
         }

common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt

@@ -11,12 +11,12 @@ import kotlin.random.Random
  */
 fun reducer(state: AppState, action: Any): AppState =
         when (action) {
-            is FetchingProfilesStartedAction -> state.copy(isLoadingProfiles = true)
-            is FetchingProfilesSuccessAction -> {
-                val rounds = generateRounds(action.profiles, state.settings.numQuestions)
-                state.copy(isLoadingProfiles = false, items = action.profiles, questions = rounds)
+            is FetchingItemsStartedAction -> state.copy(isLoadingItems = true)
+            is FetchingItemsSuccessAction -> {
+                val rounds = generateRounds(action.items, state.settings.numQuestions)
+                state.copy(isLoadingItems = false, items = action.items, questions = rounds)
             }
-            is FetchingProfilesFailedAction -> state.copy(isLoadingProfiles = false, errorLoadingProfiles = true, errorMsg = action.message)
+            is FetchingItemsFailedAction -> state.copy(isLoadingItems = false, errorLoadingItems = true, errorMsg = action.message)
             is NamePickedAction -> {
                 val status = if (state.currentQuestionItem().matches(action.name)) {
                     Question.Status.CORRECT
@@ -46,13 +46,13 @@ fun reducer(state: AppState, action: Any): AppState =
             else -> throw AssertionError("Action ${action::class.simpleName} not handled")
         }
 
-fun generateRounds(profiles: List<Item>, n: Int): List<Question> =
-        profiles.takeRandomDistinct(n)
-                .map {
-                    val choiceList = profiles.takeRandomDistinct(3).toMutableList()
-                    choiceList.add(abs(random.nextInt() % 4), it)
+fun generateRounds(items: List<Item>, n: Int): List<Question> =
+        items.takeRandomDistinct(n)
+                .map { item ->
+                    val choiceList = items.takeRandomDistinct(3).toMutableList()
+                    choiceList.add(abs(random.nextInt() % 4), item)
 
-                    Question(profileId = it.id, choices = choiceList
+                    Question(itemId = item.id, choices = choiceList
                             .map { it.id })
                 }
 

common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt

@@ -1,25 +1,24 @@
 package com.willowtreeapps.common.boundary
 
 import com.willowtreeapps.common.*
-import com.willowtreeapps.common.repo.Profile
 
 /**
  * Functions for transforming AppState data into ViewState data to be used by Views.
  */
 fun AppState.toQuestionViewState(): QuestionViewState {
-    val profile = currentQuestionItem()
-    val imageUrl = profile.imageUrl
+    val item = currentQuestionItem()
+    val imageUrl = item.imageUrl
     val choice1 = getItem(currentQuestion?.choices?.get(0))!!.displayName()
     val choice2 = getItem(currentQuestion?.choices?.get(1))!!.displayName()
     val choice3 = getItem(currentQuestion?.choices?.get(2))!!.displayName()
     val choice4 = getItem(currentQuestion?.choices?.get(3))!!.displayName()
-    val correctBtnNum = currentQuestion?.choices?.indexOfFirst { it == profile.id }!! + 1
+    val correctBtnNum = currentQuestion?.choices?.indexOfFirst { it == item.id }!! + 1
     var selectedBtnNum = currentQuestion?.choices?.indexOfFirst { getItem(it)?.matches(currentQuestion?.answerName ?: "") ?: false}
     if (selectedBtnNum != null) {
         selectedBtnNum += 1
     }
     return QuestionViewState(title = "Who is this?",
-            profileImageUrl = imageUrl,
+            itemImageUrl = imageUrl,
             currentQuestion = (currentQuestionIndex + 1).toString(),
             numQuestions = questions.size.toString(),
             button1Text = choice1,
@@ -31,9 +30,6 @@ fun AppState.toQuestionViewState(): QuestionViewState {
             selectedBtnNum =  selectedBtnNum ?: -1)
 }
 
-fun Profile.displayName() = "$firstName $lastName"
-
-
 fun AppState.toGameResultsViewState(): GameResultsViewState {
     val percentage = ((numCorrect.toFloat() / questions.size) * 100).toInt()
     val messageText = when (percentage) {

common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/NavigationMiddleware.kt

@@ -9,7 +9,7 @@ class NavigationMiddleware(val navigator: Navigator) {
     fun dispatch(store: Store<AppState>, nextDispatcher: (Any) -> Any, action: Any): Any {
         val result = nextDispatcher(action)
         when (action) {
-            is Actions.FetchingProfilesSuccessAction -> navigator.goto(Screen.QUESTION)
+            is Actions.FetchingItemsSuccessAction -> navigator.goto(Screen.QUESTION)
             is Actions.GameCompleteAction -> navigator.goto(Screen.GAME_COMPLETE)
             is Actions.StartOverAction -> navigator.goto(Screen.START)
             is Actions.SettingsTappedAction -> navigator.goto(Screen.SETTINGS)

common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt

@@ -2,7 +2,7 @@ package com.willowtreeapps.common.repo
 
 import com.willowtreeapps.common.Item
 import com.willowtreeapps.common.PlatformDispatcher
-import com.willowtreeapps.common.ProfileId
+import com.willowtreeapps.common.ItemId
 
 /**
  * interface for providing list of items for the game.  Items are generic representation.
@@ -16,7 +16,7 @@ class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepositor
     override suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError> {
         val results = repo.profiles()
         return if (results.isSuccessful) {
-            GatewayResponse.createSuccess(results.response?.map { Item(id = ProfileId(it.id), firstName = it.firstName, lastName = it.lastName, imageUrl = "https:${it.headshot.url}") },
+            GatewayResponse.createSuccess(results.response?.map { Item(id = ItemId(it.id), firstName = it.firstName, lastName = it.lastName, imageUrl = "https:${it.headshot.url}") },
                     200, "")
         } else {
             GatewayResponse.createError(GenericError("Error"), 500, "")
@@ -30,7 +30,7 @@ class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(Platfo
         val results = repo.dogs()
         return if (results.isSuccessful) {
             GatewayResponse.createSuccess(results.response?.map {
-                Item(id = ProfileId(it.breed + "_" + it.subBreed),
+                Item(id = ItemId(it.breed + "_" + it.subBreed),
                         firstName = it.breed, lastName = it.subBreed ?: "",
                         imageUrl = it.imageUrl)
             },
@@ -47,7 +47,7 @@ class CatItemRepository(val repo: KtorCatsRepository = KtorCatsRepository(Platfo
         val results = repo.allBreeds()
         return if (results.isSuccessful) {
             GatewayResponse.createSuccess(results.response?.map {
-                Item(id = ProfileId(it.id),
+                Item(id = ItemId(it.id),
                         firstName = it.breed, lastName = "",
                         imageUrl = it.imageUrl)
             },