before removing external package.

Patrick Jackson · Patrick Jackson · commit 54b9b2d83ac8 · 2019-08-19T18:44:54.000-04:00
diff --git a/android/build.gradle b/android/build.gradle
@@ -81,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'
diff --git a/android/src/main/java/com/willowtreeapps/namegame/NameGameApp.kt b/android/src/main/java/com/willowtreeapps/namegame/NameGameApp.kt
@@ -3,7 +3,6 @@ package com.willowtreeapps.namegame
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import com.google.firebase.FirebaseApp
 import com.willowtreeapps.common.GameEngine
 import com.willowtreeapps.common.Logger
 import kotlinx.coroutines.Dispatchers
@@ -17,7 +16,6 @@ class NameGameApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        FirebaseApp.initializeApp(this)
         instance = this
         val navigator = AndroidNavigator()
         gameEngine = GameEngine(navigator, this, Dispatchers.IO, Dispatchers.Main)
diff --git a/android/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt b/android/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt
@@ -1,16 +1,13 @@
 package com.willowtreeapps.namegame.store
 
 import android.Manifest
-import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
-import com.firebase.ui.auth.AuthUI
-import com.google.firebase.auth.FirebaseAuth
 import com.willowtreeapps.common.*
 import com.willowtreeapps.common.middleware.UiActions
 //import com.google.firebase.auth.FirebaseAuth
@@ -53,7 +50,6 @@ class SettingsDialogFragment : DialogFragment(), SettingsView {
             dispatch(UiActions.CategoryPicked(newCategory))
         }
         btn_ok.setOnClickListener { dismiss() }
-        btn_sign_in.setOnClickListener { launchSignIn() }
         switch_mic.setOnCheckedChangeListener { buttonView, isChecked ->
             //TODO consider moving this logic somewhere else
             if (isChecked) {
@@ -71,16 +67,6 @@ class SettingsDialogFragment : DialogFragment(), SettingsView {
         numberPicker.value = viewState.numQuestions
         categoryPicker.value = viewState.categoryDisplayValues.indexOf(viewState.categoryId.displayName)
         switch_mic.isChecked = viewState.isMicModeEnabled
-        btn_sign_in.setOnClickListener {
-            if (viewState.isWillowTree) {
-                signOut()
-            } else {
-                launchSignIn()
-            }
-        }
-//        btn_sign_in.visibility = if (viewState.showSignIn) View.VISIBLE else View.GONE
-
-        btn_sign_in.text = viewState.signInBtnText
     }
 
     override fun askForMicPermissions() {
@@ -113,30 +99,4 @@ class SettingsDialogFragment : DialogFragment(), SettingsView {
             }
         }
     }
-
-
-    private fun launchSignIn() {
-        startActivityForResult(
-                AuthUI.getInstance().createSignInIntentBuilder()
-                        .setAvailableProviders(listOf(AuthUI.IdpConfig.GoogleBuilder().build()))
-                        .build(), 0)
-    }
-
-    private fun signOut() {
-        AuthUI.getInstance()
-                .signOut(activity?.applicationContext!!)
-                .addOnCompleteListener {
-                    dispatch(Actions.WillowTreeSignInSuccessAction())
-                }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == 0) {
-            val auth = FirebaseAuth.getInstance()
-            val email = auth.currentUser?.email!!
-            dispatch(Actions.WillowTreeSignOutSuccessAction())
-        }
-
-    }
 }
diff --git a/android/src/main/res/layout/fragment_settings.xml b/android/src/main/res/layout/fragment_settings.xml
@@ -20,16 +20,6 @@
         app:layout_constraintTop_toBottomOf="@+id/txt_num_questions"
         app:layout_constraintVertical_bias="0.86" />
 
-    <Button
-        android:id="@+id/btn_sign_in"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Sign in"
-        app:layout_constraintBottom_toTopOf="@+id/btn_ok"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/switch_mic" />
-
     <NumberPicker
         android:id="@+id/numberPicker"
         android:layout_width="wrap_content"
