Skip to content

Commit b761953

Browse files
committed
Make favorites links open appropriate lookup
1 parent eac3d03 commit b761953

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.compose.material3.TopAppBarDefaults
2727
import androidx.compose.runtime.Composable
2828
import androidx.compose.runtime.LaunchedEffect
2929
import androidx.compose.runtime.mutableStateMapOf
30+
import androidx.compose.runtime.mutableStateOf
3031
import androidx.compose.runtime.remember
3132
import androidx.compose.ui.Alignment
3233
import androidx.compose.ui.Modifier
@@ -181,6 +182,7 @@ fun FavoritesView(favoritesViewModel: FavoritesViewModel = viewModels["favorites
181182
"Find a team",
182183
modifier = Modifier.padding(vertical = 10.dp, horizontal = 0.dp).fillMaxWidth().clickable {
183184
navController.navigate(LookupViewDestination())
185+
(viewModels["lookup_view"] as LookupViewModel).lookupType = mutableStateOf("Teams")
184186
onSelectedTabIndexChange(3)
185187
},
186188
color = MaterialTheme.colorScheme.button
@@ -278,6 +280,7 @@ fun FavoritesView(favoritesViewModel: FavoritesViewModel = viewModels["favorites
278280
modifier = Modifier.padding(vertical = 5.dp, horizontal = 5.dp).fillMaxWidth()
279281
.clickable {
280282
navController.navigate(LookupViewDestination())
283+
(viewModels["lookup_view"] as LookupViewModel).lookupType = mutableStateOf("Events")
281284
onSelectedTabIndexChange(3)
282285
},
283286
color = MaterialTheme.colorScheme.button

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import androidx.compose.runtime.Composable
4343
import androidx.compose.runtime.LaunchedEffect
4444
import androidx.compose.runtime.getValue
4545
import androidx.compose.runtime.mutableDoubleStateOf
46+
import androidx.compose.runtime.mutableIntStateOf
4647
import androidx.compose.runtime.mutableStateOf
4748
import androidx.compose.runtime.remember
4849
import androidx.compose.runtime.setValue
@@ -96,7 +97,7 @@ class LookupViewModel : ViewModel() {
9697
var eventTextColor = mutableStateOf(Color.Gray)
9798
var eventName = mutableStateOf("Event Name")
9899
var events = mutableStateOf(listOf<Event>())
99-
var page = mutableStateOf(1)
100+
var page = mutableIntStateOf(1)
100101
var fetchedEvents = mutableStateOf(false)
101102
var loadingEvents = mutableStateOf(false)
102103

@@ -260,7 +261,7 @@ fun TeamLookup(lookupViewModel: LookupViewModel, navController: NavController) {
260261
modifier = Modifier
261262
.size(30.dp)
262263
.alpha(0F),
263-
contentDescription = "Unfavorite",
264+
contentDescription = "Spacer",
264265
)
265266
}
266267
Spacer(modifier = Modifier.weight(1.0F))
@@ -304,7 +305,7 @@ fun TeamLookup(lookupViewModel: LookupViewModel, navController: NavController) {
304305
modifier = Modifier.width(40.dp)
305306
) {
306307
IconButton(onClick = {
307-
favoriteTeams = if (lookupViewModel.number.value.isEmpty() || lookupViewModel.number.value == "229V\u200B") {
308+
favoriteTeams = if (lookupViewModel.number.value.isEmpty() || lookupViewModel.number.value == "229V\u200B" || !lookupViewModel.fetchedTeams.value) {
308309
return@IconButton
309310
} else if (favoriteTeams.contains(lookupViewModel.number.value.uppercase()) && lookupViewModel.teamTextColor.value != Color.Unspecified) {
310311
userSettings.removeFavoriteTeam(lookupViewModel.number.value.uppercase())

0 commit comments

Comments
 (0)