Skip to content

Commit a31909e

Browse files
committed
Fix spacing issue in team lookup on tall phones
1 parent e5c09cc commit a31909e

File tree

2 files changed

+33
-44
lines changed

2 files changed

+33
-44
lines changed

.idea/deploymentTargetDropDown.xml

Lines changed: 2 additions & 13 deletions
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/LookupView.kt

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
1313
import androidx.compose.foundation.layout.height
1414
import androidx.compose.foundation.layout.padding
1515
import androidx.compose.foundation.layout.size
16+
import androidx.compose.foundation.layout.sizeIn
1617
import androidx.compose.foundation.layout.width
1718
import androidx.compose.foundation.rememberScrollState
1819
import androidx.compose.foundation.text.KeyboardActions
@@ -253,19 +254,19 @@ fun TeamLookup(lookupViewModel: LookupViewModel, navController: NavController) {
253254
.padding(horizontal = 20.dp)
254255
.fillMaxWidth()
255256
) {
256-
Box(
257-
modifier = Modifier.width(40.dp)
258-
) {
259-
Icon(
260-
Icons.Filled.Star,
261-
modifier = Modifier
262-
.size(30.dp)
263-
.alpha(0F),
264-
contentDescription = "Spacer",
265-
)
266-
}
267-
Spacer(modifier = Modifier.weight(1.0F))
257+
Spacer(Modifier.width(10.dp)) // Thank you Android for making spacing weird
258+
Icon(
259+
Icons.Filled.Star,
260+
modifier = Modifier
261+
.size(30.dp)
262+
.alpha(0F),
263+
contentDescription = "Spacer",
264+
)
265+
Spacer(modifier = Modifier.weight(1.0f))
268266
TextField(
267+
modifier = Modifier.sizeIn(
268+
maxWidth = 200.dp,
269+
),
269270
value = lookupViewModel.number.value,
270271
onValueChange = { lookupViewModel.number.value = it },
271272
singleLine = true,
@@ -300,36 +301,35 @@ fun TeamLookup(lookupViewModel: LookupViewModel, navController: NavController) {
300301
lookupViewModel.fetchTeam()
301302
})
302303
)
303-
Spacer(modifier = Modifier.weight(1.0F))
304-
Box(
305-
modifier = Modifier.width(40.dp)
306-
) {
304+
Spacer(modifier = Modifier.weight(1.0f))
305+
Box {
307306
IconButton(onClick = {
308-
favoriteTeams = if (lookupViewModel.number.value.isEmpty() || lookupViewModel.number.value == "229V\u200B" || !lookupViewModel.fetchedTeams.value) {
309-
return@IconButton
310-
} else if (favoriteTeams.contains(lookupViewModel.number.value.uppercase()) && lookupViewModel.teamTextColor.value != Color.Unspecified) {
311-
userSettings.removeFavoriteTeam(lookupViewModel.number.value.uppercase())
312-
userSettings.getData("favoriteTeams", "").replace("[", "")
313-
.replace("]", "")
314-
.split(", ")
315-
} else {
316-
userSettings.addFavoriteTeam(lookupViewModel.number.value.uppercase())
317-
userSettings.getData("favoriteTeams", "").replace("[", "")
318-
.replace("]", "")
319-
.split(", ")
320-
}
307+
favoriteTeams =
308+
if (lookupViewModel.number.value.isEmpty() || lookupViewModel.number.value == "229V\u200B" || !lookupViewModel.fetchedTeams.value) {
309+
return@IconButton
310+
} else if (favoriteTeams.contains(lookupViewModel.number.value.uppercase()) && lookupViewModel.teamTextColor.value != Color.Unspecified) {
311+
userSettings.removeFavoriteTeam(lookupViewModel.number.value.uppercase())
312+
userSettings.getData("favoriteTeams", "").replace("[", "")
313+
.replace("]", "")
314+
.split(", ")
315+
} else {
316+
userSettings.addFavoriteTeam(lookupViewModel.number.value.uppercase())
317+
userSettings.getData("favoriteTeams", "").replace("[", "")
318+
.replace("]", "")
319+
.split(", ")
320+
}
321321
}) {
322322
if (favoriteTeams.contains(lookupViewModel.number.value.uppercase()) && lookupViewModel.number.value.isNotBlank()) {
323323
Icon(
324324
Icons.Filled.Star,
325-
contentDescription = "Favorite",
325+
contentDescription = "Unfavorite",
326326
modifier = Modifier.size(30.dp),
327327
tint = MaterialTheme.colorScheme.button
328328
)
329329
} else {
330330
Icon(
331331
Icons.Outlined.StarOutline,
332-
contentDescription = "Unfavorite",
332+
contentDescription = "Favorite",
333333
modifier = Modifier.size(30.dp),
334334
tint = MaterialTheme.colorScheme.button
335335
)

0 commit comments

Comments
 (0)