diff --git a/build.gradle b/build.gradle
@@ -47,6 +47,6 @@ ext {
     multiplatformSettingsVersion = '0.3.2'
     reduxVersion = '0.2.6'
     reduxThunkVersion = '0.2.8'
-    reduxPresenterMiddlewareVersion = '0.2.7'
+    reduxPresenterMiddlewareVersion = '0.2.8'
     reduxReselectVersion = '0.2.8'
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -30,6 +30,7 @@ kotlin {
                 implementation "org.reduxkotlin:redux-kotlin:$reduxVersion"
                 implementation "org.reduxkotlin:redux-kotlin-thunk:$reduxThunkVersion"
                 implementation "org.reduxkotlin:redux-kotlin-reselect:$reduxReselectVersion"
+                implementation "org.reduxkotlin:presenter-middleware:$reduxPresenterMiddlewareVersion"
                 implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
 
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt
@@ -28,8 +28,6 @@ sealed class Actions {
     data class ChangeCategorySettingsAction(val categoryId: QuestionCategoryId)
     data class ChangeMicrophoneModeSettingsAction(val enabled: Boolean)
 
-    class WillowTreeSignInSuccessAction
-    class WillowTreeSignOutSuccessAction
     open class ThrottledAction(val waitTimeMs: Long, val thunk: Thunk<AppState>)
 
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt
@@ -68,16 +68,12 @@ data class Item(val id: ItemId,
 }
 
 enum class QuestionCategoryId(val displayName: String) {
-    WILLOW_TREE("WillowTree"),
     DOGS("Dogs"),
     CATS("Cats");
 
     companion object {
-        val displayNameListWithWT by lazy {
-            values().map { it.displayName }
-        }
         val displayNameListWithoutWT by lazy {
-            values().filter { it != WILLOW_TREE }.map { it.displayName }
+            values().map { it.displayName }
         }
 
         fun fromOrdinal(ordinal: Int) = values()[ordinal]
@@ -88,7 +84,6 @@ enum class QuestionCategoryId(val displayName: String) {
 
 data class UserSettings(val numQuestions: Int,
                         val categoryId: QuestionCategoryId,
-                        val isWillowTree: Boolean = false,
                         val microphoneMode: Boolean) {
     companion object {
         fun defaults() = UserSettings(3,
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/NetworkThunks.kt
@@ -19,7 +19,6 @@ class NetworkThunks(private val networkContext: CoroutineContext) : CoroutineSco
 
     //TODO cache the repositories
     private fun repoForCategory(categoryId: QuestionCategoryId) = when (categoryId) {
-        QuestionCategoryId.WILLOW_TREE -> ProfileItemRepository()
         QuestionCategoryId.CATS -> CatItemRepository()
         QuestionCategoryId.DOGS -> DogItemRepository()
     }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt
@@ -70,8 +70,6 @@ val reducer: Reducer<AppState> = { state: AppState, action ->
         is ChangeMicrophoneModeSettingsAction -> state.copy(settings = state.settings.copy(microphoneMode = action.enabled))
         is SettingsLoadedAction -> state.copy(settings = action.settings)
 
-        is WillowTreeSignInSuccessAction -> state.copy(settings = state.settings.copy(isWillowTree = true))
-        is WillowTreeSignOutSuccessAction -> state.copy(settings = state.settings.copy(isWillowTree = false))
         is LoadAllSettingsAction -> {
             state
         }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/boundary/TransformFunctions.kt
@@ -56,13 +56,8 @@ fun AppState.toGameResultsViewState(): GameResultsViewState {
 fun UserSettings.toViewState(): SettingsViewState = SettingsViewState(
         numQuestions = numQuestions,
         categoryId = categoryId,
-        categoryDisplayValues = if (isWillowTree)
-            QuestionCategoryId.displayNameListWithWT
-        else
-            QuestionCategoryId.displayNameListWithoutWT,
-        isMicModeEnabled = microphoneMode,
-        isWillowTree = isWillowTree,
-        signInBtnText = if (isWillowTree) "Sign Out" else "Sign In"
+        categoryDisplayValues = QuestionCategoryId.displayNameListWithoutWT,
+        isMicModeEnabled = microphoneMode
 )
 
 private fun AppState.gameTotals() = "$numCorrect out of ${questions.size}"
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ItemRepository.kt
@@ -19,29 +19,6 @@ data class ItemsHolder(val questionTitle: String,
                        val questions: List<Question>,
                        val gameResultResponses: GameResultResponses = GameResultResponses())
 
-class ProfileItemRepository(val repo: ProfilesRepository = KtorProfilesRepository()) : ItemRepository {
-
-    override suspend fun fetchItems(numQuestions: Int): GatewayResponse<ItemsHolder, GenericError> {
-        val results = repo.profiles()
-        return if (results.isSuccessful) {
-            val items = results.response?.map {
-                Item(id = ItemId(it.id),
-                        firstName = it.firstName,
-                        lastName = it.lastName,
-                        imageUrl = "https:${it.headshot.url}")
-            }!!
-
-            val itemHolder = ItemsHolder(questionTitle = "Who is this?",
-                    items = items,
-                    questions = generateQuestions(items, numQuestions))
-            GatewayResponse.createSuccess(itemHolder, 200, "")
-        } else {
-            GatewayResponse.createError(GenericError("Error"), 500, "")
-        }
-    }
-
-}
-
 class DogItemRepository(val repo: KtorDogsRepository = KtorDogsRepository(PlatformDispatcher)) : ItemRepository {
 
     override suspend fun fetchItems(numQuestions: Int): GatewayResponse<ItemsHolder, GenericError> {
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/KtorProfilesRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/KtorProfilesRepository.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/MockProfileRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/MockProfileRepository.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ProfilesRepository.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/repo/ProfilesRepository.kt
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ViewStates.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/ViewStates.kt
@@ -5,9 +5,7 @@ import com.willowtreeapps.common.QuestionCategoryId
 data class SettingsViewState(val numQuestions: Int,
                              val categoryId: QuestionCategoryId,
                              val categoryDisplayValues: List<String>,
-                             val isMicModeEnabled: Boolean,
-                             val isWillowTree: Boolean = false,
-                             val signInBtnText: String)
+                             val isMicModeEnabled: Boolean)
 
 data class QuestionViewState(
         val title: String,
diff --git a/iOS/NameGame/NameGame/SettingsViewController.swift b/iOS/NameGame/NameGame/SettingsViewController.swift
@@ -28,7 +28,7 @@ SettingsView {
     }
     
     let pickerData: [Int] = Array(1...20)
-    let categoryData: [String] = QuestionCategoryId.Companion.init().displayNameListWithWT
+    let categoryData: [String] = QuestionCategoryId.Companion.init().displayNameListWithoutWT
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -40,7 +40,7 @@ SettingsView {
 
     func showSettings(viewState: SettingsViewState) {
         numPicker.selectRow((Int(viewState.numQuestions - 1)), inComponent: 0, animated: true)
-        categoryPicker.selectRow(Int(QuestionCategoryId.Companion.init().displayNameListWithWT.firstIndex(of: viewState.categoryId.displayName)!), inComponent: 0, animated: true)
+        categoryPicker.selectRow(Int(QuestionCategoryId.Companion.init().displayNameListWithoutWT.firstIndex(of: viewState.categoryId.displayName)!), inComponent: 0, animated: true)
     }
     
     func askForMicPermissions() {

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ ext {`
`47`	`47`	`multiplatformSettingsVersion = '0.3.2'`
`48`	`48`	`reduxVersion = '0.2.6'`
`49`	`49`	`reduxThunkVersion = '0.2.8'`
`50`		`- reduxPresenterMiddlewareVersion = '0.2.7'`
	`50`	`+ reduxPresenterMiddlewareVersion = '0.2.8'`
`51`	`51`	`reduxReselectVersion = '0.2.8'`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ sealed class Actions {`
`28`	`28`	`data class ChangeCategorySettingsAction(val categoryId: QuestionCategoryId)`
`29`	`29`	`data class ChangeMicrophoneModeSettingsAction(val enabled: Boolean)`
`30`	`30`
`31`		`- class WillowTreeSignInSuccessAction`
`32`		`- class WillowTreeSignOutSuccessAction`
`33`	`31`	`open class ThrottledAction(val waitTimeMs: Long, val thunk: Thunk<AppState>)`
`34`	`32`
`35`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ class NetworkThunks(private val networkContext: CoroutineContext) : CoroutineSco`
`19`	`19`
`20`	`20`	`//TODO cache the repositories`
`21`	`21`	`private fun repoForCategory(categoryId: QuestionCategoryId) = when (categoryId) {`
`22`		`- QuestionCategoryId.WILLOW_TREE -> ProfileItemRepository()`
`23`	`22`	`QuestionCategoryId.CATS -> CatItemRepository()`
`24`	`23`	`QuestionCategoryId.DOGS -> DogItemRepository()`
`25`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,6 @@ val reducer: Reducer<AppState> = { state: AppState, action ->`
`70`	`70`	`is ChangeMicrophoneModeSettingsAction -> state.copy(settings = state.settings.copy(microphoneMode = action.enabled))`
`71`	`71`	`is SettingsLoadedAction -> state.copy(settings = action.settings)`
`72`	`72`
`73`		`- is WillowTreeSignInSuccessAction -> state.copy(settings = state.settings.copy(isWillowTree = true))`
`74`		`- is WillowTreeSignOutSuccessAction -> state.copy(settings = state.settings.copy(isWillowTree = false))`
`75`	`73`	`is LoadAllSettingsAction -> {`
`76`	`74`	`state`
`77`	`75`	`}`