Merge pull request #72 from cuappdev/staging

Trial 3: Fix remembers
cuappdev · Nov 14, 2024 · df4fca5 · df4fca5
2 parents cb38d3a + 8b6e8b0
commit df4fca5
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 11 deletions.
diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/general/CalendarBar.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/general/CalendarBar.kt
@@ -127,7 +127,7 @@ private fun CalendarBarSelection(
             .height(58.dp)
             .width(screenWidth / 7f)
             .clickable(
-                interactionSource = MutableInteractionSource(),
+                interactionSource = remember { MutableInteractionSource()},
                 indication = null,
                 onClick = onSelect
             ), horizontalAlignment = Alignment.CenterHorizontally

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/general/ClassInfoCard.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/general/ClassInfoCard.kt
@@ -10,6 +10,7 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -132,7 +133,7 @@ fun ClassInfoCard(
                     modifier = Modifier
                         .size(24.dp)
                         .clickable(
-                            interactionSource = MutableInteractionSource(),
+                            interactionSource = remember { MutableInteractionSource() },
                             indication = null
                         ) {
                             thisClass.toggleFavorite()

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/general/DayOfWeekSelector.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/general/DayOfWeekSelector.kt
@@ -52,7 +52,7 @@ fun DayOfWeekSelector(today: Int, onDaySelected: (Int) -> Unit) {
 
             Box(
                 modifier = Modifier.clickable(
-                    interactionSource = MutableInteractionSource(),
+                    interactionSource = remember { MutableInteractionSource() } ,
                     indication = null
                 ) {
                     selectedDay = i

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/components/gymdetail/PopularTimes.kt b/app/src/main/java/com/cornellappdev/uplift/ui/components/gymdetail/PopularTimes.kt
@@ -86,7 +86,10 @@ fun PopularTimesSection(popularTimes: PopularTimes) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable(interactionSource = MutableInteractionSource(), indication = null) {
+            .clickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null
+            ) {
                 deselect()
             }
             .background(Color.White)
@@ -170,7 +173,7 @@ fun PopularTimesSection(popularTimes: PopularTimes) {
                         .padding(horizontal = 1.dp)
                         .padding(bottom = 1.dp)
                         .clickable(
-                            interactionSource = MutableInteractionSource(),
+                            interactionSource = remember { MutableInteractionSource() },
                             indication = null
                         ) {
                             if (selectedPopularTime == i) deselect()

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/ClassDetailScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/ClassDetailScreen.kt
@@ -30,6 +30,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -152,7 +153,7 @@ fun ClassDetailScreen(
                     )
                     .padding(top = 47.dp, start = 22.dp)
                     .clickable(
-                        interactionSource = MutableInteractionSource(),
+                        interactionSource = remember { MutableInteractionSource() },
                         indication = null,
                         onClick = onBack
                     ),

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/GymDetailScreen.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/GymDetailScreen.kt
@@ -11,7 +11,16 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -23,6 +32,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -52,7 +62,14 @@ import com.cornellappdev.uplift.ui.components.gymdetail.GymCapacitiesSection
 import com.cornellappdev.uplift.ui.components.gymdetail.GymTodaysClasses
 import com.cornellappdev.uplift.ui.viewmodels.ClassDetailViewModel
 import com.cornellappdev.uplift.ui.viewmodels.GymDetailViewModel
-import com.cornellappdev.uplift.util.*
+import com.cornellappdev.uplift.util.ACCENT_CLOSED
+import com.cornellappdev.uplift.util.ACCENT_OPEN
+import com.cornellappdev.uplift.util.GRAY01
+import com.cornellappdev.uplift.util.GRAY03
+import com.cornellappdev.uplift.util.colorInterp
+import com.cornellappdev.uplift.util.isOpen
+import com.cornellappdev.uplift.util.montserratFamily
+import com.cornellappdev.uplift.util.todayIndex
 
 /**
  * A screen displaying all the information about a selected gym.
@@ -155,7 +172,7 @@ fun GymDetailScreen(
                     .padding(top = 47.dp, start = 22.dp)
                     .clip(RoundedCornerShape(4.dp))
                     .clickable(
-                        interactionSource = MutableInteractionSource(),
+                        interactionSource = remember { MutableInteractionSource() },
                         indication = null,
                         onClick = onBack
                     ),
@@ -209,7 +226,7 @@ fun GymDetailScreen(
                                 .align(Alignment.TopCenter)
                                 .offset(y = 25.dp)
                         )
-                    }else{
+                    } else {
                         Text(
                             text = "OPEN",
                             fontWeight = FontWeight(700),

diff --git a/app/src/main/java/com/cornellappdev/uplift/ui/screens/subscreens/MainLoaded.kt b/app/src/main/java/com/cornellappdev/uplift/ui/screens/subscreens/MainLoaded.kt
@@ -35,6 +35,7 @@ import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -265,7 +266,7 @@ fun MainLoaded(
                                                 .widthIn(min = 143.dp)
                                                 .clickable(
                                                     indication = null,
-                                                    interactionSource = MutableInteractionSource()
+                                                    interactionSource = remember { MutableInteractionSource() }
                                                 ) {
                                                     navController.navigateToGym(
                                                         gymDetailViewModel = gymDetailViewModel,