Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f5de683 authored by Michel Comin Escude's avatar Michel Comin Escude
Browse files

Fixing weatherEngine asset loader 

(original cl: go/aux-gerrit/21320)

Updated and fixed currentAssets wrong setting from the
original cl (go/aux-gerrit/20340)
Flag: EXEMPT MP apk not in build yet
Bug: 352352241
Test: visual

Change-Id: I363c46ea5842c8a3aa216a33c54897b2fcfba300
parent 50a66a22

weathereffects/debug/src/com/google/android/wallpaper/weathereffects/WallpaperEffectsDebugActivity.kt

+2 −3
Original line number Diff line number Diff line
@@ -68,15 +68,15 @@ class WallpaperEffectsDebugActivity : TorusViewerActivity() { 


    override fun getWallpaperEngine(context: Context, surfaceView: SurfaceView): TorusEngine {

        this.surfaceView = surfaceView

        val engine = WeatherEngine(surfaceView.holder, context)

        val engine = WeatherEngine(surfaceView.holder, mainScope, interactor, context)

        this.engine = engine

        return engine

    }



    @SuppressLint("ClickableViewAccessibility")

    override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)

        WallpaperEffectsDebugApplication.graph.inject(this)

        super.onCreate(savedInstanceState)



        setContentView(R.layout.debug_activity)

        setImmersiveFullScreen()
@@ -139,7 +139,6 @@ class WallpaperEffectsDebugActivity : TorusViewerActivity() { 
                view.onTouchEvent(event)

            }



        engine?.initialize(mainScope, interactor)

        setDebugText()

    }

weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherEngine.kt

+26 −27
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.util.Log 
import android.util.Size

import android.util.SizeF

import android.view.SurfaceHolder

import androidx.annotation.FloatRange

import com.google.android.torus.canvas.engine.CanvasWallpaperEngine

import com.google.android.wallpaper.weathereffects.shared.model.WallpaperImageModel

import com.google.android.wallpaper.weathereffects.domain.WeatherEffectsInteractor
@@ -40,11 +41,13 @@ import kotlinx.coroutines.launch 


class WeatherEngine(

    defaultHolder: SurfaceHolder,

    private val applicationScope: CoroutineScope,

    private val interactor: WeatherEffectsInteractor,

    private val context: Context,

    hardwareAccelerated: Boolean = true

) : CanvasWallpaperEngine(defaultHolder, hardwareAccelerated) {



    private val currentAssets: WallpaperImageModel? = null

    private var currentAssets: WallpaperImageModel? = null

    private var activeEffect: WeatherEffect? = null

        private set(value) {

            field = value
@@ -56,8 +59,16 @@ class WeatherEngine( 
        }



    private var collectWallpaperImageJob: Job? = null

    private lateinit var interactor: WeatherEffectsInteractor

    private lateinit var applicationScope: CoroutineScope

    private var effectIntensity: Float = 1f



    init {

        /* Load assets. */

        if (interactor.wallpaperImageModel.value == null) {

            applicationScope.launch {

                interactor.loadWallpaper()

            }

        }

    }



    override fun onCreate(isFirstActiveInstance: Boolean) {

        Log.d(TAG, "Engine created.")
@@ -70,31 +81,22 @@ class WeatherEngine( 
        }

    }



    fun initialize(

        applicationScope: CoroutineScope,

        interactor: WeatherEffectsInteractor,

    ) {

        this.interactor = interactor

        this.applicationScope = applicationScope



        if (interactor.wallpaperImageModel.value == null) {

            applicationScope.launch {

                interactor.loadWallpaper()

            }

        }

    }



    override fun onResume() {

        if (shouldTriggerUpdate()) {

            startUpdateLoop()

        }

        collectWallpaperImageJob = applicationScope.launch {

            interactor.wallpaperImageModel.collect { asset ->

                if (asset == null || asset == currentAssets) return@collect



                currentAssets = asset

                createWeatherEffect(asset.foreground, asset.background, asset.weatherEffect)

            }

        }

        if (shouldTriggerUpdate()) startUpdateLoop()

    }



    override fun onUpdate(deltaMillis: Long, frameTimeNanos: Long) {

        super.onUpdate(deltaMillis, frameTimeNanos)

        activeEffect?.update(deltaMillis, frameTimeNanos)



        renderWithFpsLimit(frameTimeNanos) { canvas -> activeEffect?.draw(canvas) }

    }



    override fun onPause() {
@@ -103,17 +105,14 @@ class WeatherEngine( 
        collectWallpaperImageJob?.cancel()

    }





    override fun onDestroy(isLastActiveInstance: Boolean) {

        activeEffect?.release()

        activeEffect = null

    }



    override fun onUpdate(deltaMillis: Long, frameTimeNanos: Long) {

        super.onUpdate(deltaMillis, frameTimeNanos)

        activeEffect?.update(deltaMillis, frameTimeNanos)



        renderWithFpsLimit(frameTimeNanos) { canvas -> activeEffect?.draw(canvas) }

    fun setIntensity(@FloatRange(from = 0.0, to = 1.0) intensity: Float) {

        effectIntensity = intensity

        activeEffect?.setIntensity(intensity)

    }



    private fun createWeatherEffect(

weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherWallpaperService.kt

+1 −3
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ class WeatherWallpaperService @Inject constructor(): LiveWallpaper() { 
    }



    override fun getWallpaperEngine(context: Context, surfaceHolder: SurfaceHolder): TorusEngine {

        val engine = WeatherEngine(surfaceHolder, context)

        engine.initialize(applicationScope, interactor)

        return engine

        return WeatherEngine(surfaceHolder, applicationScope, interactor, context)

    }

}