ref: remove coroutineScope
This commit is contained in:
@@ -31,7 +31,6 @@ import androidx.compose.runtime.LaunchedEffect
|
|||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
@@ -42,7 +41,6 @@ import androidx.compose.ui.text.font.FontWeight
|
|||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.viewinterop.AndroidView
|
import androidx.compose.ui.viewinterop.AndroidView
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import org.jsoup.Jsoup
|
import org.jsoup.Jsoup
|
||||||
import org.jsoup.safety.Safelist
|
import org.jsoup.safety.Safelist
|
||||||
@@ -55,11 +53,9 @@ import ru.risdeveau.pixeldragon.ui.item.MXCImage
|
|||||||
@Composable
|
@Composable
|
||||||
fun Room(modifier: Modifier = Modifier, rid: String) {
|
fun Room(modifier: Modifier = Modifier, rid: String) {
|
||||||
var eventsId by remember { mutableStateOf(listOf<Event>()) }
|
var eventsId by remember { mutableStateOf(listOf<Event>()) }
|
||||||
val coroutineScope = rememberCoroutineScope()
|
|
||||||
val listState = rememberLazyListState()
|
val listState = rememberLazyListState()
|
||||||
|
|
||||||
LaunchedEffect(true) {
|
LaunchedEffect(Unit) {
|
||||||
coroutineScope.launch {
|
|
||||||
withContext(Dispatchers.IO) {
|
withContext(Dispatchers.IO) {
|
||||||
val readMark = getAccountData(ME!!.userId, rid, "m.fully_read")
|
val readMark = getAccountData(ME!!.userId, rid, "m.fully_read")
|
||||||
val eventsAround = getEventsAround(rid, readMark!!.getString("event_id")) //FIXME: Null check
|
val eventsAround = getEventsAround(rid, readMark!!.getString("event_id")) //FIXME: Null check
|
||||||
@@ -68,7 +64,6 @@ fun Room(modifier: Modifier = Modifier, rid: String) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
LazyColumn(modifier = modifier, state = listState, reverseLayout = true) {
|
LazyColumn(modifier = modifier, state = listState, reverseLayout = true) {
|
||||||
items(eventsId.reversed()) { event ->
|
items(eventsId.reversed()) { event ->
|
||||||
|
|||||||
@@ -26,14 +26,12 @@ import androidx.compose.runtime.LaunchedEffect
|
|||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.navigation.NavController
|
import androidx.navigation.NavController
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import ru.risdeveau.pixeldragon.api.getRooms
|
import ru.risdeveau.pixeldragon.api.getRooms
|
||||||
import ru.risdeveau.pixeldragon.repo.Room
|
import ru.risdeveau.pixeldragon.repo.Room
|
||||||
@@ -42,7 +40,6 @@ import ru.risdeveau.pixeldragon.ui.item.MXCImage
|
|||||||
@Composable
|
@Composable
|
||||||
fun RoomList(modifier: Modifier = Modifier, navController: NavController) {
|
fun RoomList(modifier: Modifier = Modifier, navController: NavController) {
|
||||||
var list by remember { mutableStateOf(listOf<String>()) }
|
var list by remember { mutableStateOf(listOf<String>()) }
|
||||||
val coroutineScope = rememberCoroutineScope()
|
|
||||||
val listState = rememberLazyListState()
|
val listState = rememberLazyListState()
|
||||||
|
|
||||||
// if (itemState.scrollToTop) {
|
// if (itemState.scrollToTop) {
|
||||||
@@ -52,12 +49,8 @@ fun RoomList(modifier: Modifier = Modifier, navController: NavController) {
|
|||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
LaunchedEffect(true) {
|
LaunchedEffect(Unit) {
|
||||||
coroutineScope.launch {
|
list = withContext(Dispatchers.IO) { getRooms() }
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
list = getRooms()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LazyColumn(modifier = modifier, state = listState) {
|
LazyColumn(modifier = modifier, state = listState) {
|
||||||
@@ -76,14 +69,9 @@ fun RoomList(modifier: Modifier = Modifier, navController: NavController) {
|
|||||||
@Composable
|
@Composable
|
||||||
fun RoomItem(modifier: Modifier = Modifier, rid: String, navController: NavController) {
|
fun RoomItem(modifier: Modifier = Modifier, rid: String, navController: NavController) {
|
||||||
var room by remember { mutableStateOf<Room?>(null) }
|
var room by remember { mutableStateOf<Room?>(null) }
|
||||||
val scope = rememberCoroutineScope()
|
|
||||||
|
|
||||||
LaunchedEffect(true) {
|
LaunchedEffect(Unit) {
|
||||||
scope.launch {
|
room = withContext(Dispatchers.IO) { Room.getById(rid) }
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
room = Room.getById(rid)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (room != null) {
|
if (room != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user