refactor packaging and naming

Author: patjackson52

app/src/main/java/com/willowtreeapps/namegame/NameGameApp.kt

@@ -2,26 +2,24 @@ package com.willowtreeapps.namegame
 
 import android.app.Application
 import com.willowtreeapps.common.GameEngine
-import com.willowtreeapps.common.PresenterFactory
 import kotlinx.coroutines.Dispatchers
 
 class NameGameApp : Application() {
 
     lateinit var gameEngine: GameEngine
-    lateinit var navigator: AndroidNavigator
-    lateinit var presenterFactory: PresenterFactory
 
     override fun onCreate() {
         super.onCreate()
         instance = this
-        navigator = AndroidNavigator()
-        gameEngine = GameEngine(navigator, this)
-        presenterFactory = PresenterFactory(gameEngine, Dispatchers.IO)
+        val navigator = AndroidNavigator()
+        gameEngine = GameEngine(navigator, this, Dispatchers.IO)
 
         registerActivityLifecycleCallbacks(navigator)
     }
 
     companion object {
         lateinit var instance: NameGameApp
+
+        fun gameEngine() = instance.gameEngine
     }
 }

app/src/main/java/com/willowtreeapps/namegame/store/GameResultsFragment.kt

@@ -5,9 +5,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.willowtreeapps.common.GameResultsPresenter
 import com.willowtreeapps.common.GameResultsViewState
-import com.willowtreeapps.common.view.GameResultsScreen
+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
@@ -16,16 +16,15 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
 
