Made UI changes and ensured functionality of capacity reminders

Author: helenjb

app/src/main/graphql/CapacityReminders.graphql

@@ -10,7 +10,6 @@ mutation CreateCapacityReminder(
         id
         capacityThreshold
         daysOfWeek
-        fcmToken
         gyms
         isActive
     }
@@ -28,7 +27,6 @@ mutation EditCapacityReminder(
         id
         capacityThreshold
         daysOfWeek
-        fcmToken
         gyms
         isActive
     }
@@ -39,7 +37,6 @@ mutation DeleteCapacityReminder($reminderId: Int!) {
         id
         capacityThreshold
         daysOfWeek
-        fcmToken
         gyms
         isActive
     }

app/src/main/graphql/schema.graphqls

@@ -55,6 +55,16 @@ type Query {
   Get all friends for a user.
   """
   getUserFriends(userId: Int!): [User]
+
+  """
+  Get a specific capacity reminder by its ID.
+  """
+  getCapacityReminderById(id: Int!): CapacityReminder
+
+  """
+  Get all capacity reminders.
+  """
+  getAllCapacityReminders: [CapacityReminder]
 }
 
 type Gym {
@@ -438,6 +448,52 @@ type HourlyAverageCapacity {
   history: [Float]!
 }
 
+type CapacityReminder {
+  id: ID!
+
+  gyms: [CapacityReminderGym]!
+
+  capacityThreshold: Int!
+
+  daysOfWeek: [DayOfWeekEnum]!
+
+  isActive: Boolean
+}
+
+"""
+An enumeration.
+"""
+enum CapacityReminderGym {
+  TEAGLEUP
+
+  TEAGLEDOWN
+
+  HELENNEWMAN
+
+  TONIMORRISON
+
+  NOYES
+}
+
+"""
+An enumeration.
+"""
+enum DayOfWeekEnum {
+  MONDAY
+
+  TUESDAY
+
+  WEDNESDAY
+
+  THURSDAY
+
+  FRIDAY
+
+  SATURDAY
+
+  SUNDAY
+}
+
 type Mutation {
   """
   Creates a new giveaway.
@@ -558,54 +614,6 @@ type CreateReport {
   report: Report
 }
 
-type CapacityReminder {
-  id: ID!
-
-  fcmToken: String!
-
-  gyms: [CapacityReminderGym]!
-
-  capacityThreshold: Int!
-
-  daysOfWeek: [DayOfWeekEnum]!
-
-  isActive: Boolean
-}
-
-"""
-An enumeration.
-"""
-enum CapacityReminderGym {
-  TEAGLEUP
-
-  TEAGLEDOWN
-
-  HELENNEWMAN
-
-  TONIMORRISON
-
-  NOYES
-}
-
-"""
-An enumeration.
-"""
-enum DayOfWeekEnum {
-  MONDAY
-
-  TUESDAY
-
-  WEDNESDAY
-
-  THURSDAY
-
-  FRIDAY
-
-  SATURDAY
-
-  SUNDAY
-}
-
 type RemoveFriend {
   success: Boolean
 }

app/src/main/java/com/cornellappdev/uplift/ui/MainNavigationWrapper.kt

@@ -216,19 +216,20 @@ fun MainNavigationWrapper(
             composable<UpliftRootRoute.ProfileCreation> {
                 ProfileCreationScreen()
             }
-            composable<UpliftRootRoute.CapacityReminders>{
+            composable<UpliftRootRoute.CapacityReminders> {
                 CapacityReminderScreen()
-            composable<UpliftRootRoute.Profile> {
-                ProfileScreen()
-            }
-            composable<UpliftRootRoute.Reminders> {
-                MainReminderScreen()
-            }
-            composable<UpliftRootRoute.Settings> {
-                SettingsScreen()
+                composable<UpliftRootRoute.Profile> {
+                    ProfileScreen()
+                }
+                composable<UpliftRootRoute.Reminders> {
+                    MainReminderScreen()
+                }
+                composable<UpliftRootRoute.Settings> {
+                    SettingsScreen()
+                }
+                composable<UpliftRootRoute.Sports> {}
+                composable<UpliftRootRoute.Favorites> {}
             }
-            composable<UpliftRootRoute.Sports> {}
-            composable<UpliftRootRoute.Favorites> {}
         }
     }
 }

app/src/main/java/com/cornellappdev/uplift/ui/components/general/UpliftButton.kt

@@ -1,6 +1,10 @@
 package com.cornellappdev.uplift.ui.components.general
 
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
@@ -11,6 +15,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
@@ -46,7 +51,9 @@ fun UpliftButton(
     disabledContainerColor: Color = GRAY02,
     contentColor: Color = PRIMARY_BLACK,
     disabledContentColor: Color = PRIMARY_BLACK,
-    elevation: Dp = 4.dp
+    elevation: Dp = 4.dp,
+    leadingIcon: (@Composable () -> Unit)? = null,
+    modifier: Modifier = Modifier
 ) {
     val enabledAlpha by animateFloatAsState(
         targetValue = if (enabled) 1f else 0.5f,
@@ -60,8 +67,8 @@ fun UpliftButton(
             disabledContentColor = disabledContentColor
         ),
         shape = RoundedCornerShape(38.dp),
-        modifier = Modifier
-            .width(width)
+        modifier = modifier
+            .defaultMinSize(minWidth = width)
             .height(height)
             .alpha(enabledAlpha),
         elevation = ButtonDefaults.buttonElevation(
@@ -70,15 +77,23 @@ fun UpliftButton(
         onClick = { onClick() },
         enabled = enabled,
     ) {
-        Text(
-            text = text,
-            color = PRIMARY_BLACK,
-            fontFamily = montserratFamily,
-            fontSize = fontSize.sp,
-            fontWeight = FontWeight.Bold,
-            textAlign = TextAlign.Center,
-            modifier = Modifier.wrapContentSize()
-        )
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center
+        ) {
+            leadingIcon?.let {
+                it()
+            }
+            Text(
+                text = text,
+                color = contentColor,
+                fontFamily = montserratFamily,
+                fontSize = fontSize.sp,
+                fontWeight = FontWeight.Bold,
+                textAlign = TextAlign.Center,
+                modifier = modifier.wrapContentSize()
+            )
+        }
     }
 }