Skip to content

Commit b4a18a7

Browse files
committed
Fetch event teams before loading EventView
1 parent 2fbc7d9 commit b4a18a7

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

.idea/deploymentTargetDropDown.xml

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/sunkensplashstudios/VRCRoboScout/EventInformation.kt renamed to app/src/main/java/com/sunkensplashstudios/VRCRoboScout/EventInformationView.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ import androidx.compose.ui.unit.dp
4040
import androidx.compose.ui.unit.sp
4141
import androidx.navigation.NavController
4242
import com.ramcosta.composedestinations.annotation.Destination
43-
import com.sunkensplashstudios.VRCRoboScout.ui.theme.*
43+
import com.sunkensplashstudios.VRCRoboScout.ui.theme.button
44+
import com.sunkensplashstudios.VRCRoboScout.ui.theme.onTopContainer
45+
import com.sunkensplashstudios.VRCRoboScout.ui.theme.topContainer
4446

4547

4648
@OptIn(ExperimentalMaterial3Api::class)

app/src/main/java/com/sunkensplashstudios/VRCRoboScout/EventView.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ import com.sunkensplashstudios.VRCRoboScout.destinations.EventInformationViewDes
5555
import com.sunkensplashstudios.VRCRoboScout.destinations.EventSkillsRankingsViewDestination
5656
import com.sunkensplashstudios.VRCRoboScout.destinations.EventTeamMatchesViewDestination
5757
import com.sunkensplashstudios.VRCRoboScout.destinations.EventTeamsViewDestination
58-
import com.sunkensplashstudios.VRCRoboScout.ui.theme.*
59-
58+
import com.sunkensplashstudios.VRCRoboScout.ui.theme.onTopContainer
59+
import com.sunkensplashstudios.VRCRoboScout.ui.theme.topContainer
6060
import kotlinx.coroutines.CoroutineScope
6161
import kotlinx.coroutines.Dispatchers
6262
import kotlinx.coroutines.launch
@@ -79,9 +79,14 @@ fun EventView(eventViewModel: EventViewModel = viewModel(), navController: NavCo
7979
return
8080
}
8181
eventViewModel.loading = true
82-
eventViewModel.event = event
83-
eventViewModel.loading = false
84-
eventViewModelStore.updateEventViewModel(eventViewModel)
82+
CoroutineScope(Dispatchers.Default).launch {
83+
event.fetchTeams()
84+
withContext(Dispatchers.Main) {
85+
eventViewModel.event = event
86+
eventViewModel.loading = false
87+
eventViewModelStore.updateEventViewModel(eventViewModel)
88+
}
89+
}
8590
}
8691

8792
LaunchedEffect(Unit) {

0 commit comments

Comments
 (0)