Skip to content

Commit 942b205

Browse files
Updated parameter orders, dependency versions, formatting
1 parent 8a4a159 commit 942b205

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

app/src/main/java/com/cornellappdev/hustle/ui/components/general/HustleButton.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import com.cornellappdev.hustle.ui.theme.HustleTheme
2828
fun HustleButton(
2929
onClick: () -> Unit,
3030
text: String?,
31-
textStyle: TextStyle = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
3231
modifier: Modifier = Modifier,
32+
textStyle: TextStyle = MaterialTheme.typography.titleSmall.copy(fontWeight = FontWeight.Bold),
3333
enabled: Boolean = true,
3434
shape: Shape = RoundedCornerShape(20.dp),
3535
border: BorderStroke? = null,

app/src/main/java/com/cornellappdev/hustle/ui/components/general/service/FavoriteButton.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ fun FavoriteButton(
4545
onClick = {
4646
if (!isFavorite) {
4747
coroutineScope.launch {
48-
// Animate the button to scale up and then back to normal size
4948
scale.animateTo(1.2f, spring(dampingRatio = Spring.DampingRatioMediumBouncy))
5049
scale.animateTo(1f, spring(dampingRatio = Spring.DampingRatioMediumBouncy))
5150
}

app/src/main/java/com/cornellappdev/hustle/ui/components/general/service/ServiceCard.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ fun ServiceCard(
5252
priceUnit: String,
5353
serviceRating: Double,
5454
onClick: () -> Unit,
55+
modifier: Modifier = Modifier,
5556
isFavorite: Boolean? = null,
5657
onFavoriteClick: (() -> Unit)? = null,
57-
cardType: ServiceCardType = ServiceCardType.DEFAULT,
58-
modifier: Modifier = Modifier
58+
cardType: ServiceCardType = ServiceCardType.DEFAULT
5959
) {
6060
val cardHeight = when (cardType) {
6161
ServiceCardType.DEFAULT -> 279.dp

app/src/main/java/com/cornellappdev/hustle/ui/components/general/service/ServiceRatingLabel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.ui.tooling.preview.Preview
1515
import androidx.compose.ui.unit.dp
1616
import com.cornellappdev.hustle.R
1717
import com.cornellappdev.hustle.ui.theme.HustleTheme
18+
import java.util.Locale
1819

1920
@Composable
2021
fun ServiceRatingLabel(
@@ -33,7 +34,7 @@ fun ServiceRatingLabel(
3334
tint = Color.Unspecified
3435
)
3536
Text(
36-
text = String.format("%.1f", rating),
37+
text = String.format(Locale.US, "%.1f", rating),
3738
style = textStyle
3839
)
3940
}

app/src/main/java/com/cornellappdev/hustle/util/constants/HustleConstants.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import androidx.annotation.DrawableRes
44
import com.cornellappdev.hustle.R
55

66
data class ServiceCategory(
7-
val name: String, @DrawableRes
8-
val iconResId: Int
7+
val name: String,
8+
@DrawableRes val iconResId: Int
99
)
1010

1111
val SERVICE_CATEGORIES = listOf(

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
agp = "8.13.0"
3-
hiltAndroid = "2.57.1"
2+
agp = "8.13.1"
3+
hiltAndroid = "2.57.2"
44
hiltNavigationCompose = "1.3.0"
5-
kotlin = "2.2.20"
5+
kotlin = "2.2.21"
66
coreKtx = "1.17.0"
77
junit = "4.13.2"
88
junitVersion = "1.3.0"
@@ -11,16 +11,16 @@ lifecycleRuntimeKtx = "2.9.4"
1111
activityCompose = "1.11.0"
1212
composeBom = "2025.11.00"
1313
retrofit = "3.0.0"
14-
okhttp = "5.1.0"
14+
okhttp = "5.3.2"
1515
slackComposeLint = "1.4.2"
1616
kotlinxSerialization = "1.9.0"
17-
composeNavigation = "2.9.5"
18-
firebaseBom = "34.3.0"
17+
composeNavigation = "2.9.6"
18+
firebaseBom = "34.6.0"
1919
credentialManager = "1.5.0"
2020
googleId = "1.1.1"
21-
google-services = "4.4.3"
21+
google-services = "4.4.4"
2222
coil = "3.3.0"
23-
splashScreen = "1.0.1"
23+
splashScreen = "1.2.0"
2424
dataStorePreferences = "1.1.7"
2525

2626
[libraries]

0 commit comments

Comments
 (0)