working

Author: Patrick Jackson

common/src/commonMain/kotlin/com/willowtreeapps/common/external/PresenterInjecter.kt

@@ -14,17 +14,17 @@ data class ClearView(val view: Any)
  * All views implement this interface.  The PresenterFactory handles setting and removing references
  * to the dispatch() and a selectorBuilder.
  */
-interface View<S: Any> {
+interface View {
 ////    var dispatch: Dispatcher
 ////    var selectorBuilder: SelectorSubscriberBuilder<S>?
 }
 
 
 interface PresenterProvider<S: Any> {
-    fun presenter(): Presenter<View<S>> = throw NotImplementedError("Must implement this method to provide a presenterBuilder for ${this::class}")
+    fun presenter(): Presenter<View> = throw NotImplementedError("Must implement this method to provide a presenterBuilder for ${this::class}")
 }
 
-interface ViewWithProvider<S: Any> : View<S>, PresenterProvider<S>
+interface ViewWithProvider<S: Any> : View, PresenterProvider<S>
 
 enum class ViewLifecycle {
     ATTACHED,
@@ -145,7 +145,7 @@ typealias PresenterBuilderWithViewArg<State, View> = ((View) -> (((SelectorSubsc
  * @return a Presenter function
  *
  */
-fun <State : Any, V : View<State>> createGenericPresenter(actions: PresenterBuilder<State, V>): Presenter<V> {
+fun <State : Any, V : View> createGenericPresenter(actions: PresenterBuilder<State, V>): Presenter<V> {
     return { view: V, coroutineScope ->
         { store: Store ->
             val actions2 = actions(view)

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

@@ -4,10 +4,10 @@ import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.external.*
 
 //a Presenter typed to our app's State type for convenience
-fun <V: LibraryView> presenter(actions: PresenterBuilder<AppState, V>): Presenter<View<AppState>> {
-    return createGenericPresenter(actions) as Presenter<View<AppState>>
+fun <V: LibraryView> presenter(actions: PresenterBuilder<AppState, V>): Presenter<View> {
+    return createGenericPresenter(actions) as Presenter<View>
 }
 
-fun <V: LibraryView> presenterWithViewArg(actions: PresenterBuilderWithViewArg<AppState, V>): Presenter<View<AppState>> {
-    return createGenericPresenter(actions) as Presenter<View<AppState>>
+fun <V: LibraryView> presenterWithViewArg(actions: PresenterBuilderWithViewArg<AppState, V>): Presenter<View> {
+    return createGenericPresenter(actions) as Presenter<View>
 }

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

@@ -1,8 +1,5 @@
 package com.willowtreeapps.common.ui
 
-import com.willowtreeapps.common.external.PresenterProvider
-import com.willowtreeapps.common.external.ViewWithProvider
-
 
 interface SearchView : LibraryView {
     fun showLoading()