Cleanup

android/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/NameGameAppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/NameGameAppTheme">

android/src/main/java/org/reduxkotlin/namegame/AndroidNavigator.kt

@@ -8,7 +8,7 @@ import androidx.navigation.findNavController
 import org.reduxkotlin.namegame.common.util.Logger
 import org.reduxkotlin.namegame.common.middleware.Navigator
 import org.reduxkotlin.namegame.common.middleware.Screen
-import org.reduxkotlin.namegame.store.SettingsDialogFragment
+import org.reduxkotlin.namegame.ui.SettingsDialogFragment
 import java.lang.Exception
 
 /**

android/src/main/java/org/reduxkotlin/namegame/Utils.kt

@@ -8,7 +8,7 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
-import org.reduxkotlin.namegame.GlideRequest
+import org.reduxkotlin.namegame.ui.GlideRequest
 
 val Int.dp: Int
     get() = (this / Resources.getSystem().displayMetrics.density).toInt()

android/src/main/java/org/reduxkotlin/namegame/store/BaseNameGameViewFragment.kt → android/src/main/java/org/reduxkotlin/namegame/ui/BaseNameGameViewFragment.kt

@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -9,7 +9,6 @@ open class BaseNameGameViewFragment<V: GameBaseView>: Fragment(), GameBaseView {
     private val presenterObserver = PresenterLifecycleObserver(this)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        retainInstance = true
         lifecycle.addObserver(presenterObserver)
         super.onCreate(savedInstanceState)
     }

android/src/main/java/org/reduxkotlin/namegame/store/GameResultsFragment.kt → android/src/main/java/org/reduxkotlin/namegame/ui/GameResultsFragment.kt

@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,11 +7,9 @@ import android.view.ViewGroup
 import org.reduxkotlin.namegame.common.middleware.UiActions
 import org.reduxkotlin.namegame.common.ui.GameResultsViewState
 import org.reduxkotlin.namegame.common.ui.GameResultsView
-import org.reduxkotlin.namegame.MainActivity
 import org.reduxkotlin.namegame.R
 import org.reduxkotlin.namegame.dispatch
 import kotlinx.android.synthetic.main.fragment_game_results.*
-import org.reduxkotlin.namegame.store.BaseNameGameViewFragment
 
 class GameResultsFragment : BaseNameGameViewFragment<GameResultsView>(), GameResultsView, MainActivity.IOnBackPressed {
 

android/src/main/java/org/reduxkotlin/namegame/MainActivity.kt → android/src/main/java/org/reduxkotlin/namegame/ui/MainActivity.kt

@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import android.os.Handler
@@ -11,6 +11,7 @@ import com.bumptech.glide.module.AppGlideModule
 import com.willowtreeapps.hyperion.core.Hyperion
 import kotlinx.android.synthetic.main.app_bar_main.*
 import kotlinx.android.synthetic.main.activity_main.*
+import org.reduxkotlin.namegame.R
 
 
 @GlideModule

android/src/main/java/org/reduxkotlin/namegame/store/QuestionFragment.kt → android/src/main/java/org/reduxkotlin/namegame/ui/QuestionFragment.kt

@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
@@ -22,7 +22,6 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import org.reduxkotlin.namegame.common.util.Logger
 import org.reduxkotlin.namegame.common.middleware.UiActions
 import org.reduxkotlin.namegame.*
-import org.reduxkotlin.namegame.MainActivity
 import org.reduxkotlin.namegame.dispatch
 import org.reduxkotlin.namegame.onComplete
 import java.util.*

android/src/main/java/org/reduxkotlin/namegame/store/SettingsDialogFragment.kt → android/src/main/java/org/reduxkotlin/namegame/ui/SettingsDialogFragment.kt

@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -12,7 +12,6 @@ import org.reduxkotlin.namegame.common.middleware.UiActions
 //import com.google.firebase.auth.FirebaseAuth
 import org.reduxkotlin.namegame.common.ui.SettingsView
 import org.reduxkotlin.namegame.common.ui.SettingsViewState
-import org.reduxkotlin.namegame.MainActivity
 import org.reduxkotlin.namegame.dispatch
 import kotlinx.android.synthetic.main.fragment_settings.*
 import org.reduxkotlin.PresenterLifecycleObserver

android/src/main/java/org/reduxkotlin/namegame/store/StartFragment.kt → android/src/main/java/org/reduxkotlin/namegame/ui/StartFragment.kt

@@ -1,4 +1,4 @@
-package org.reduxkotlin.namegame.store
+package org.reduxkotlin.namegame.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,7 +9,6 @@ import org.reduxkotlin.namegame.common.ui.StartView
 import kotlinx.android.synthetic.main.fragment_start.*
 import org.reduxkotlin.namegame.R
 import org.reduxkotlin.namegame.dispatch
-import org.reduxkotlin.namegame.store.BaseNameGameViewFragment
 
 class StartFragment : BaseNameGameViewFragment<StartView>(), StartView {