switch to presenter-middleware and ios clean up

Author: Patrick Jackson

android/build.gradle

@@ -58,8 +58,6 @@ dependencies {
     implementation "android.arch.navigation:navigation-fragment-ktx:$ktxVersion"
     implementation "android.arch.navigation:navigation-ui-ktx:$ktxVersion"
 
-    implementation "com.facebook.stetho:stetho:$stethoVersion"
-    implementation "com.facebook.stetho:stetho-okhttp3:$stethoVersion"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
 
@@ -73,7 +71,8 @@ dependencies {
     implementation project(':common')
     implementation "com.russhwolf:multiplatform-settings:$multiplatformSettingsVersion"
     implementation "com.squareup.sqldelight:android-driver:$sqldelightVersion"
-    implementation "org.reduxkotlin:redux-kotlin:0.2.2"
+    implementation "org.reduxkotlin:redux-kotlin:0.2.6"
+    implementation "org.reduxkotlin:presenter-middleware:0.2.10"
 
 
     kapt 'com.github.bumptech.glide:compiler:4.8.0'
@@ -82,9 +81,6 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
-    implementation 'com.google.firebase:firebase-core:16.0.8'
-    implementation 'com.google.firebase:firebase-auth:16.2.1'
-    implementation 'com.firebaseui:firebase-ui-auth:4.3.2'
     debugImplementation 'com.willowtreeapps.hyperion:hyperion-core:0.9.27'
     releaseImplementation 'com.willowtreeapps.hyperion:hyperion-core-no-op:0.9.27'
     debugImplementation 'com.willowtreeapps.hyperion:hyperion-measurement:0.9.27'

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

@@ -5,33 +5,25 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.willowtreeapps.common.external.AttachView
-import com.willowtreeapps.common.external.DetachView
-import com.willowtreeapps.common.external.rootDispatch
 import com.willowtreeapps.common.ui.BottomNavSheet
 import com.willowtreeapps.common.ui.UiActions
 import kotlinx.android.synthetic.main.fragment_bottomsheet.*
+import org.reduxkotlin.PresenterLifecycleObserver
+import org.reduxkotlin.rootDispatch
 
 class BottomNavigationDrawerFragment : BottomSheetDialogFragment(), BottomNavSheet {
 
-//    override lateinit var dispatch: Dispatcher
-//    override var selectorBuilder: SelectorSubscriberBuilder<AppState>? = null
+    private val presenterObserver = PresenterLifecycleObserver(this)
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycle.addObserver(presenterObserver)
+    }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_bottomsheet, container, false)
     }
 
