Merge pull request #21 from patjackson52/feature/generic

patjackson52 · web-flow · commit 0ef0a4e2d064 · 2019-04-15T13:13:11.000-04:00
create BaseNameGameFragment &amp; ViewController
diff --git a/app/src/main/java/com/willowtreeapps/namegame/AndroidNavigator.kt b/app/src/main/java/com/willowtreeapps/namegame/AndroidNavigator.kt
@@ -5,7 +5,6 @@ import android.app.Application
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
-import com.willowtreeapps.common.Actions
 import com.willowtreeapps.common.middleware.Navigator
 import com.willowtreeapps.common.middleware.Screen
 import com.willowtreeapps.namegame.store.SettingsDialogFragment
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/BaseNameGameViewFragment.kt b/app/src/main/java/com/willowtreeapps/namegame/store/BaseNameGameViewFragment.kt
@@ -0,0 +1,27 @@
+package com.willowtreeapps.namegame.store
+
+import androidx.fragment.app.Fragment
+import com.willowtreeapps.common.Presenter
+import com.willowtreeapps.common.View
+import com.willowtreeapps.common.ui.GameResultsPresenter
+import com.willowtreeapps.namegame.NameGameApp
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlin.coroutines.CoroutineContext
+
+open class BaseNameGameViewFragment<TPresenter: Presenter<*>>: Fragment(), CoroutineScope, View<TPresenter> {
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Main
+
+    override lateinit var presenter: TPresenter
+
+    override fun onResume() {
+        super.onResume()
+        NameGameApp.gameEngine().attachView(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        NameGameApp.gameEngine().detachView(this)
+    }
+}
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/GameResultsFragment.kt b/app/src/main/java/com/willowtreeapps/namegame/store/GameResultsFragment.kt
@@ -4,24 +4,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import com.willowtreeapps.common.GameResultsViewState
 import com.willowtreeapps.common.ui.GameResultsPresenter
 import com.willowtreeapps.common.ui.GameResultsView
 import com.willowtreeapps.namegame.MainActivity
 import com.willowtreeapps.namegame.NameGameApp
 import com.willowtreeapps.namegame.R
 import kotlinx.android.synthetic.main.fragment_game_results.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlin.coroutines.CoroutineContext
 
-class GameResultsFragment : Fragment(), CoroutineScope, GameResultsView, MainActivity.IOnBackPressed {
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main
-
-    private var presenter: GameResultsPresenter? = null
+class GameResultsFragment : BaseNameGameViewFragment<GameResultsPresenter>(), GameResultsView, MainActivity.IOnBackPressed {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_game_results, container, false)
@@ -34,27 +25,17 @@ class GameResultsFragment : Fragment(), CoroutineScope, GameResultsView, MainAct
     private fun initViews() {
         btn_start_over.setOnClickListener {
             NameGameApp.gameEngine().detachView(this)
-            presenter?.startOverTapped()
+            presenter.startOverTapped()
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        presenter = NameGameApp.gameEngine().attachView(this) as GameResultsPresenter
-    }
-
-    override fun onPause() {
-        super.onPause()
-        NameGameApp.gameEngine().detachView(this)
-    }
-
     override fun showResults(viewState: GameResultsViewState) {
         txt_questionTitle.text = viewState.resultsText
         txt_message.text = viewState.messageText
     }
 
     override fun onBackPressed(): Boolean {
-        presenter?.onBackPressed()
+        presenter.onBackPressed()
         return false
     }
 
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt b/app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt
@@ -8,28 +8,20 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.BounceInterpolator
-import androidx.fragment.app.Fragment
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.willowtreeapps.common.QuestionViewState
 import com.willowtreeapps.common.ui.QuestionView
 import kotlinx.android.synthetic.main.fragment_question.*
 import nl.dionsegijn.konfetti.models.Shape
 import nl.dionsegijn.konfetti.models.Size
-import kotlin.coroutines.CoroutineContext
 import android.widget.Button
 import androidx.core.content.res.ResourcesCompat
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.willowtreeapps.common.ui.QuestionPresenter
 import com.willowtreeapps.namegame.*
-import kotlinx.coroutines.*
 
 
-class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.IOnBackPressed {
-
-    private lateinit var presenter: QuestionPresenter
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main
+class QuestionFragment : BaseNameGameViewFragment<QuestionPresenter>(), QuestionView, MainActivity.IOnBackPressed {
 
     private var restoreX: Float? = null
     private var restoreY: Float? = null
@@ -40,16 +32,6 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
         return inflater.inflate(R.layout.fragment_question, container, false)
     }
 
-    override fun onResume() {
-        super.onResume()
-        presenter = NameGameApp.gameEngine().attachView(this) as QuestionPresenter
-    }
-
-    override fun onPause() {
-        super.onPause()
-        NameGameApp.gameEngine().detachView(this)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         initViews()
     }
@@ -164,9 +146,11 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
             } else {
                 btn_next
             }
-            btn.visibility = View.VISIBLE
-            btn.alpha = 0F
-            btn.animate().alpha(1f)
+            if (btn != null) {
+                btn.visibility = View.VISIBLE
+                btn.alpha = 0F
+                btn.animate().alpha(1f)
+            }
         }
         set.start()
     }
@@ -247,7 +231,8 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
                         txt_timer.animate().alpha(0f)
                                 .withEndAction {
                                     txt_timer.visibility = View.VISIBLE
-                                    txt_timer.setTextColor(restoreColor) }
+                                    txt_timer.setTextColor(restoreColor)
+                                }
                     }
 
         }
