Skip to content

Commit 09c16f2

Browse files
committed
Change EventDataTransferManager clearing logic
1 parent ed97da2 commit 09c16f2

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,11 @@ fun EventTeamsView(eventId: Int, eventTeamsViewModel: EventTeamsViewModel = view
9090
) { padding ->
9191

9292
var loading by remember { mutableStateOf(eventTeamsViewModel.teams.isEmpty()) }
93+
var fetching by remember { mutableStateOf(false) }
9394

9495
fun fetchTeamsList() {
96+
if (fetching) return
97+
fetching = true
9598
CoroutineScope(Dispatchers.Default).launch {
9699
if (eventTeamsViewModel.teams.isNotEmpty()) {
97100
return@launch
@@ -106,6 +109,7 @@ fun EventTeamsView(eventId: Int, eventTeamsViewModel: EventTeamsViewModel = view
106109
event.getTeam(it.team.id) ?: Team()
107110
}, if (event.program.id == 4) "College" else "Not College").toMutableList()
108111
loading = false
112+
fetching = false
109113
}
110114
}
111115
else {
@@ -115,6 +119,7 @@ fun EventTeamsView(eventId: Int, eventTeamsViewModel: EventTeamsViewModel = view
115119
withContext(Dispatchers.Main) {
116120
eventTeamsViewModel.teams = event.teams
117121
loading = false
122+
fetching = false
118123
}
119124
}
120125
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,13 @@ class EventDataTransferManager {
202202

203203
fun getEvent(id: Int): Event? {
204204
val event = events[id]
205-
events.remove(id)
205+
//events.remove(id)
206206
return event
207207
}
208+
209+
fun clearEvents() {
210+
events.clear()
211+
}
208212
}
209213

210214
class EventViewModelStore {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class TeamEventsViewModel: ViewModel() {
5252
fun TeamEventsView(teamEventsViewModel: TeamEventsViewModel = viewModel(), navController: NavController, team: Team) {
5353

5454
LaunchedEffect(Unit) {
55+
eventDataTransferManager.clearEvents()
5556
if (teamEventsViewModel.events.isNotEmpty()) {
5657
return@LaunchedEffect
5758
}

0 commit comments

Comments
 (0)