Merge remote-tracking branch 'origin' into jonathan/gyms

04jono · 04jono · commit bea2272db92c · 2026-02-12T20:48:50.000-05:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -51,6 +51,7 @@ android {
                 "proguard-rules.pro"
             )
             buildConfigField("boolean", "ECOSYSTEM_FLAG", "false")
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
     compileOptions {
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/components/home/AddFavoritesButton.kt b/app/src/main/java/com/cornellappdev/transit/ui/components/home/AddFavoritesButton.kt
@@ -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(
+        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 = {},
+    )
+}
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/components/home/AddFavoritesSearchSheet.kt b/app/src/main/java/com/cornellappdev/transit/ui/components/home/AddFavoritesSearchSheet.kt
@@ -67,8 +67,8 @@ fun AddFavoritesSearchSheet(
 
     Column(
         modifier = Modifier
-            .fillMaxHeight(0.92f)
             .fillMaxWidth()
+            .fillMaxHeight(0.92f)
     ) {
         Column(
             modifier = Modifier
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/components/home/BottomSheetFilterItem.kt b/app/src/main/java/com/cornellappdev/transit/ui/components/home/BottomSheetFilterItem.kt
@@ -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
 
 /**
@@ -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)
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/components/home/BottomSheetLocationCard.kt b/app/src/main/java/com/cornellappdev/transit/ui/components/home/BottomSheetLocationCard.kt
@@ -30,7 +30,6 @@ fun BottomSheetLocationCard(
 ) {
     Column(
         modifier = Modifier
-            .padding(horizontal = 24.dp, vertical = 10.dp)
             .clickable {
                 onClick()
             }
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/components/home/EcosystemBottomSheetContent.kt b/app/src/main/java/com/cornellappdev/transit/ui/components/home/EcosystemBottomSheetContent.kt
@@ -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
@@ -53,7 +55,8 @@ fun EcosystemBottomSheetContent(
     modifier: Modifier = Modifier,
     navigateToPlace: (Place) -> Unit,
     onDetailsClick: (DetailedEcosystemPlace) -> Unit,
-    onFavoriteStarClick: (Place) -> Unit
+    onFavoriteStarClick: (Place) -> Unit,
+    onAddFavoritesClick: () -> Unit,
 ) {
     Column(modifier = modifier) {
         Row(
@@ -93,7 +96,8 @@ fun EcosystemBottomSheetContent(
             favorites = favorites,
             navigateToPlace = navigateToPlace,
             onDetailsClick = onDetailsClick,
-            onFavoriteStarClick = onFavoriteStarClick
+            onFavoriteStarClick = onFavoriteStarClick,
+            onAddFavoritesClick = onAddFavoritesClick
         )
     }
 }
@@ -106,15 +110,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 -> {
@@ -160,15 +165,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))
     }
 }
 
@@ -213,7 +224,9 @@ private fun LazyListScope.gymList(
                 ) {
                     onDetailsClick(it)
                 }
+                Spacer(Modifier.height(10.dp))
             }
+
         }
     }
 }
@@ -242,7 +255,9 @@ private fun LazyListScope.printerList(
                         it.toPlace()
                     )
                 }
+                Spacer(Modifier.height(10.dp))
             }
+
         }
     }
 }
@@ -284,6 +299,7 @@ private fun LazyListScope.eateryList(
                 ) {
                     onDetailsClick(it)
                 }
+                Spacer(Modifier.height(10.dp))
             }
         }
     }
@@ -319,6 +335,7 @@ private fun LazyListScope.libraryList(
                 ) {
                     navigateToDetails(it)
                 }
+                Spacer(Modifier.height(10.dp))
             }
         }
     }
@@ -347,6 +364,7 @@ private fun PreviewEcosystemBottomSheet() {
         modifier = Modifier,
         navigateToPlace = {},
         onDetailsClick = {},
-        onFavoriteStarClick = {}
+        onFavoriteStarClick = {},
+        onAddFavoritesClick = {}
     )
 }
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/screens/HomeScreen.kt b/app/src/main/java/com/cornellappdev/transit/ui/screens/HomeScreen.kt
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/cornellappdev/transit/ui/viewmodels/HomeViewModel.kt
diff --git a/app/src/main/res/drawable/ic_addition.xml b/app/src/main/res/drawable/ic_addition.xml

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ android {`
`51`	`51`	`"proguard-rules.pro"`
`52`	`52`	`)`
`53`	`53`	`buildConfigField("boolean", "ECOSYSTEM_FLAG", "false")`
	`54`	`+ signingConfig = signingConfigs.getByName("debug")`
`54`	`55`	`}`
`55`	`56`	`}`
`56`	`57`	`compileOptions {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ fun BottomSheetLocationCard(`
`30`	`30`	`) {`
`31`	`31`	`Column(`
`32`	`32`	`modifier = Modifier`
`33`		`- .padding(horizontal = 24.dp, vertical = 10.dp)`
`34`	`33`	`.clickable {`
`35`	`34`	`onClick()`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,10 @@ package com.cornellappdev.transit.ui.components.home`
`3`	`3`	`import androidx.compose.foundation.layout.Column`
`4`	`4`	`import androidx.compose.foundation.layout.PaddingValues`
`5`	`5`	`import androidx.compose.foundation.layout.Row`
	`6`	`+import androidx.compose.foundation.layout.Spacer`
`6`	`7`	`import androidx.compose.foundation.layout.fillMaxSize`
`7`	`8`	`import androidx.compose.foundation.layout.fillMaxWidth`
	`9`	`+import androidx.compose.foundation.layout.height`
`8`	`10`	`import androidx.compose.foundation.layout.padding`
`9`	`11`	`import androidx.compose.foundation.lazy.LazyColumn`
`10`	`12`	`import androidx.compose.foundation.lazy.LazyListScope`
`@@ -53,7 +55,8 @@ fun EcosystemBottomSheetContent(`
`53`	`55`	`modifier: Modifier = Modifier,`
`54`	`56`	`navigateToPlace: (Place) -> Unit,`
`55`	`57`	`onDetailsClick: (DetailedEcosystemPlace) -> Unit,`
`56`		`- onFavoriteStarClick: (Place) -> Unit`
	`58`	`+ onFavoriteStarClick: (Place) -> Unit,`
	`59`	`+ onAddFavoritesClick: () -> Unit,`
`57`	`60`	`) {`
`58`	`61`	`Column(modifier = modifier) {`
`59`	`62`	`Row(`
`@@ -93,7 +96,8 @@ fun EcosystemBottomSheetContent(`
`93`	`96`	`favorites = favorites,`
`94`	`97`	`navigateToPlace = navigateToPlace,`
`95`	`98`	`onDetailsClick = onDetailsClick,`
`96`		`- onFavoriteStarClick = onFavoriteStarClick`
	`99`	`+ onFavoriteStarClick = onFavoriteStarClick,`
	`100`	`+ onAddFavoritesClick = onAddFavoritesClick`
`97`	`101`	`)`
`98`	`102`	`}`
`99`	`103`	`}`
`@@ -106,15 +110,16 @@ private fun BottomSheetFilteredContent(`
`106`	`110`	`favorites: Set<Place>,`
`107`	`111`	`navigateToPlace: (Place) -> Unit,`
`108`	`112`	`onDetailsClick: (DetailedEcosystemPlace) -> Unit,`
`109`		`- onFavoriteStarClick: (Place) -> Unit`
	`113`	`+ onFavoriteStarClick: (Place) -> Unit,`
	`114`	`+ onAddFavoritesClick: () -> Unit`
`110`	`115`	`) {`
`111`	`116`	`LazyColumn(`
`112`		`- contentPadding = PaddingValues(bottom = 90.dp),`
	`117`	`+ contentPadding = PaddingValues(start = 24.dp, end = 24.dp, top = 20.dp, bottom = 90.dp),`
`113`	`118`	`modifier = Modifier.fillMaxSize()`
`114`	`119`	`) {`
`115`	`120`	`when (currentFilter) {`
`116`	`121`	`FilterState.FAVORITES -> {`
`117`		`- favoriteList(favorites, navigateToPlace)`
	`122`	`+ favoriteList(favorites, navigateToPlace, onAddFavoritesClick)`
`118`	`123`	`}`
`119`	`124`
`120`	`125`	`FilterState.PRINTERS -> {`
`@@ -160,15 +165,21 @@ private fun BottomSheetFilteredContent(`
`160`	`165`	`*/`
`161`	`166`	`private fun LazyListScope.favoriteList(`
`162`	`167`	`favorites: Set<Place>,`
`163`		`- navigateToPlace: (Place) -> Unit`
	`168`	`+ navigateToPlace: (Place) -> Unit,`
	`169`	`+ onAddFavoritesClick: () -> Unit`
`164`	`170`	`) {`
	`171`	`+ item {`
	`172`	`+ AddFavoritesButton(onAddFavoritesClick = onAddFavoritesClick)`
	`173`	`+ Spacer(Modifier.height(20.dp))`
	`174`	`+ }`
`165`	`175`	`items(favorites.toList()) {`
`166`	`176`	`BottomSheetLocationCard(`
`167`	`177`	`title = it.name,`
`168`	`178`	`subtitle1 = it.subLabel`
`169`	`179`	`) {`
`170`	`180`	`//TODO: Eatery`
`171`	`181`	`}`
	`182`	`+ Spacer(Modifier.height(10.dp))`
`172`	`183`	`}`
`173`	`184`	`}`
`174`	`185`
`@@ -213,7 +224,9 @@ private fun LazyListScope.gymList(`
`213`	`224`	`) {`
`214`	`225`	`onDetailsClick(it)`
`215`	`226`	`}`
	`227`	`+ Spacer(Modifier.height(10.dp))`
`216`	`228`	`}`
	`229`	`+`
`217`	`230`	`}`
`218`	`231`	`}`
`219`	`232`	`}`
`@@ -242,7 +255,9 @@ private fun LazyListScope.printerList(`
`242`	`255`	`it.toPlace()`
`243`	`256`	`)`
`244`	`257`	`}`
	`258`	`+ Spacer(Modifier.height(10.dp))`
`245`	`259`	`}`
	`260`	`+`
`246`	`261`	`}`
`247`	`262`	`}`
`248`	`263`	`}`
`@@ -284,6 +299,7 @@ private fun LazyListScope.eateryList(`
`284`	`299`	`) {`
`285`	`300`	`onDetailsClick(it)`
`286`	`301`	`}`
	`302`	`+ Spacer(Modifier.height(10.dp))`
`287`	`303`	`}`
`288`	`304`	`}`
`289`	`305`	`}`
`@@ -319,6 +335,7 @@ private fun LazyListScope.libraryList(`
`319`	`335`	`) {`
`320`	`336`	`navigateToDetails(it)`
`321`	`337`	`}`
	`338`	`+ Spacer(Modifier.height(10.dp))`
`322`	`339`	`}`
`323`	`340`	`}`
`324`	`341`	`}`
`@@ -347,6 +364,7 @@ private fun PreviewEcosystemBottomSheet() {`
`347`	`364`	`modifier = Modifier,`
`348`	`365`	`navigateToPlace = {},`
`349`	`366`	`onDetailsClick = {},`
`350`		`- onFavoriteStarClick = {}`
	`367`	`+ onFavoriteStarClick = {},`
	`368`	`+ onAddFavoritesClick = {}`
`351`	`369`	`)`
`352`	`370`	`}`