add category selection to settings - android working

patjackson52 · patjackson52 · commit 6e504627d7fe · 2019-04-11T13:25:55.000-04:00
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt b/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)
     }
 }
diff --git a/app/src/main/res/layout/fragment_settings.xml b/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,11 +23,19 @@
         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" />
 
@@ -41,4 +48,14 @@
         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>
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt
@@ -25,7 +25,9 @@ sealed class Actions : Action {
 
     class SettingsTappedAction
     class LoadAllSettingsAction
+    class SettingsLoadedAction(val settings: UserSettings)
     class ChangeNumQuestionsSettingsAction(val num: Int)
+    class ChangeCategorySettingsAction(val categoryId: QuestionCategoryId)
 
 }
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt
@@ -1,8 +1,5 @@
 package com.willowtreeapps.common
 
-import com.willowtreeapps.common.boundary.displayName
-import com.willowtreeapps.common.repo.Profile
-
 data class AppState(val isLoadingProfiles: Boolean = false,
                     val items: List<Item> = listOf(),
                     val errorLoadingProfiles: Boolean = false,
@@ -63,9 +60,24 @@ data class Item(val id: ProfileId,
 
 }
 
-data class UserSettings(val numQuestions: Int) {
+enum class QuestionCategoryId(val displayName: String) {
+    WILLOW_TREE("WillowTree"),
+    DOGS("Dogs"),
+    CATS("Cats");
+
+    companion object {
+        val displayNameList by lazy {
+            values().map { it.displayName }
+        }
+
+        fun fromOrdinal(ordinal: Int) = values()[ordinal]
+    }
+}
+
+data class UserSettings(val numQuestions: Int,
+                        val categoryId: QuestionCategoryId) {
     companion object {
-        fun defaults() = UserSettings(3)
+        fun defaults() = UserSettings(3, categoryId = QuestionCategoryId.CATS)
     }
 }
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt
@@ -15,9 +15,15 @@ class NetworkThunks(private val networkContext: CoroutineContext,
     override val coroutineContext: CoroutineContext
         get() = networkContext + job
 
-    private val repo = CatItemRepository()
+    //TODO cache the repositories
+    private fun repoForCategory(categoryId: QuestionCategoryId) = when (categoryId) {
+        QuestionCategoryId.WILLOW_TREE -> ProfileItemRepository()
+        QuestionCategoryId.CATS -> CatItemRepository()
+        QuestionCategoryId.DOGS -> DogItemRepository()
+    }
 
-    fun fetchProfiles(): ThunkImpl<AppState> = ThunkFn { dispatcher, state ->
+    fun fetchItems(categoryId: QuestionCategoryId): ThunkImpl<AppState> = ThunkFn { dispatcher, state ->
+        val repo = repoForCategory(categoryId)
         Logger.d("Fetching StoreInfo and Feed")
         launch {
             store.dispatch(Actions.FetchingProfilesStartedAction())
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt
@@ -40,6 +40,8 @@ fun reducer(state: AppState, action: Any): AppState =
             }
 
             is ChangeNumQuestionsSettingsAction -> state.copy(settings = state.settings.copy(numQuestions = action.num))
+            is ChangeCategorySettingsAction -> state.copy(settings = state.settings.copy(categoryId = action.categoryId))
+            is SettingsLoadedAction -> state.copy(settings = action.settings)
 
             else -> throw AssertionError("Action ${action::class.simpleName} not handled")
         }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt
@@ -48,7 +48,7 @@ fun AppState.toGameResultsViewState(): GameResultsViewState {
             messageText = messageText)
 }
 
-fun UserSettings.toViewState(): SettingsViewState = SettingsViewState(this.numQuestions)
+fun UserSettings.toViewState(): SettingsViewState = SettingsViewState(this.numQuestions, this.categoryId)
 
 //TODO should this be here?
 private fun AppState.roundTotals() = "${currentQuestionIndex + 1} out of ${questions.size}"
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/SettingsMiddleware.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/middleware/SettingsMiddleware.kt
@@ -4,6 +4,7 @@ import com.beyondeye.reduks.Store
 import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.Actions.ChangeNumQuestionsSettingsAction
 import com.willowtreeapps.common.AppState
+import com.willowtreeapps.common.UserSettings
 import com.willowtreeapps.common.repo.LocalStorageSettingsRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -22,10 +23,13 @@ class SettingsMiddleware(private val settings: LocalStorageSettingsRepository,
     fun dispatch(store: Store<AppState>, nextDispatcher: (Any) -> Any, action: Any): Any {
         launch {
             when (action) {
-                is ChangeNumQuestionsSettingsAction -> settings.saveNumRounds(action.num)
+                is ChangeNumQuestionsSettingsAction -> settings.numRounds = action.num
+
+                is Actions.ChangeCategorySettingsAction -> settings.categoryId = action.categoryId
 
                 is Actions.LoadAllSettingsAction -> {
-                    store.dispatch(ChangeNumQuestionsSettingsAction(settings.loadNumRounds()))
+                    val settings = UserSettings(numQuestions = settings.numRounds, categoryId = settings.categoryId)
+                    store.dispatch(Actions.SettingsLoadedAction(settings))
                 }
             }
         }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/SettingsRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/SettingsRepository.kt
@@ -3,18 +3,26 @@ package com.willowtreeapps.common.repo
 import com.russhwolf.settings.Settings
 import com.russhwolf.settings.get
 import com.russhwolf.settings.set
+import com.willowtreeapps.common.QuestionCategoryId
 
 expect fun userSettings(context: Any? = null): Settings
 
 class LocalStorageSettingsRepository(private val settings: Settings) {
 
-    fun saveNumRounds(numRounds: Int) {
-        settings[NUM_ROUNDS] = numRounds
-    }
+    var numRounds: Int
+        get() = settings.getInt(NUM_ROUNDS, 4)
+        set(numRounds) {
+            settings[NUM_ROUNDS] = numRounds
+        }
 
-    fun loadNumRounds(): Int = settings.getInt(NUM_ROUNDS, 4)
+    var categoryId: QuestionCategoryId
+        get() = QuestionCategoryId.valueOf(settings.getString(CATEGORY_ID, QuestionCategoryId.CATS.toString()))
+        set(categoryId) {
+            settings[CATEGORY_ID] = categoryId.toString()
+        }
 
     companion object {
-        const val NUM_ROUNDS = "NUM_ROUNDS"
+        private const val NUM_ROUNDS = "NUM_ROUNDS"
+        private const val CATEGORY_ID = "CATEGORY_ID"
     }
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsPresenter.kt
@@ -1,12 +1,11 @@
 package com.willowtreeapps.common.ui
 
-import com.beyondeye.reduks.SelectorSubscriberBuilder
 import com.beyondeye.reduks.SelectorSubscriberFn
 import com.beyondeye.reduks.Store
-import com.beyondeye.reduks.StoreSubscriber
 import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.Presenter
+import com.willowtreeapps.common.QuestionCategoryId
 import com.willowtreeapps.common.boundary.toViewState
 
 class SettingsPresenter(val store: Store<AppState>): Presenter<SettingsView>() {
@@ -19,4 +18,7 @@ class SettingsPresenter(val store: Store<AppState>): Presenter<SettingsView>() {
         store.dispatch(Actions.ChangeNumQuestionsSettingsAction(numQuestions))
     }
 
+    fun categoryChanged(categoryId: QuestionCategoryId) {
+        store.dispatch(Actions.ChangeCategorySettingsAction(categoryId))
+    }
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/StartPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/StartPresenter.kt
@@ -27,7 +27,7 @@ class StartPresenter(val store: Store<AppState>,
 
     fun startGame() {
         store.dispatch(Actions.ResetGameStateAction())
-        store.dispatch(networkThunks.fetchProfiles())
+        store.dispatch(networkThunks.fetchItems(store.state.settings.categoryId))
     }
 
     fun settingsTapped() {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ViewStates.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ViewStates.kt
@@ -2,7 +2,8 @@ package com.willowtreeapps.common
 
 sealed class ViewStates
 
-data class SettingsViewState(val numQuestions: Int)
+data class SettingsViewState(val numQuestions: Int,
+                             val categoryId: QuestionCategoryId)
 
 class QuestionViewState(
         val title: String,

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,9 @@ sealed class Actions : Action {`
`25`	`25`
`26`	`26`	`class SettingsTappedAction`
`27`	`27`	`class LoadAllSettingsAction`
	`28`	`+ class SettingsLoadedAction(val settings: UserSettings)`
`28`	`29`	`class ChangeNumQuestionsSettingsAction(val num: Int)`
	`30`	`+ class ChangeCategorySettingsAction(val categoryId: QuestionCategoryId)`
`29`	`31`
`30`	`32`	`}`
`31`	`33`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ fun reducer(state: AppState, action: Any): AppState =`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`is ChangeNumQuestionsSettingsAction -> state.copy(settings = state.settings.copy(numQuestions = action.num))`
	`43`	`+ is ChangeCategorySettingsAction -> state.copy(settings = state.settings.copy(categoryId = action.categoryId))`
	`44`	`+ is SettingsLoadedAction -> state.copy(settings = action.settings)`
`43`	`45`
`44`	`46`	`else -> throw AssertionError("Action ${action::class.simpleName} not handled")`
`45`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ fun AppState.toGameResultsViewState(): GameResultsViewState {`
`48`	`48`	`messageText = messageText)`
`49`	`49`	`}`
`50`	`50`
`51`		`-fun UserSettings.toViewState(): SettingsViewState = SettingsViewState(this.numQuestions)`
	`51`	`+fun UserSettings.toViewState(): SettingsViewState = SettingsViewState(this.numQuestions, this.categoryId)`
`52`	`52`
`53`	`53`	`//TODO should this be here?`
`54`	`54`	`private fun AppState.roundTotals() = "${currentQuestionIndex + 1} out of ${questions.size}"`