[WIP] working without state type param on view

Author: Patrick Jackson

android/src/main/java/com/jackson/openlibrary/store/BaseLibraryViewFragment.kt

@@ -6,7 +6,7 @@ import androidx.lifecycle.*
 import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.external.*
 
-abstract class BaseLibraryViewFragment<V: ViewWithProvider<AppState>>: Fragment(), ViewWithProvider<AppState> {
+abstract class BaseLibraryViewFragment<V: ViewWithProvider>: Fragment(), ViewWithProvider {
 
     private val presenterObserver = PresenterLifecycleObserver(this)
     private var viewRecreated: Boolean = false
@@ -56,7 +56,7 @@ abstract class BaseLibraryViewFragment<V: ViewWithProvider<AppState>>: Fragment(
 }
 
 
-class PresenterLifecycleObserver(val view: ViewWithProvider<AppState>): LifecycleObserver {
+class PresenterLifecycleObserver(val view: ViewWithProvider): LifecycleObserver {
 
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun onAttach() {

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

@@ -22,7 +22,7 @@ class LibraryApp(navigator: Navigator,
         createStore(combineReducers(reducer, navigationReducer), AppState.INITIAL_STATE, compose(listOf(
                 presenterEnhancer,
                 applyMiddleware(
-                        presenterMiddleware<AppState, ViewWithProvider<AppState>>(uiContext),
+                        presenterMiddleware<AppState, ViewWithProvider>(uiContext),
                         coroutineDispatcher(uiContext),
                         loggerMiddleware,
                         createThunkMiddleware(),

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

@@ -20,11 +20,11 @@ interface View {
 }
 
 
-interface PresenterProvider<S: Any> {
+interface PresenterProvider {
     fun presenter(): Presenter<View> = throw NotImplementedError("Must implement this method to provide a presenterBuilder for ${this::class}")
 }
 
-interface ViewWithProvider<S: Any> : View, PresenterProvider<S>
+interface ViewWithProvider: View, PresenterProvider
 
 enum class ViewLifecycle {
     ATTACHED,
@@ -49,7 +49,7 @@ val presenterEnhancer: StoreEnhancer = { storeCreator: StoreCreator ->
  * Attaching sets the presenter to the view.
  * PresenterFactory subscribes to changes in state, and passes state to presenters.
  */
-fun <S : Any, V : ViewWithProvider<S>> presenterMiddleware(uiContext: CoroutineContext): Middleware = { store ->
+fun <S : Any, V : ViewWithProvider> presenterMiddleware(uiContext: CoroutineContext): Middleware = { store ->
 
     val uiScope = CoroutineScope(uiContext)
     val subscribers = mutableMapOf<V, StoreSubscriberHolder>()
@@ -93,7 +93,7 @@ fun <S : Any, V : ViewWithProvider<S>> presenterMiddleware(uiContext: CoroutineC
         subscribers[view] = StoreSubscriberHolder(ViewLifecycle.DETACHED, subscribers[view]!!.subscriber)
     }
 
-    fun clearView(view: ViewWithProvider<S>) {
+    fun clearView(view: ViewWithProvider) {
         Logger.d("ClearView: $view", Logger.Category.LIFECYCLE)
         subscribers.remove(view)
 

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

@@ -4,4 +4,4 @@ import com.willowtreeapps.common.AppState
 import com.willowtreeapps.common.external.ViewWithProvider
 
 
-interface LibraryView : ViewWithProvider<AppState>
+interface LibraryView : ViewWithProvider