-class GameResultsFragment : Fragment(), CoroutineScope, GameResultsScreen, MainActivity.IOnBackPressed {
+class GameResultsFragment : Fragment(), CoroutineScope, GameResultsView, MainActivity.IOnBackPressed {
 
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Main
 
-    var presenter: GameResultsPresenter? = null
+    private var presenter: GameResultsPresenter? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.fragment_game_results, container, false)
-        return view
+        return inflater.inflate(R.layout.fragment_game_results, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -34,19 +33,19 @@ class GameResultsFragment : Fragment(), CoroutineScope, GameResultsScreen, MainA
 
     private fun initViews() {
         btn_start_over.setOnClickListener {
-            NameGameApp.instance.presenterFactory.detachView(presenter!!)
+            NameGameApp.gameEngine().detachView(presenter!!)
             presenter?.startOverTapped()
         }
     }
 
     override fun onResume() {
         super.onResume()
-        presenter = NameGameApp.instance.presenterFactory.attachView(this) as GameResultsPresenter
+        presenter = NameGameApp.gameEngine().attachView(this) as GameResultsPresenter
     }
 
     override fun onPause() {
         super.onPause()
-        NameGameApp.instance.presenterFactory.detachView(presenter!!)
+        NameGameApp.gameEngine().detachView(presenter!!)
     }
 
     override fun showResults(viewState: GameResultsViewState) {

app/src/main/java/com/willowtreeapps/namegame/store/QuestionFragment.kt

@@ -12,9 +12,8 @@ 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.QuestionPresenter
 import com.willowtreeapps.common.QuestionViewState
-import com.willowtreeapps.common.view.QuestionScreen
+import com.willowtreeapps.common.ui.QuestionView
 import kotlinx.android.synthetic.main.fragment_question.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -24,34 +23,35 @@ import java.lang.IllegalStateException
 import kotlin.coroutines.CoroutineContext
 import android.widget.Button
 import androidx.annotation.ColorRes
+import com.willowtreeapps.common.ui.QuestionPresenter
 import com.willowtreeapps.namegame.*
 
 
-class QuestionFragment : Fragment(), CoroutineScope, QuestionScreen, MainActivity.IOnBackPressed {
+class QuestionFragment : Fragment(), CoroutineScope, QuestionView, MainActivity.IOnBackPressed {
 
     private var presenter: QuestionPresenter? = null
 
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Main
 
-    var restoreX: Float? = null
-    var restoreY: Float? = null
+    private var restoreX: Float? = null
+    private var restoreY: Float? = null
     @ColorRes
     var lastCorrectBtn: Button? = null
-    var lastSelectedBtn: Button? = null
+    private var lastSelectedBtn: Button? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_question, container, false)
     }
 
     override fun onResume() {
         super.onResume()
-        presenter = NameGameApp.instance.presenterFactory.attachView(this) as QuestionPresenter
+        presenter = NameGameApp.gameEngine().attachView(this) as QuestionPresenter
     }
 
     override fun onPause() {
         super.onPause()
-        NameGameApp.instance.presenterFactory.detachView(presenter!!)
+        NameGameApp.gameEngine().detachView(presenter!!)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -69,7 +69,7 @@ class QuestionFragment : Fragment(), CoroutineScope, QuestionScreen, MainActivit
 
 
     override fun onBackPressed(): Boolean {
-        NameGameApp.instance.presenterFactory.detachView(presenter!!)
+        NameGameApp.gameEngine().detachView(presenter!!)
         presenter?.onBackPressed()
         return false
     }

app/src/main/java/com/willowtreeapps/namegame/store/StartFragment.kt

@@ -5,15 +5,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.willowtreeapps.common.StartPresenter
-import com.willowtreeapps.common.view.StartScreen
+import com.willowtreeapps.common.ui.StartPresenter
+import com.willowtreeapps.common.ui.StartView
 import com.willowtreeapps.namegame.*
 import kotlinx.android.synthetic.main.fragment_start.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
 
-class StartFragment : Fragment(), CoroutineScope, StartScreen {
+class StartFragment : Fragment(), CoroutineScope, StartView {
 
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Main
@@ -34,12 +34,12 @@ class StartFragment : Fragment(), CoroutineScope, StartScreen {
 
     override fun onResume() {
         super.onResume()
-        presenter = NameGameApp.instance.presenterFactory.attachView(this) as StartPresenter
+        presenter = NameGameApp.gameEngine().attachView(this) as StartPresenter
     }
 
     override fun onPause() {
         super.onPause()
-        NameGameApp.instance.presenterFactory.detachView(presenter!!)
+        NameGameApp.gameEngine().detachView(presenter!!)
     }
 
     override fun hideLoading() {
@@ -53,14 +53,4 @@ class StartFragment : Fragment(), CoroutineScope, StartScreen {
             loading_spinner.visibility = View.VISIBLE
         }
     }
-
-//    override fun onStart() {
-//        super.onStart()
-//        presenter = NameGameApp.instance.presenterFactory.attachView(this) as StartPresenter
-//    }
-//
-//    override fun onStop() {
-//        super.onStop()
-//        NameGameApp.instance.presenterFactory.detachView(presenter!!)
-//    }
 }

common/build.gradle

@@ -39,8 +39,8 @@ kotlin {
 
 //         Change to `presets.iosArm64` to deploy the app to iPhone
 //         Change to `presets.iosX64` to deploy the app to iPhone
-            fromPreset(presets.iosX64, 'ios') {
-//            fromPreset(presets.iosArm64, 'ios') {
+//            fromPreset(presets.iosX64, 'ios') {
+            fromPreset(presets.iosArm64, 'ios') {
             compilations.main.outputKinds('FRAMEWORK')
         }
     }

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

@@ -18,6 +18,6 @@ sealed class Actions : Action {
     class GameCompleteAction
 
     class StartOverAction
-    class ResetGameStateAction()
+    class ResetGameStateAction
 
 }

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

@@ -1,13 +1,6 @@
 package com.willowtreeapps.common
 
-import com.beyondeye.reduks.SimpleStore
-import com.beyondeye.reduks.middlewares.applyMiddleware
-import com.beyondeye.reduks.middlewares.thunkMiddleware
-import com.willowtreeapps.common.middleware.NavigationMiddleware
-import com.willowtreeapps.common.middleware.Navigator
-import com.willowtreeapps.common.middleware.ViewEffectsMiddleware
 import com.willowtreeapps.common.repo.Profile
-import com.willowtreeapps.common.util.VibrateUtil
 
 data class AppState(val isLoadingProfiles: Boolean = false,
                     val profiles: List<Profile> = listOf(),
@@ -32,7 +25,7 @@ data class AppState(val isLoadingProfiles: Boolean = false,
 
     fun getProfile(id: ProfileId?) = profiles.find { it.id == id?.id }
 
-    public fun currentQuestionProfile() = getProfile(currentQuestion?.profileId)!!
+    fun currentQuestionProfile() = getProfile(currentQuestion?.profileId)!!
 
     fun isGameComplete(): Boolean = currentQuestionIndex >= questions.size || (currentQuestionIndex == questions.size - 1 && questions[currentQuestionIndex].status != Question.Status.UNANSWERED)
 
@@ -53,16 +46,3 @@ data class Question(val profileId: ProfileId,
     }
 }
 
-class GameEngine(navigator: Navigator, application: Any = Any()) {
-    private val navigationMiddleware = NavigationMiddleware(navigator)
-    private val viewEffectsMiddleware = ViewEffectsMiddleware()
-    val vibrateUtil = VibrateUtil(application)
-
-    val appStore by lazy {
-        SimpleStore(AppState.INITIAL_STATE, reducer)
-                .applyMiddleware(::thunkMiddleware,
-                        viewEffectsMiddleware::dispatch,
-                        navigationMiddleware::dispatch)
-    }
-}
-

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

@@ -0,0 +1,29 @@
+package com.willowtreeapps.common
+
+import com.beyondeye.reduks.SimpleStore
+import com.beyondeye.reduks.middlewares.applyMiddleware
+import com.beyondeye.reduks.middlewares.thunkMiddleware
+import com.willowtreeapps.common.middleware.NavigationMiddleware
+import com.willowtreeapps.common.middleware.Navigator
+import com.willowtreeapps.common.middleware.ViewEffectsMiddleware
+import com.willowtreeapps.common.util.VibrateUtil
+import kotlin.coroutines.CoroutineContext
+
+class GameEngine(navigator: Navigator, application: Any = Any(), networkContext: CoroutineContext) {
+    private val navigationMiddleware = NavigationMiddleware(navigator)
+    private val viewEffectsMiddleware = ViewEffectsMiddleware()
+    private val presenterFactory by lazy {  PresenterFactory(this, networkContext) }
+    val vibrateUtil = VibrateUtil(application)
+
+    val appStore by lazy {
+        SimpleStore(AppState.INITIAL_STATE, reducer)
+                .applyMiddleware(::thunkMiddleware,
+                        viewEffectsMiddleware::dispatch,
+                        navigationMiddleware::dispatch)
+    }
+
+    fun attachView(view: View): Presenter = presenterFactory.attachView(view)
+
+    fun detachView(presenter: Presenter) = presenterFactory.detachView(presenter)
+
+}