improved Cat & dog api. broken iOS build

patjackson52 · patjackson52 · commit 416fef9e1005 · 2019-04-12T11:56:46.000-04:00
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/GameResultsFragment.kt b/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
     }
 
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt b/app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt
@@ -190,7 +190,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
 
     private fun setProfileAndFadeIn(viewState: QuestionViewState) {
         with(viewState) {
-            txt_results.text = title
+            txt_question_title.text = title
             GlideApp.with(this@QuestionFragment).load(itemImageUrl)
                     .transition(DrawableTransitionOptions.withCrossFade())
                     .onComplete {
diff --git a/app/src/main/res/layout/fragment_game_results.xml b/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"
diff --git a/app/src/main/res/layout/fragment_question.xml b/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"
diff --git a/app/src/main/res/values/styles.xml b/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">
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt
@@ -1,12 +1,13 @@
 package com.willowtreeapps.common
 
 import com.beyondeye.reduks.Action
+import com.willowtreeapps.common.repo.ItemsHolder
 import com.willowtreeapps.common.repo.Profile
 
 sealed class Actions : Action {
 
     class FetchingItemsStartedAction
-    class FetchingItemsSuccessAction(val items: List<Item>)
+    class FetchingItemsSuccessAction(val itemsHolder: ItemsHolder)
     class FetchingItemsFailedAction(val message: String)
 
     class NamePickedAction(val name: String)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt
@@ -8,14 +8,19 @@ data class AppState(val isLoadingItems: Boolean = false,
                     val waitingForNextQuestion: Boolean = false,
                     val waitingForResultsTap: Boolean = false,
                     val questionClock: Int = -1,
+                    val questionTitle: String = "",
                     val questions: List<Question> = listOf(),
                     val settings: UserSettings = UserSettings.defaults()) {
     companion object {
         val INITIAL_STATE = AppState()
     }
 
     val timerText: String
-        get() = if (questionClock < 0) "" else if (questionClock >= 0) questionClock.toString() else "TIME'S UP!!"
+        get() = when {
+            questionClock < 0 -> ""
+            questionClock > 0 -> questionClock.toString()
+            else -> "TIME'S UP!!"
+        }
 
     val currentQuestion: Question?
         get() = if (questions.size > currentQuestionIndex)
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt
@@ -13,8 +13,11 @@ fun reducer(state: AppState, action: Any): AppState =
         when (action) {
             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)
+                val rounds = generateRounds(action.itemsHolder.items, state.settings.numQuestions)
+                state.copy(isLoadingItems = false,
+                        items = action.itemsHolder.items,
+                        questionTitle = action.itemsHolder.questionTitle,
+                        questions = rounds)
             }
             is FetchingItemsFailedAction -> state.copy(isLoadingItems = false, errorLoadingItems = true, errorMsg = action.message)
             is NamePickedAction -> {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt
@@ -17,7 +17,7 @@ fun AppState.toQuestionViewState(): QuestionViewState {
     if (selectedBtnNum != null) {
         selectedBtnNum += 1
     }
-    return QuestionViewState(title = "Who is this?",
+    return QuestionViewState(title = questionTitle,
             itemImageUrl = imageUrl,
             currentQuestion = (currentQuestionIndex + 1).toString(),
             numQuestions = questions.size.toString(),
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt
@@ -9,15 +9,19 @@ import com.willowtreeapps.common.ItemId
  * This may be used for any data source to generate questions.
  */
 interface ItemRepository {
-    suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError>
+    suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError>
 }
 
+data class ItemsHolder(val questionTitle: String,
+                       val items: List<Item>)
+
 class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepository()) : ItemRepository {
-    override suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError> {
+    override suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError> {
         val results = repo.profiles()
         return if (results.isSuccessful) {
-            GatewayResponse.createSuccess(results.response?.map { Item(id = ItemId(it.id), firstName = it.firstName, lastName = it.lastName, imageUrl = "https:${it.headshot.url}") },
-                    200, "")
+            val itemHolder = ItemsHolder(questionTitle = "Who is this?",
+                    items = results.response?.map { Item(id = ItemId(it.id), firstName = it.firstName, lastName = it.lastName, imageUrl = "https:${it.headshot.url}") }!!)
+            GatewayResponse.createSuccess(itemHolder, 200, "")
         } else {
             GatewayResponse.createError(GenericError("Error"), 500, "")
         }
@@ -26,15 +30,16 @@ class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepositor
 }
 
 class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(PlatformDispatcher)) : ItemRepository {
-    override suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError> {
+    override suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError> {
         val results = repo.dogs()
         return if (results.isSuccessful) {
-            GatewayResponse.createSuccess(results.response?.map {
+            val itemsHolder = ItemsHolder(questionTitle = "Name the breed",
+                    items = results.response?.map {
                 Item(id = ItemId(it.breed + "_" + it.subBreed),
                         firstName = it.breed, lastName = it.subBreed ?: "",
                         imageUrl = it.imageUrl)
-            },
-                    200, "")
+            }!!)
+            GatewayResponse.createSuccess(itemsHolder, 200, "")
         } else {
             GatewayResponse.createError(GenericError("Error"), 500, "")
         }
@@ -43,19 +48,19 @@ class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(Platfo
 }
 
 class CatItemRepository(val repo: KtorCatsRepository = KtorCatsRepository(PlatformDispatcher)) : ItemRepository {
-    override suspend fun fetchItems(): GatewayResponse<List<Item>, GenericError> {
+    override suspend fun fetchItems(): GatewayResponse<ItemsHolder, GenericError> {
         val results = repo.allBreeds()
-        return if (results.isSuccessful) {
-            GatewayResponse.createSuccess(results.response?.map {
+        val itemsHolder = ItemsHolder(questionTitle = "Name the breed",
+                items = results.response?.map {
                 Item(id = ItemId(it.id),
                         firstName = it.breed, lastName = "",
                         imageUrl = it.imageUrl)
-            },
-                    200, "")
+            }!!)
+        return if (results.isSuccessful) {
+            GatewayResponse.createSuccess(itemsHolder, 200, "")
         } else {
             GatewayResponse.createError(GenericError("Error"), 500, "")
         }
     }
-
 }
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/KtorCatsRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/KtorCatsRepository.kt
@@ -1,5 +1,6 @@
 package com.willowtreeapps.common.repo
 
+import com.willowtreeapps.common.util.profile
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
@@ -35,13 +36,18 @@ open class KtorCatsRepository(private val networkContext: CoroutineContext) : Co
             val response: CatBreedListHolder = client.get {
                 apiUrl(ALL_BREEDS_PATH)
             }
-            val listOfBreeds = response.cats.map {
-                val image = retrySuccessOrThrow(2, 2000, Exception(), suspend { image(it.id) } )
-                Cat(id = it.id,
-                        breed = it.name,
-                        altNames = it.alt_names?.split(",") ?: listOf(),
-                        imageUrl = image.response?.first()?.url!!
+
+            val listOfBreeds = profile("fetch all ${response.cats.size} cat image data") {
+                response.cats.map {
+                    async {
+                        val image = retrySuccessOrThrow(2, 2000, Exception(), suspend { image(it.id) })
+                        Cat(id = it.id,
+                                breed = it.name,
+                                altNames = it.alt_names?.split(",") ?: listOf(),
+                                imageUrl = image.response?.first()?.url!!
                         )
+                    }
+                }.awaitAll()
             }
             GatewayResponse.createSuccess(listOfBreeds, 200, "Success")
         } catch (e: Exception) {
@@ -136,6 +142,7 @@ class CatBreedListHolderSerializer : KSerializer<CatBreedListHolder> {
     }
 
 }
+
 class CatImageListHolderSerializer : KSerializer<CatImageListHolder> {
 
     override val descriptor = object : SerialClassDescImpl("Inner") {}
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/KtorDogsRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/KtorDogsRepository.kt
@@ -1,5 +1,6 @@
 package com.willowtreeapps.common.repo
 
+import com.willowtreeapps.common.util.profile
 import io.ktor.client.HttpClient
 import io.ktor.client.features.json.JsonFeature
 import io.ktor.client.features.json.serializer.KotlinxSerializer
@@ -35,29 +36,31 @@ open class KtorDogsRepository(private val networkContext: CoroutineContext) : Co
             val response: DogResponse = client.get {
                 apiUrl(ALL_BREEDS_PATH)
             }
-            val listOfBreeds = response.message.map { breed ->
-                if (breed.value.isNotEmpty()) {
-                    breed.value.map { subBreed ->
-                        async {
+            val listOfBreeds = profile("fetching all ${response.message.keys.size} dog image data") {
+                response.message.map { breed ->
+                    if (breed.value.isNotEmpty()) {
+                        breed.value.map { subBreed ->
+                            async {
+                                val dogImageResponse = retrySuccessOrThrow(
+                                        numRetries = 3,
+                                        retryWaitInMs = 2000,
+                                        f = suspend { randomSubBreedImage(breed.key, subBreed) },
+                                        ex = Exception("Unable to fetch image for $subBreed"))
+                                Dog(breed = breed.key, subBreed = subBreed, imageUrl = dogImageResponse.response?.message!!)
+                            }
+                        }
+                    } else {
+                        listOf(async {
                             val dogImageResponse = retrySuccessOrThrow(
                                     numRetries = 3,
                                     retryWaitInMs = 2000,
-                                    f = suspend { randomSubBreedImage(breed.key, subBreed) },
-                                    ex = Exception("Unable to fetch image for $subBreed"))
-                            Dog(breed = breed.key, subBreed = subBreed, imageUrl = dogImageResponse.response?.message!!)
-                        }
+                                    f = suspend { randomBreedImage(breed.key) },
+                                    ex = Exception("Unable to fetch image for $breed"))
+                            Dog(breed = breed.key, imageUrl = dogImageResponse.response?.message!!)
+                        })
                     }
-                } else {
-                    listOf(async {
-                        val dogImageResponse = retrySuccessOrThrow(
-                                numRetries = 3,
-                                retryWaitInMs = 2000,
-                                f = suspend { randomBreedImage(breed.key) },
-                                ex = Exception("Unable to fetch image for $breed"))
-                        Dog(breed = breed.key, imageUrl = dogImageResponse.response?.message!!)
-                    })
-                }
-            }.flatten().awaitAll()
+                }.flatten().awaitAll()
+            }
 
             GatewayResponse.createSuccess(listOfBreeds, 200, "Success")
         } catch (e: Exception) {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/util/ProfileUtil.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/util/ProfileUtil.kt
@@ -0,0 +1,10 @@
+package com.willowtreeapps.common.util
+
+import com.willowtreeapps.common.Logger
+
+inline fun <T> profile(label: String, f: () -> T): T {
+    val startMs = TimeUtil.systemTimeMs()
+    val result = f()
+    Logger.d("$label: ${TimeUtil.systemTimeMs() - startMs}ms")
+    return result
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-rc-2-all.zip
+z;ipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip
diff --git a/iOS/NameGame/NameGame.xcodeproj/project.pbxproj b/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
diff --git a/iOS/NameGame/NameGame/Base.lproj/Main.storyboard b/iOS/NameGame/NameGame/Base.lproj/Main.storyboard
diff --git a/iOS/NameGame/NameGame/SettingsViewController.swift b/iOS/NameGame/NameGame/SettingsViewController.swift
diff --git a/iOS/NameGame/common.framework/Headers/common.h b/iOS/NameGame/common.framework/Headers/common.h
diff --git a/iOS/NameGame/common.framework/Info.plist b/iOS/NameGame/common.framework/Info.plist
diff --git a/iOS/NameGame/common.framework/Modules/module.modulemap b/iOS/NameGame/common.framework/Modules/module.modulemap
diff --git a/iOS/NameGame/common.framework/common b/iOS/NameGame/common.framework/common

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class GameResultsFragment : Fragment(), CoroutineScope, GameResultsView, MainAct`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`override fun showResults(viewState: GameResultsViewState) {`
`52`		`- txt_results.text = viewState.resultsText`
	`52`	`+ txt_questionTitle.text = viewState.resultsText`
`53`	`53`	`txt_message.text = viewState.messageText`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ fun AppState.toQuestionViewState(): QuestionViewState {`
`17`	`17`	`if (selectedBtnNum != null) {`
`18`	`18`	`selectedBtnNum += 1`
`19`	`19`	`}`
`20`		`- return QuestionViewState(title = "Who is this?",`
	`20`	`+ return QuestionViewState(title = questionTitle,`
`21`	`21`	`itemImageUrl = imageUrl,`
`22`	`22`	`currentQuestion = (currentQuestionIndex + 1).toString(),`
`23`	`23`	`numQuestions = questions.size.toString(),`