Skip to content

Implement Add Favorites Button #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanCheung555 merged 17 commits into from
Feb 12, 2026
+164 −65
Merged

Implement Add Favorites Button #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5a27555
Created AddFavorite component
RyanCheung555 Jan 28, 2026
5204a17
Added functionality to Add Favorite button
RyanCheung555 Jan 29, 2026
67fd264
TODO: create search screen
RyanCheung555 Feb 4, 2026
db8b91f
add favorite button parameters
RyanCheung555 Feb 8, 2026
efc2562
fix: move add fav button to only show when in favorites tab, fix desi…
RyanCheung555 Feb 8, 2026
9c5faca
feat: Add plus icon to add favorites button
RyanCheung555 Feb 8, 2026
0b64cf9
fix: change text to use MetadataGray when unselected in FilterRow
RyanCheung555 Feb 8, 2026
4eb8ec7
refactor: move state handling logic from home screen to home view model
RyanCheung555 Feb 8, 2026
277df1a
Add toast message when location is favorited instead of dismissing bo…
RyanCheung555 Feb 8, 2026
17bd173
chore: fix formatting and delete unused imports
RyanCheung555 Feb 8, 2026
07ba239
fix: make AddFavoriteButton preview private
RyanCheung555 Feb 11, 2026
4f80ab6
refactor: rename instances of 'favorite' to 'favorites'
RyanCheung555 Feb 11, 2026
41120f4
refactor: use import of bottomSheetState/Scaffold instead of directly…
RyanCheung555 Feb 11, 2026
e9dcad2
refactor: use collectAsStateWithLifeCycle instead of collectAsState
RyanCheung555 Feb 11, 2026
fc55ae2
refactor: Use spacer instead of padding
RyanCheung555 Feb 11, 2026
a0b62b4
refactor: move component padding to outside container by using spacers
RyanCheung555 Feb 12, 2026
1cdcbd6
Merge branch 'main' into ryan/add-favorites
RyanCheung555 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ android {
"proguard-rules.pro"
)
buildConfigField("boolean", "ECOSYSTEM_FLAG", "false")
signingConfig = signingConfigs.getByName("debug")
}
}
compileOptions {
Expand Down
65 changes: 65 additions & 0 deletions app/src/main/java/com/cornellappdev/transit/ui/components/home/AddFavoritesButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package com.cornellappdev.transit.ui.components.home

import android.R.attr.text
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.cornellappdev.transit.R
import com.cornellappdev.transit.ui.theme.SecondaryText
import com.cornellappdev.transit.ui.theme.robotoFamily

@Composable
fun AddFavoritesButton(
onAddFavoritesClick: () -> Unit,
modifier: Modifier = Modifier
) {
Button(
Copy link
Member

@AndrewCheung360 AndrewCheung360 Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: In the future, would be good to have a general button component eg. NaviButton that you can reuse for any type of button component to reduce redundancy

onClick = onAddFavoritesClick,
colors = ButtonDefaults.buttonColors(
containerColor = Color.White,
contentColor = Color.Black
),
modifier = modifier
.fillMaxWidth()
.height(40.dp)
) {

Icon(
painter = painterResource(R.drawable.ic_addition),
contentDescription = "Add Favorite",
tint = SecondaryText,
)

Spacer(modifier = Modifier.width(8.dp))

Text(
text = "Add Favorites",
fontFamily = robotoFamily,
fontWeight = FontWeight.SemiBold,
fontSize = 16.sp,
color = SecondaryText
)
}
}

@Preview
@Composable
private fun AddFavoritesButtonPreview() {
AddFavoritesButton(
onAddFavoritesClick = {},
)
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/cornellappdev/transit/ui/components/home/AddFavoritesSearchSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ fun AddFavoritesSearchSheet(

Column(
modifier = Modifier
.fillMaxHeight(0.92f)
.fillMaxWidth()
.fillMaxHeight(0.92f)
) {
Column(
modifier = Modifier
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/cornellappdev/transit/ui/components/home/BottomSheetFilterItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.cornellappdev.transit.R
import com.cornellappdev.transit.ui.theme.MetadataGray
import com.cornellappdev.transit.ui.theme.PrimaryText
import com.cornellappdev.transit.ui.theme.Style

/**
Expand Down Expand Up @@ -62,7 +63,7 @@ fun BottomSheetFilterItem(
}
Text(
label,
color = Color.Black,
color = if (isActive) PrimaryText else MetadataGray,
textAlign = TextAlign.Center,
modifier = Modifier
.align(Alignment.CenterHorizontally)
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/cornellappdev/transit/ui/components/home/BottomSheetLocationCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ fun BottomSheetLocationCard(
) {
Column(
modifier = Modifier
.padding(horizontal = 24.dp, vertical = 10.dp)
.clickable {
onClick()
}
Expand Down
32 changes: 25 additions & 7 deletions ...src/main/java/com/cornellappdev/transit/ui/components/home/EcosystemBottomSheetContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ package com.cornellappdev.transit.ui.components.home
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
Expand Down Expand Up @@ -51,7 +53,8 @@ fun EcosystemBottomSheetContent(
modifier: Modifier = Modifier,
navigateToPlace: (Place) -> Unit,
onDetailsClick: (DetailedEcosystemPlace) -> Unit,
onFavoriteStarClick: (Place) -> Unit
onFavoriteStarClick: (Place) -> Unit,
onAddFavoritesClick: () -> Unit,
) {
Column(modifier = modifier) {
Row(
Expand Down Expand Up @@ -91,7 +94,8 @@ fun EcosystemBottomSheetContent(
favorites = favorites,
navigateToPlace = navigateToPlace,
onDetailsClick = onDetailsClick,
onFavoriteStarClick = onFavoriteStarClick
onFavoriteStarClick = onFavoriteStarClick,
onAddFavoritesClick = onAddFavoritesClick
)
}
}
Expand All @@ -104,15 +108,16 @@ private fun BottomSheetFilteredContent(
favorites: Set<Place>,
navigateToPlace: (Place) -> Unit,
onDetailsClick: (DetailedEcosystemPlace) -> Unit,
onFavoriteStarClick: (Place) -> Unit
onFavoriteStarClick: (Place) -> Unit,
onAddFavoritesClick: () -> Unit
) {
LazyColumn(
contentPadding = PaddingValues(bottom = 90.dp),
contentPadding = PaddingValues(start = 24.dp, end = 24.dp, top = 20.dp, bottom = 90.dp),
modifier = Modifier.fillMaxSize()
) {
when (currentFilter) {
FilterState.FAVORITES -> {
favoriteList(favorites, navigateToPlace)
favoriteList(favorites, navigateToPlace, onAddFavoritesClick)
}

FilterState.PRINTERS -> {
Expand Down Expand Up @@ -151,15 +156,21 @@ private fun BottomSheetFilteredContent(
*/
private fun LazyListScope.favoriteList(
favorites: Set<Place>,
navigateToPlace: (Place) -> Unit
navigateToPlace: (Place) -> Unit,
onAddFavoritesClick: () -> Unit
) {
item {
AddFavoritesButton(onAddFavoritesClick = onAddFavoritesClick)
Spacer(Modifier.height(20.dp))
}
items(favorites.toList()) {
BottomSheetLocationCard(
title = it.name,
subtitle1 = it.subLabel
) {
//TODO: Eatery
}
Spacer(Modifier.height(10.dp))
}
}

Expand All @@ -185,7 +196,9 @@ private fun LazyListScope.gymList(
) {
//TODO: Eatery
}
Spacer(Modifier.height(10.dp))
}

}
}
}
Expand Down Expand Up @@ -214,7 +227,9 @@ private fun LazyListScope.printerList(
it.toPlace()
)
}
Spacer(Modifier.height(10.dp))
}

}
}
}
Expand Down Expand Up @@ -256,6 +271,7 @@ private fun LazyListScope.eateryList(
) {
onDetailsClick(it)
}
Spacer(Modifier.height(10.dp))
}
}
}
Expand Down Expand Up @@ -291,6 +307,7 @@ private fun LazyListScope.libraryList(
) {
navigateToDetails(it)
}
Spacer(Modifier.height(10.dp))
}
}
}
Expand Down Expand Up @@ -319,6 +336,7 @@ private fun PreviewEcosystemBottomSheet() {
modifier = Modifier,
navigateToPlace = {},
onDetailsClick = {},
onFavoriteStarClick = {}
onFavoriteStarClick = {},
onAddFavoritesClick = {}
)
}
Loading