Optimizes MultiSetCompose
This commit is contained in:
@@ -53,17 +53,19 @@ import kotlinx.coroutines.launch
|
|||||||
@OptIn(ExperimentalFoundationApi::class)
|
@OptIn(ExperimentalFoundationApi::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
|
fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accountViewModel: AccountViewModel, navController: NavController) {
|
||||||
val noteState by multiSetCard.note.live().metadata.observeAsState()
|
val baseNote = remember { multiSetCard.note }
|
||||||
val note = remember(noteState) { noteState?.note }
|
|
||||||
|
val noteState by baseNote.live().metadata.observeAsState()
|
||||||
|
val note = remember(noteState) { noteState?.note } ?: return
|
||||||
|
|
||||||
val accountState by accountViewModel.accountLiveData.observeAsState()
|
val accountState by accountViewModel.accountLiveData.observeAsState()
|
||||||
val account = remember(accountState) { accountState?.account }
|
val account = remember(accountState) { accountState?.account } ?: return
|
||||||
|
|
||||||
var popupExpanded by remember { mutableStateOf(false) }
|
var popupExpanded by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
|
|
||||||
if (note == null || account == null) {
|
if (note.event == null) {
|
||||||
BlankNote(Modifier, false)
|
BlankNote(Modifier, false)
|
||||||
} else {
|
} else {
|
||||||
var isNew by remember { mutableStateOf(false) }
|
var isNew by remember { mutableStateOf(false) }
|
||||||
@@ -98,7 +100,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
|
|||||||
onClick = {
|
onClick = {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
routeFor(
|
routeFor(
|
||||||
note,
|
baseNote,
|
||||||
account.userProfile()
|
account.userProfile()
|
||||||
)?.let { navController.navigate(it) }
|
)?.let { navController.navigate(it) }
|
||||||
}
|
}
|
||||||
@@ -129,7 +131,7 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
|
|||||||
Spacer(modifier = Modifier.width(65.dp))
|
Spacer(modifier = Modifier.width(65.dp))
|
||||||
|
|
||||||
NoteCompose(
|
NoteCompose(
|
||||||
baseNote = multiSetCard.note,
|
baseNote = baseNote,
|
||||||
routeForLastRead = null,
|
routeForLastRead = null,
|
||||||
modifier = Modifier.padding(top = 5.dp),
|
modifier = Modifier.padding(top = 5.dp),
|
||||||
isBoostedNote = true,
|
isBoostedNote = true,
|
||||||
|
|||||||
Reference in New Issue
Block a user