renamed package

changed return type for data from data store
thelumiereguy · Dec 27, 2020 · d776ca9 · d776ca9
1 parent 91a8d79
commit d776ca9
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 50 deletions.
diff --git a/app/src/main/java/com/thelumierguy/astroadventures/data/DataStoreHelper.kt b/app/src/main/java/com/thelumierguy/astroadventures/data/DataStoreHelper.kt
@@ -8,7 +8,7 @@ import androidx.datastore.preferences.core.preferencesKey
 import androidx.datastore.preferences.createDataStore
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 
@@ -28,9 +28,7 @@ object DataStoreHelper {
         )
 
         activity.lifecycleScope.launchWhenCreated {
-            getHasCompletedTutorial()?.collect {
-                LevelInfo.hasPlayedTutorial = it
-            }
+            LevelInfo.hasPlayedTutorial = getHasCompletedTutorial()
         }
     }
 
@@ -40,10 +38,8 @@ object DataStoreHelper {
         }
     }
 
-    private fun getHasCompletedTutorial(): Flow<Boolean> {
-        return dataStore?.data?.map { preference ->
-            preference[HAS_COMPLETED_LEVEL_ZERO] ?: false
-        } ?: flowOf(false)
+    private suspend fun getHasCompletedTutorial(): Boolean {
+        return dataStore?.data?.first()?.get(HAS_COMPLETED_LEVEL_ZERO) ?: false
     }
 
 

diff --git a/app/src/main/java/com/thelumierguy/astroadventures/ui/base/BaseCustomView.kt b/app/src/main/java/com/thelumierguy/astroadventures/ui/base/BaseCustomView.kt
@@ -6,11 +6,14 @@ import android.view.View
 import android.widget.FrameLayout
 import com.thelumierguy.astroadventures.utils.CustomLifeCycleOwner
 
-open class BaseCustomView(context: Context, attributeSet: AttributeSet? = null) :
-    View(context, attributeSet) {
+open class BaseCustomView(
+    context: Context,
+    attributeSet: AttributeSet? = null,
+) : View(context, attributeSet) {
 
     protected val lifeCycleOwner by lazy { CustomLifeCycleOwner() }
 
+    private var isActive = false
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         lifeCycleOwner.startListening()
@@ -20,13 +23,24 @@ open class BaseCustomView(context: Context, attributeSet: AttributeSet? = null)
         super.onDetachedFromWindow()
         lifeCycleOwner.stopListening()
     }
+
+    override fun onVisibilityAggregated(isVisible: Boolean) {
+        isActive = isVisible
+        super.onVisibilityAggregated(isVisible)
+    }
+
+    fun executeIfActive(block: () -> Unit) {
+        if (isActive)
+            block()
+    }
 }
 
-open class BaseCustomViewGroup(context: Context, attributeSet: AttributeSet? = null) :
+open class BaseFrameLayout(context: Context, attributeSet: AttributeSet? = null) :
     FrameLayout(context, attributeSet) {
 
     protected val lifeCycleOwner by lazy { CustomLifeCycleOwner() }
 
+    private var isActive = false
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         lifeCycleOwner.startListening()
@@ -36,4 +50,14 @@ open class BaseCustomViewGroup(context: Context, attributeSet: AttributeSet? = n
         super.onDetachedFromWindow()
         lifeCycleOwner.stopListening()
     }
+
+    override fun onVisibilityAggregated(isVisible: Boolean) {
+        isActive = isVisible
+        super.onVisibilityAggregated(isVisible)
+    }
+
+    fun executeIfActive(block: () -> Unit) {
+        if (isActive)
+            block()
+    }
 }
diff --git a/app/src/main/java/com/thelumierguy/astroadventures/ui/game/views/bullets/BulletView.kt b/app/src/main/java/com/thelumierguy/astroadventures/ui/game/views/bullets/BulletView.kt
@@ -5,18 +5,18 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.util.AttributeSet
+import android.view.View
 import androidx.core.content.res.ResourcesCompat
 import com.thelumierguy.astroadventures.R
 import com.thelumierguy.astroadventures.data.SoftBodyObject
 import com.thelumierguy.astroadventures.data.SoftBodyObjectType
-import com.thelumierguy.astroadventures.ui.base.BaseCustomView
 import com.thelumierguy.astroadventures.utils.SoundManager
 import com.thelumierguy.astroadventures.utils.forEachMutableSafe
 import com.thelumierguy.astroadventures.utils.forEachSafe
 import java.util.*
 
 class BulletView(context: Context, attributeSet: AttributeSet? = null) :
-    BaseCustomView(context, attributeSet) {
+    View(context, attributeSet) {
 
     private var fireSoundManager: SoundManager? = null
 

diff --git a/app/src/main/java/com/thelumierguy/astroadventures/ui/game/views/drops/DropsView.kt b/app/src/main/java/com/thelumierguy/astroadventures/ui/game/views/drops/DropsView.kt
@@ -5,6 +5,7 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.RectF
 import android.util.AttributeSet
+import android.view.View
 import androidx.core.content.res.ResourcesCompat
 import com.thelumierguy.astroadventures.R
 import com.thelumierguy.astroadventures.data.DropType
@@ -18,7 +19,7 @@ import java.util.*
 import kotlin.random.Random
 
 class DropsView(context: Context, attributeSet: AttributeSet? = null) :
-    BaseCustomView(context, attributeSet) {
+    View(context, attributeSet) {
 
     private var fireSoundManager: SoundManager? = null
 

diff --git a/...rc/main/java/com/thelumierguy/astroadventures/ui/game/views/enemyShip/EnemyClusterView.kt b/...rc/main/java/com/thelumierguy/astroadventures/ui/game/views/enemyShip/EnemyClusterView.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.channels.ticker
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.launch
 import java.util.*
 
 
@@ -97,15 +96,17 @@ class EnemyClusterView(context: Context, attributeSet: AttributeSet? = null) :
      */
     private fun startTranslating() {
         translateJob.cancel()
-        translateJob = lifeCycleOwner.customViewLifeCycleScope.launch {
+        translateJob = lifeCycleOwner.customViewLifeCycleScope.launchWhenCreated {
             enemyTimerFlow.collect {
-                enemyList.checkIfYReached(measuredHeight) { hasReachedMax ->
-                    if (hasReachedMax) {
-                        resetEnemies()
-                    }
-                    if (enemyList.isNotEmpty()) {
-                        translateEnemy(System.currentTimeMillis())
-                        invalidate()
+                executeIfActive {
+                    enemyList.checkIfYReached(measuredHeight) { hasReachedMax ->
+                        if (hasReachedMax) {
+                            resetEnemies()
+                        }
+                        if (enemyList.isNotEmpty()) {
+                            translateEnemy(System.currentTimeMillis())
+                            invalidate()
+                        }
                     }
                 }
             }
@@ -116,13 +117,15 @@ class EnemyClusterView(context: Context, attributeSet: AttributeSet? = null) :
     private fun fireCanon() {
         if (shouldEmitObjects()) {
             firingJob.cancel()
-            firingJob = lifeCycleOwner.customViewLifeCycleScope.launch {
+            firingJob = lifeCycleOwner.customViewLifeCycleScope.launchWhenCreated {
                 ticker(1000, 200).receiveAsFlow().collect {
-                    if (enemyList.isNotEmpty()) {
-                        val enemyList = enemyList.random()
-                        val enemy = enemyList.enemyList.findLast { it.isVisible }
-                        enemy?.let {
-                            enemyDetailsCallback?.onCanonReady(enemy.enemyX, enemy.enemyY)
+                    executeIfActive {
+                        if (enemyList.isNotEmpty()) {
+                            val enemyList = enemyList.random()
+                            val enemy = enemyList.enemyList.findLast { it.isVisible }
+                            enemy?.let {
+                                enemyDetailsCallback?.onCanonReady(enemy.enemyX, enemy.enemyY)
+                            }
                         }
                     }
                 }

diff --git a/...main/java/com/thelumierguy/astroadventures/ui/game/views/playerhealth/PlayerHealthView.kt b/...main/java/com/thelumierguy/astroadventures/ui/game/views/playerhealth/PlayerHealthView.kt
@@ -21,8 +21,10 @@ import kotlin.math.roundToInt
 import kotlin.math.sin
 
 
-class PlayerHealthView constructor(context: Context, attributeSet: AttributeSet? = null) :
-    BaseCustomView(context, attributeSet) {
+class PlayerHealthView constructor(
+    context: Context,
+    attributeSet: AttributeSet? = null,
+) : BaseCustomView(context, attributeSet) {
 
     private val heartPaint by lazy {
         Paint().apply {
@@ -73,7 +75,7 @@ class PlayerHealthView constructor(context: Context, attributeSet: AttributeSet?
 
 
     private fun startObservingHealth() {
-        lifeCycleOwner.customViewLifeCycleScope.launch {
+        lifeCycleOwner.customViewLifeCycleScope.launchWhenCreated {
             PlayerHealthInfo.getPlayerHealthFlow().collect { life ->
                 launch {
                     if (life <= 0) {

diff --git a/...ain/java/com/thelumierguy/astroadventures/ui/menu/views/background/StarsBackgroundView.kt b/...ain/java/com/thelumierguy/astroadventures/ui/menu/views/background/StarsBackgroundView.kt
@@ -5,11 +5,10 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
 import android.util.AttributeSet
-import android.widget.FrameLayout
 import androidx.core.content.res.ResourcesCompat
 import com.thelumierguy.astroadventures.R
 import com.thelumierguy.astroadventures.data.GlobalCounter
-import com.thelumierguy.astroadventures.utils.CustomLifeCycleOwner
+import com.thelumierguy.astroadventures.ui.base.BaseFrameLayout
 import com.thelumierguy.astroadventures.utils.forEachSafe
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -18,12 +17,10 @@ import kotlin.random.Random
 
 
 class StarsBackgroundView(context: Context, attributeSet: AttributeSet? = null) :
-    FrameLayout(context, attributeSet) {
+    BaseFrameLayout(context, attributeSet) {
 
     private var enableWarp: Boolean = false
 
-    private val lifeCycleOwner by lazy { CustomLifeCycleOwner() }
-
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         lifeCycleOwner.startListening()
@@ -79,16 +76,18 @@ class StarsBackgroundView(context: Context, attributeSet: AttributeSet? = null)
 
     private fun startObservingTimer() {
         GlobalCounter.starsBackgroundTimerFlow.onEach {
-            if (enableWarp) {
-                trailsList.forEachSafe { trails, iterator ->
-                    trails.translate()
-                }
-            } else {
-                starsList.forEachSafe { stars, iterator ->
-                    stars.translate()
+            executeIfActive {
+                if (enableWarp) {
+                    trailsList.forEachSafe { trails, iterator ->
+                        trails.translate()
+                    }
+                } else {
+                    starsList.forEachSafe { stars, iterator ->
+                        stars.translate()
+                    }
                 }
+                invalidate()
             }
-            invalidate()
         }.launchIn(lifeCycleOwner.customViewLifeCycleScope)
     }
 

diff --git a/...troadventures/ui/base/AnimatedTextView.kt → .../menu/views/scoreview/AnimatedTextView.kt b/...troadventures/ui/base/AnimatedTextView.kt → .../menu/views/scoreview/AnimatedTextView.kt
@@ -1,4 +1,4 @@
-package com.thelumierguy.astroadventures.ui.base
+package com.thelumierguy.astroadventures.ui.menu.views.scoreview
 
 import android.animation.Animator
 import android.animation.ValueAnimator

diff --git a/app/src/main/java/com/thelumierguy/astroadventures/utils/CustomLifeCycleOwner.kt b/app/src/main/java/com/thelumierguy/astroadventures/utils/CustomLifeCycleOwner.kt
@@ -25,4 +25,6 @@ class CustomLifeCycleOwner : LifecycleOwner {
     init {
         mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
     }
+
+
 }
diff --git a/app/src/main/res/layout/level_complete_scene.xml b/app/src/main/res/layout/level_complete_scene.xml
@@ -120,7 +120,7 @@
                 tools:text="200" />
 
 
-            <com.thelumierguy.astroadventures.ui.base.AnimatedTextView
+            <com.thelumierguy.astroadventures.ui.menu.views.scoreview.AnimatedTextView
                 android:id="@+id/bulletCountValueView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -135,7 +135,7 @@
                 tools:text="200" />
 
 
-            <com.thelumierguy.astroadventures.ui.base.AnimatedTextView
+            <com.thelumierguy.astroadventures.ui.menu.views.scoreview.AnimatedTextView
                 android:id="@+id/totalScoreValueView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/level_complete_scoreboard_scene.xml b/app/src/main/res/layout/level_complete_scoreboard_scene.xml
@@ -120,7 +120,7 @@
                 tools:text="200" />
 
 
-            <com.thelumierguy.astroadventures.ui.base.AnimatedTextView
+            <com.thelumierguy.astroadventures.ui.menu.views.scoreview.AnimatedTextView
                 android:id="@+id/bulletCountValueView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -135,7 +135,7 @@
                 tools:text="200" />
 
 
-            <com.thelumierguy.astroadventures.ui.base.AnimatedTextView
+            <com.thelumierguy.astroadventures.ui.menu.views.scoreview.AnimatedTextView
                 android:id="@+id/totalScoreValueView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

diff --git a/astro_adventures.apk b/astro_adventures.apk
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,6 @@ class CustomLifeCycleOwner : LifecycleOwner { @@
         init {
             mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
         }
     }