[WIP]Thunks and presenters working on iOS

Author: Patrick Jackson

android/src/main/java/com/jackson/openlibrary/OpenLibraryApp.kt

@@ -11,6 +11,7 @@ import com.squareup.sqldelight.android.AndroidSqliteDriver
 import com.willowtree.common.LibraryDatabase
 import com.willowtreeapps.common.LibraryApp
 import com.willowtreeapps.common.Logger
+import com.willowtreeapps.common.createDatabase
 import kotlinx.coroutines.Dispatchers
 
 class OpenLibraryApp : Application() {
@@ -38,7 +39,7 @@ class OpenLibraryApp : Application() {
         val sqlHelper = FrameworkSQLiteOpenHelperFactory().create(config)
 
         val navigator = AndroidNavigator()
-        libraryApp = LibraryApp(navigator, Dispatchers.IO, Dispatchers.Main, AndroidSqliteDriver(sqlHelper))
+        libraryApp = LibraryApp(navigator, Dispatchers.IO, Dispatchers.Main, createDatabase(AndroidSqliteDriver(sqlHelper)))
         registerActivityLifecycleCallbacks(navigator)
         registerActivityLifecycleCallbacks(LifeCycleLogger)
     }

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

@@ -16,7 +16,7 @@ import kotlin.coroutines.CoroutineContext
 open class BaseLibraryViewFragment<V: LibraryView>: Fragment(),
         CoroutineScope, LibraryView, LibraryProvider by OpenLibraryApp.gameEngine() {
     override lateinit var dispatch: Dispatcher
-    override lateinit var selectorBuilder: SelectorSubscriberBuilder<AppState>
+    override var selectorBuilder: SelectorSubscriberBuilder<AppState>? = null
 
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Main

build.gradle

@@ -1,13 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = "1.3.40"
-    ext.androidx_home = project.properties["androidx.home"] ?: "$projectDir/androidx_prebuilts"
+    ext.kotlinVersion = "1.3.41"
     repositories {
         google()
         jcenter()
-        maven { url "$androidx_home/out/ui/build/support_repo/" }
-        maven { url "$androidx_home/prebuilts/androidx/external/" }
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
         maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url 'https://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
@@ -19,6 +16,8 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.0'
         classpath "com.squareup.sqldelight:gradle-plugin:1.1.4"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
+        classpath 'co.touchlab:kotlinxcodesync:0.1.5'
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -50,7 +49,7 @@ ext {
     stethoVersion = '1.5.0'
     ktxVersion = '1.0.0'
     ktorVersion = '1.2.2'
-    serializationVersion = '0.11.0'
-    multiplatformSettingsVersion = '0.3'
+    serializationVersion = '0.11.1'
+    multiplatformSettingsVersion = '0.3.2'
     sqldelightVersion = '1.1.4'
 }

common/build.gradle

@@ -6,6 +6,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-multiplatform'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'com.squareup.sqldelight'
+apply plugin: 'co.touchlab.kotlinxcodesync'
+
+xcode {
+    projectPath = "../iOS/OpenLibrary/OpenLibrary.xcodeproj"
+    target = "OpenLibrary"
+}
 
 
 sqldelight {
@@ -136,7 +142,7 @@ android {
 //and gradlew is in executable mode (chmod +x gradlew)
 task packForXCode(type: Sync) {
     final File frameworkDir = new File(buildDir, "xcode-frameworks")
-    final String mode = project.findProperty("XCODE_CONFIGURATION")?.toUpperCase() ?: 'DEBUG'
+    final String mode = 'DEBUG' //project.findProperty("XCODE_CONFIGURATION")?.toUpperCase() ?: 'DEBUG'
     final def framework = kotlin.targets.ios.binaries.getFramework("common", mode)
 
     inputs.property "mode", mode

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

@@ -1,6 +1,6 @@
 package com.willowtreeapps.common
 
-import com.squareup.sqldelight.db.SqlDriver
+import com.willowtree.common.LibraryDatabase
 import org.reduxkotlin.createStore
 import org.reduxkotlin.applyMiddleware
 import com.willowtreeapps.common.middleware.*
@@ -17,17 +17,17 @@ import kotlin.coroutines.CoroutineContext
 class LibraryApp(navigator: Navigator,
                  networkContext: CoroutineContext,
                  private val uiContext: CoroutineContext,
-                 sqlDriver: SqlDriver): LibraryProvider {
+                 libraryDatabase: LibraryDatabase): LibraryProvider {
     private val navigationMiddleware = NavigationMiddleware(navigator)
-    private val localStorageRepo = BookDatabaseRepo(createDatabase(sqlDriver))
+    private val localStorageRepo = BookDatabaseRepo(libraryDatabase)
     private val databaseMiddleware = DatabaseMiddleware(localStorageRepo)
     private val bookRepository: BookRepository by lazy { KtorOpenBookRepository(networkContext) }
     private val presenterFactory by lazy { PresenterFactory(this, uiContext) }
 //    val fetchBooks = fetchBooksThunk(networkContext, bookRepository)
     override val networkThunks = NetworkThunks(networkContext, bookRepository)
 
     val store by lazy {
-        createStore(reducer, AppState.INITIAL_STATE, applyMiddleware(thunk,
+        createStore(reducer, AppState.INITIAL_STATE, applyMiddleware(createThunkMiddleware2(),
                 databaseMiddleware.middleware,
                 navigationMiddleware::dispatch,
                 loggerMiddleware))

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

@@ -5,6 +5,7 @@ import kotlinx.coroutines.*
 import org.reduxkotlin.Dispatcher
 import org.reduxkotlin.GetState
 import org.reduxkotlin.Thunk
+import org.reduxkotlin.ThunkMiddleware
 import kotlin.coroutines.CoroutineContext
 
 /*
@@ -45,6 +46,7 @@ class NetworkThunks(private val networkContext: CoroutineContext,
     fun fetchBooks(query: String): Thunk = { dispatch, getState, extraArgument ->
         Logger.d("Fetching Books and Feed")
         launch {
+            Logger.d("INSIDE FetchBooks 1")
             dispatch(Actions.FetchingItemsStartedAction())
             val result = repo.search(query)
             if (result.isSuccessful) {
@@ -56,4 +58,52 @@ class NetworkThunks(private val networkContext: CoroutineContext,
             }
         }
     }
+
+    fun fetchBooksThunk2(query: String): Thunk2 = object : Thunk2 {
+        override fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?) {
+            Logger.d("Fetching Books and Feed")
+            launch {
+                Logger.d("INSIDE FetchBooks 1")
+                dispatch(Actions.FetchingItemsStartedAction())
+                val result = repo.search(query)
+                if (result.isSuccessful) {
+                    Logger.d("Success")
+                    dispatch(Actions.FetchingItemsSuccessAction(result.response!!))
+                } else {
+                    Logger.d("Failure")
+                    dispatch(Actions.FetchingItemsFailedAction(result.message!!))
+                }
+            }
+        }
+    }
 }
+
+interface Thunk2 {
+    fun dispatch(dispatch: Dispatcher, getState: GetState, extraArgument: Any?)
+}
+
+fun createThunkMiddleware2(extraArgument: Any? = null): ThunkMiddleware =
+        { store ->
+            { next: Dispatcher ->
+                { action: Any ->
+                    Logger.d("INSIDE ThunkMiddleware 1: $action")
+                    if (action is Thunk2) {
+                        Logger.d("INSIDE ThunkMiddleware 2: ")
+                        try {
+                            Logger.d("dispatch thunk 1: ${store.dispatch}")
+                            Logger.d("dispatch thunk 2: ${store.getState}")
+                            Logger.d("dispatch thunk 3: ${extraArgument}")
+                            Logger.d("dispatch thunk 4: $action")
+                            action.dispatch(store.dispatch, store.getState, extraArgument)
+                        } catch (e: Exception) {
+                            Logger.d("INSIDE ThunkMiddleware 3: ${e.message}")
+                            throw IllegalArgumentException()
+                            Logger.d("Dispatching functions must use type Thunk: " + e.message)
+                        }
+                    } else {
+                        Logger.d("INSIDE ThunkMiddleware 4: ")
+                        next(action)
+                    }
+                }
+            }
+        }

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

@@ -71,12 +71,12 @@ fun <S : Any, V: View<S>> SelectorSubscriberFn(store: Store, view: V, selectorSu
 
 
     view.selectorBuilder = SelectorSubscriberBuilder<S>(store, view)
-    view.selectorBuilder.selectorSubscriberBuilderInit()
+    view.selectorBuilder!!.selectorSubscriberBuilderInit()
     return {
-        view.selectorBuilder.selectorList.forEach { entry ->
+        view.selectorBuilder!!.selectorList.forEach { entry ->
             entry.key.onChangeIn(store.getState() as S) { entry.value(store.getState()) }
         }
-        view.selectorBuilder.withAnyChangeFun?.invoke()
+        view.selectorBuilder!!.withAnyChangeFun?.invoke()
     }
 }
 

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

@@ -1,7 +1,7 @@
 package com.willowtreeapps.common.ui
 
 
-interface CompletedView : LibraryView {
+interface CompletedView : LibraryView, PresenterProvider {
     fun showLoading()
     fun hideLoading()
     fun showError(msg: String)

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

@@ -9,7 +9,8 @@ import org.reduxkotlin.*
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
 
-interface LibraryView: View<AppState>
+interface LibraryView: ViewWithProvider<AppState>
+interface BaseLibraryView: View<AppState>
 
 fun testMiddleware(store: Store): (Dispatcher) -> Dispatcher {
     return { next: Dispatcher ->
@@ -51,11 +52,11 @@ class PresenterFactory(private val libraryApp: LibraryApp,
 
     fun <T : LibraryView> attachView(view: T) {
         Logger.d("AttachView: $view", Logger.Category.LIFECYCLE)
-        view.dispatch = libraryApp.store.dispatch
+        view.dispatch = libraryApp::dispatch
         if (subscription == null) {
             subscription = libraryApp.store.subscribe(this::onStateChange)
         }
-        val tmp = view.presenter()//getPresenterBuilder(viewClass)//(view)(libraryApp.appStore)
+        val tmp = view.presenter()
         val subscriber = tmp(view)(libraryApp.store)
         //call subscriber to trigger initial view update
         subscriber()
@@ -66,7 +67,7 @@ class PresenterFactory(private val libraryApp: LibraryApp,
         Logger.d("DetachView: $view", Logger.Category.LIFECYCLE)
         subscribers.remove(view)
 
-        if (hasAttachedViews()) {
+        if (!hasAttachedViews()) {
             subscription?.invoke()
             subscription = null
         }
@@ -75,8 +76,13 @@ class PresenterFactory(private val libraryApp: LibraryApp,
     private fun hasAttachedViews() = subscribers.isNotEmpty()
 
     private fun onStateChange() {
+        Logger.d("PresenterFactory::onStateChanged!")
         launch {
-            subscribers.forEach { it.value() }
+            Logger.d("subscribers.size: ${subscribers.size}")
+            subscribers.forEach {
+                Logger.d("Subscriber: ${it.key} + ${it.value}")
+                it.value()
+            }
         }
     }
 
@@ -92,9 +98,15 @@ interface LibraryProvider {
  */
 interface View<S : Any> {
     var dispatch: Dispatcher
-    var selectorBuilder: SelectorSubscriberBuilder<S>
+    var selectorBuilder: SelectorSubscriberBuilder<S>?
+}
+
+
+interface PresenterProvider {
     fun presenter(): Presenter<View<AppState>> = throw NotImplementedError("Must implement this method to provide a presenterBuilder for ${this::class}")
 }
 
+interface ViewWithProvider<S: Any>: View<S>, PresenterProvider
+
 //TODO handle config changes on android where view has been destroyed and must be recreated.  Probably
 //can be treated as if a new state - wipe out the selector cache and treat as new view?

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

@@ -6,6 +6,7 @@ const val READING_LIST_TITLE = "Reading List"
 
 val readingListPresenter = presenter<ReadingListView> {
     {
+
         +{ state.toReadBook }+ { showBooks(state.toReadBook.toBookListViewState(READING_LIST_TITLE)) }
 
         +{ state.isLoadingItems }+ {