-    override fun onResume() {
-        super.onResume()
-        OpenLibraryApp.dispatch(AttachView(this))
-    }
-
-    override fun onPause() {
-        super.onPause()
-        OpenLibraryApp.dispatch(DetachView(this))
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         navigation_view.setNavigationItemSelectedListener { menuItem ->
             when (menuItem.itemId) {

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

@@ -94,49 +94,4 @@ class MainActivity : AppCompatActivity() {
     fun hideFab() {
         fab.hide()
     }
-
-    var tripleTapDetector: View.OnTouchListener = object : View.OnTouchListener {
-        internal var handler = Handler()
-
-        internal var numberOfTaps = 0
-        internal var lastTapTimeMs: Long = 0
-        internal var touchDownMs: Long = 0
-
-        override fun onTouch(v: View, event: MotionEvent): Boolean {
-
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> touchDownMs = System.currentTimeMillis()
-                MotionEvent.ACTION_UP -> {
-                    handler.removeCallbacksAndMessages(null)
-
-                    if (System.currentTimeMillis() - touchDownMs > ViewConfiguration.getTapTimeout()) {
-                        //it was not a tap
-
-                        numberOfTaps = 0
-                        lastTapTimeMs = 0
-                        return true
-                    }
-
-                    if (numberOfTaps > 0 && System.currentTimeMillis() - lastTapTimeMs < ViewConfiguration.getDoubleTapTimeout()) {
-                        numberOfTaps += 1
-                    } else {
-                        numberOfTaps = 1
-                    }
-
-                    lastTapTimeMs = System.currentTimeMillis()
-
-                    if (numberOfTaps == 3) {
-                        Hyperion.open()
-                        //handle triple tap
-                    } else if (numberOfTaps == 2) {
-                        handler.postDelayed({
-                            //handle double tap
-                        }, ViewConfiguration.getDoubleTapTimeout().toLong())
-                    }
-                }
-            }
-
-            return true
-        }
-    }
 }

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

@@ -6,7 +6,6 @@ import android.os.Bundle
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteOpenHelper
 import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import com.google.firebase.FirebaseApp
 import com.squareup.sqldelight.android.AndroidSqliteDriver
 import com.willowtree.common.LibraryDatabase
 import com.willowtreeapps.common.LibraryApp
@@ -20,7 +19,6 @@ class OpenLibraryApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        FirebaseApp.initializeApp(this)
         instance = this
         val config = SupportSQLiteOpenHelper.Configuration.builder(this)
                 .name("database.db")

android/src/main/java/com/jackson/openlibrary/scriminsets/OnInsetsCallback.java

@@ -2,95 +2,16 @@ package com.jackson.openlibrary.store
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.*
-import com.willowtreeapps.common.AppState
-import com.willowtreeapps.common.external.*
 import com.willowtreeapps.common.ui.LibraryBaseView
+import org.reduxkotlin.*
 
 abstract class BaseLibraryViewFragment<V: LibraryBaseView>: Fragment(), LibraryBaseView {
-
     private val presenterObserver = PresenterLifecycleObserver(this)
-    private var viewRecreated: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         retainInstance = true
         lifecycle.addObserver(presenterObserver)
         super.onCreate(savedInstanceState)
     }
-    /*
-
-    override fun onViewCreated(view: android.view.View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if (savedInstanceState == null)
-            Logger.d("savedInstanceState == null")
-        else {
-            Logger.d("savedInstanceState != null")
-            viewRecreated = true
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-//        OpenLibraryApp.dispatch(AttachView(this))
-        rootDispatch(AttachView(this))
-        if (viewRecreated) {
-            //TODO update view with all state
-//            presenter?.recreateView()
-        }
-    }
-
-     */
-
-    /*
-    override fun onPause() {
-        super.onPause()
-//        OpenLibraryApp.dispatch(DetachView(this))
-        rootDispatch(DetachView(this))
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-//        rootDispatch(ClearView(this))
-//        OpenLibraryApp.dispatch(ClearView(this))
-    }
-     */
-}
-
-
-class PresenterLifecycleObserver(val view: ViewWithProvider<*>): LifecycleObserver {
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    fun onAttach() {
-        rootDispatch(AttachView(view))
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    fun onDetach() {
-        rootDispatch(DetachView(view))
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    fun onClear() {
-        rootDispatch(ClearView(view))
-    }
-
-}
-
-/*
-class PresenterMiddlewareViewModel: LifecycleObserver, ViewModel() {
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    fun onAttach() {
-        rootDispatch(AttachView(this))
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    fun onDetach() {
-        rootDispatch(AttachView(this))
-    }
-    override fun onCleared() {
-        super.onCleared()
-    }
 }
 
- */

android/src/main/java/com/jackson/openlibrary/scriminsets/ScrimInsetsFrameLayout.java

@@ -57,7 +57,7 @@ class BookViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
         GlideApp.with(itemView)
                 .load(book.coverImageUrl)
                 .into(itemView.ivBookCover)
-        itemView.setOnClickListener { OpenLibraryApp.dispatch(UiActions.BookTapped(book)) }
+        itemView.setOnClickListener { OpenLibraryApp.dispatch(UiActions.BookTapped(adapterPosition)) }
     }
 
 }