@@ -273,6 +258,4 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.
         4 -> button4
         else -> null//throw IllegalStateException("Invalid button index")
     }
-
-
 }
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt b/app/src/main/java/com/willowtreeapps/namegame/store/SettingsDialogFragment.kt
@@ -1,6 +1,5 @@
 package com.willowtreeapps.namegame.store
 
-import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -16,45 +15,38 @@ import kotlinx.android.synthetic.main.fragment_settings.*
 
 class SettingsDialogFragment: DialogFragment(), SettingsView {
 
-    var presenter: SettingsPresenter? = null
+    override lateinit var presenter: SettingsPresenter
 
     companion object {
         fun newInstance(): SettingsDialogFragment {
-            val f = SettingsDialogFragment()
-            return f
+            return SettingsDialogFragment()
         }
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val dialog = super.onCreateDialog(savedInstanceState)
-        return  dialog
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_settings, container, false)
     }
 
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         numberPicker.minValue = 1
         numberPicker.maxValue = 20
         numberPicker.setOnValueChangedListener { _, _, newVal ->
-            presenter?.numQuestionsChanged(newVal)
+            presenter.numQuestionsChanged(newVal)
         }
 
         categoryPicker.displayedValues = QuestionCategoryId.displayNameList.toTypedArray()
         categoryPicker.maxValue = 0
         categoryPicker.maxValue = QuestionCategoryId.displayNameList.toTypedArray().size - 1
         categoryPicker.setOnValueChangedListener { _, _, newVal ->
-            presenter?.categoryChanged(QuestionCategoryId.fromOrdinal(newVal))
+            presenter.categoryChanged(QuestionCategoryId.fromOrdinal(newVal))
         }
         btn_ok.setOnClickListener { dismiss() }
     }
 
     override fun onResume() {
         super.onResume()
-        presenter = NameGameApp.gameEngine().attachView(this) as SettingsPresenter
+        NameGameApp.gameEngine().attachView(this)
     }
 
     override fun onPause() {
diff --git a/app/src/main/java/com/willowtreeapps/namegame/store/StartFragment.kt b/app/src/main/java/com/willowtreeapps/namegame/store/StartFragment.kt
@@ -18,7 +18,7 @@ class StartFragment : Fragment(), CoroutineScope, StartView {
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Main
 
-    private var presenter: StartPresenter? = null
+    override lateinit var presenter: StartPresenter
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_start, container, false)
@@ -39,7 +39,7 @@ class StartFragment : Fragment(), CoroutineScope, StartView {
 
     override fun onResume() {
         super.onResume()
-        presenter = NameGameApp.gameEngine().attachView(this) as StartPresenter
+        NameGameApp.gameEngine().attachView(this)
     }
 
     override fun onPause() {
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
@@ -40,6 +40,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
+        style="@style/SettingsLabelText"
         android:id="@+id/txt_num_questions"
         android:layout_width="70dp"
         android:layout_height="wrap_content"
@@ -51,6 +52,7 @@
         app:layout_constraintTop_toBottomOf="@+id/numberPicker" />
 
     <TextView
+        style="@style/SettingsLabelText"
         android:id="@+id/txt_num_questions2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_start.xml b/app/src/main/res/layout/fragment_start.xml
@@ -80,9 +80,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:text="TextView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_settings" />
+        app:layout_constraintTop_toBottomOf="@+id/btn_settings"
+        tools:text="api error message" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -53,5 +53,10 @@
 
     </style>
 
+    <style name="SettingsLabelText">
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/black</item>
+    </style>
+
 </resources>
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt
@@ -33,7 +33,7 @@ class GameEngine(navigator: Navigator,
     init {
         appStore.dispatch(Actions.LoadAllSettingsAction())
     }
-    fun attachView(view: View): Presenter<out View?> = presenterFactory.attachView(view)
+    fun <T: Presenter<*>>attachView(view: View<T>) = presenterFactory.attachView(view as View<Presenter<*>>)
 
-    fun detachView(view: View) = presenterFactory.detachView(view)
+    fun detachView(view: View<*>) = presenterFactory.detachView(view)
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/GameResultsView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/GameResultsView.kt
@@ -3,6 +3,6 @@ package com.willowtreeapps.common.ui
 import com.willowtreeapps.common.GameResultsViewState
 import com.willowtreeapps.common.View
 
-interface GameResultsView : View {
+interface GameResultsView : View<GameResultsPresenter> {
     fun showResults(viewState: GameResultsViewState)
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt
@@ -22,12 +22,13 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
     private val gameResultsPresenter by lazy { GameResultsPresenter(gameEngine.appStore) }
     private val settingsPresenter by lazy { SettingsPresenter(gameEngine.appStore) }
 
-    fun <T : View> attachView(view: T): Presenter<out View?> {
+    fun <T : View<Presenter<*>>> attachView(view: T) {
         Logger.d("AttachView: $view")
 
         if (subscription == null) {
             subscription = gameEngine.appStore.subscribe(this)
         }
+        //TODO find generic way to handle
         val presenter = when (view) {
             is StartView -> {
                 startPresenter.attachView(view)
@@ -47,11 +48,11 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
             }
             else -> throw IllegalStateException("Screen $view not handled")
         }
+        view.presenter = presenter
         presenter.onStateChange(gameEngine.appStore.state)
-        return presenter
     }
 
-    fun detachView(view: View) {
+    fun detachView(view: View<*>) {
         Logger.d("DetachView: $view")
         if (view is StartView)
             startPresenter.detachView(view)
@@ -87,9 +88,11 @@ internal class PresenterFactory(private val gameEngine: GameEngine, networkConte
     }
 }
 
-interface View
+interface View<TPresenter> {
+    var presenter: TPresenter
+}
 
-abstract class Presenter<T : View?> {
+abstract class Presenter<T : View<*>?> {
     var view: T? = null
     var subscriber: StoreSubscriber<AppState>? = null
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionPresenter.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionPresenter.kt
@@ -9,7 +9,7 @@ import com.willowtreeapps.common.util.VibrateUtil
 class QuestionPresenter(
         val store: Store<AppState>,
         private val vibrateUtil: VibrateUtil,
-        private val timerThunks: TimerThunks) : Presenter<QuestionView?>() {
+        private val timerThunks: TimerThunks) : Presenter<QuestionView>() {
 
     override fun makeSubscriber() = SelectorSubscriberFn(store) {
         withSingleField({ it.questionClock }, { view?.setTimerText(state.toQuestionViewState()) })
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/QuestionView.kt
@@ -3,7 +3,7 @@ package com.willowtreeapps.common.ui
 import com.willowtreeapps.common.QuestionViewState
 import com.willowtreeapps.common.View
 
-interface QuestionView : View {
+interface QuestionView : View<QuestionPresenter> {
 
     fun showProfile(viewState: QuestionViewState)
 
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SettingsView.kt
@@ -3,6 +3,6 @@ package com.willowtreeapps.common.ui
 import com.willowtreeapps.common.SettingsViewState
 import com.willowtreeapps.common.View
 
-interface SettingsView: View {
+interface SettingsView: View<SettingsPresenter> {
     fun showSettings(viewState: SettingsViewState)
 }
diff --git a/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/StartView.kt b/common/src/commonMain/kotlin/com/willowtreeapps/common/ui/StartView.kt
@@ -2,7 +2,7 @@ package com.willowtreeapps.common.ui
 
 import com.willowtreeapps.common.View
 
-interface StartView : View {
+interface StartView : View<StartPresenter> {
     fun showLoading()
     fun hideLoading()
     fun showError(msg: String)
diff --git a/iOS/NameGame/NameGame.xcodeproj/project.pbxproj b/iOS/NameGame/NameGame.xcodeproj/project.pbxproj
diff --git a/iOS/NameGame/NameGame/BaseNameGameViewController.swift b/iOS/NameGame/NameGame/BaseNameGameViewController.swift
diff --git a/iOS/NameGame/NameGame/GameResultsViewController.swift b/iOS/NameGame/NameGame/GameResultsViewController.swift
diff --git a/iOS/NameGame/NameGame/QuestionViewController.swift b/iOS/NameGame/NameGame/QuestionViewController.swift
diff --git a/iOS/NameGame/NameGame/SettingsViewController.swift b/iOS/NameGame/NameGame/SettingsViewController.swift
diff --git a/iOS/NameGame/NameGame/StartViewController.swift b/iOS/NameGame/NameGame/StartViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class GameEngine(navigator: Navigator,`
`33`	`33`	`init {`
`34`	`34`	`appStore.dispatch(Actions.LoadAllSettingsAction())`
`35`	`35`	`}`
`36`		`- fun attachView(view: View): Presenter<out View?> = presenterFactory.attachView(view)`
	`36`	`+ fun <T: Presenter<>>attachView(view: View<T>) = presenterFactory.attachView(view as View<Presenter<>>)`
`37`	`37`
`38`		`- fun detachView(view: View) = presenterFactory.detachView(view)`
	`38`	`+ fun detachView(view: View<*>) = presenterFactory.detachView(view)`
`39`	`39`	`}`