Merge pull request #20 from patjackson52/feature/generic

clean up;

Author: patjackson52

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

@@ -4,7 +4,7 @@ import com.beyondeye.reduks.Action
 import com.willowtreeapps.common.repo.ItemsHolder
 import com.willowtreeapps.common.repo.Profile
 
-sealed class Actions : Action {
+internal sealed class Actions : Action {
 
     class FetchingItemsStartedAction
     class FetchingItemsSuccessAction(val itemsHolder: ItemsHolder)

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

@@ -9,7 +9,7 @@ import kotlin.random.Random
  * Reducers and functions used by reducers are in this file.  Functions must be pure functions without
  * side effects.
  */
-fun reducer(state: AppState, action: Any): AppState =
+internal fun reducer(state: AppState, action: Any): AppState =
         when (action) {
             is FetchingItemsStartedAction -> state.copy(isLoadingItems = true)
             is FetchingItemsSuccessAction -> {

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

@@ -4,7 +4,7 @@ import com.beyondeye.reduks.Store
 import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.AppState
 
-class NavigationMiddleware(val navigator: Navigator) {
+internal class NavigationMiddleware(private val navigator: Navigator) {
 
     fun dispatch(store: Store<AppState>, nextDispatcher: (Any) -> Any, action: Any): Any {
         val result = nextDispatcher(action)

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

@@ -14,7 +14,7 @@ import kotlin.coroutines.CoroutineContext
 /**
  * Save and Loads user settings from local storage
  */
-class SettingsMiddleware(private val settings: LocalStorageSettingsRepository,
+internal class SettingsMiddleware(private val settings: LocalStorageSettingsRepository,
                          private val backgroundContext: CoroutineContext): CoroutineScope {
     override val coroutineContext: CoroutineContext
         get() = backgroundContext + Job()

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

@@ -16,7 +16,7 @@ typealias ViewEffectsSubscriber = (ViewEffect) -> Unit
  *
  *  Must be unsubscribed to avoid leaks.
  */
-class ViewEffectsMiddleware {
+internal class ViewEffectsMiddleware {
     private val viewEffectsSubscribers = mutableSetOf<ViewEffectsSubscriber>()
 
     fun subscribeToViewEffects(subscriber: ViewEffectsSubscriber) {

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt

@@ -18,7 +18,7 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
     private var subscription: StoreSubscription? = null
 
     private val startPresenter by lazy { StartPresenter(gameEngine.appStore, networkThunks) }
-    private val questPresenter by lazy { QuestionPresenter(gameEngine.appStore, gameEngine.vibrateUtil, timerThunks) }
+    private val questionPresenter by lazy { QuestionPresenter(gameEngine.appStore, gameEngine.vibrateUtil, timerThunks) }
     private val gameResultsPresenter by lazy { GameResultsPresenter(gameEngine.appStore) }
     private val settingsPresenter by lazy { SettingsPresenter(gameEngine.appStore) }
 
@@ -34,8 +34,8 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
                 startPresenter
             }
             is QuestionView -> {
-                questPresenter.attachView(view)
-                questPresenter
+                questionPresenter.attachView(view)
+                questionPresenter
             }
             is GameResultsView -> {
                 gameResultsPresenter.attachView(view)
@@ -56,7 +56,7 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
         if (view is StartView)
             startPresenter.detachView(view)
         if (view is QuestionView)
-            questPresenter.detachView(view)
+            questionPresenter.detachView(view)
         if (view is GameResultsView)
             gameResultsPresenter.detachView(view)
         if (view is SettingsView)
@@ -68,14 +68,14 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
         }
     }
 
-    private fun hasAttachedViews() = !startPresenter.isAttached() && !questPresenter.isAttached() && !gameResultsPresenter.isAttached()
+    private fun hasAttachedViews() = !startPresenter.isAttached() && !questionPresenter.isAttached() && !gameResultsPresenter.isAttached()
 
     override fun onStateChange() {
         if (startPresenter.isAttached()) {
             startPresenter.onStateChange(gameEngine.appStore.state)
         }
-        if (questPresenter.isAttached()) {
-            questPresenter.onStateChange(gameEngine.appStore.state)
+        if (questionPresenter.isAttached()) {
+            questionPresenter.onStateChange(gameEngine.appStore.state)
         }
         if (gameResultsPresenter.isAttached()) {
             gameResultsPresenter.onStateChange(gameEngine.appStore.state)

common/src/commonMain/kotlin/com/willowtreeapps/common/util/ProfileUtil.kt

@@ -2,6 +2,9 @@ package com.willowtreeapps.common.util
 
 import com.willowtreeapps.common.Logger
 
+/**
+ * Prints the number of milliseconds to complete given function
+ */
 inline fun <T> profile(label: String, f: () -> T): T {
     val startMs = TimeUtil.systemTimeMs()
     val result = f()