wbrawner/PeopleInSpace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace with collectAsStateWithLifecycle extension

Browse source
This commit is contained in:
andrethiele 2021-04-23 13:24:31 +02:00
parent a1f14057d1
commit 780c7f1f65
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/surrus/peopleinspace/ui/ISSPositionScreen.kt
View file

@ -3,18 +3,14 @@ package com.surrus.peopleinspace.ui
import androidx.compose.foundation.layout.*
import androidx.compose.material.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.flowWithLifecycle
import com.surrus.common.remote.IssPosition
import com.surrus.peopleinspace.util.rememberWithLifecycle
import com.surrus.peopleinspace.util.collectAsStateWithLifecycle
import org.koin.androidx.compose.getViewModel
import org.osmdroid.util.GeoPoint
import org.osmdroid.views.CustomZoomButtonsController
@ -28,8 +24,10 @@ fun ISSPositionScreen() {
val lifecycleOwner = LocalLifecycleOwner.current
val issPosition by peopleInSpaceViewModel.issPosition
.rememberWithLifecycle(lifecycleOwner)
.collectAsState(IssPosition(0.0, 0.0))
.collectAsStateWithLifecycle(
owner = lifecycleOwner,
initial = IssPosition(0.0, 0.0)
)
val context = LocalContext.current
val map = remember { MapView(context) }

9
app/src/main/java/com/surrus/peopleinspace/util/FlowExtensions.kt
View file

@ -1,6 +1,8 @@
package com.surrus.peopleinspace.util
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.remember
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
@ -8,11 +10,12 @@ import androidx.lifecycle.flowWithLifecycle
import kotlinx.coroutines.flow.Flow
@Composable
fun <T> Flow<T>.rememberWithLifecycle(
fun <T> Flow<T>.collectAsStateWithLifecycle(
owner: LifecycleOwner,
initial: T,
minActiveState: Lifecycle.State = Lifecycle.State.STARTED,
): Flow<T> {
): State<T> {
return remember(this, owner) {
flowWithLifecycle(owner.lifecycle, minActiveState)
}
}.collectAsState(initial)
}