[Mod/#52] SignUp 뷰 GUI 적용 및 오류 수정

app/build.gradle.kts

@@ -93,7 +93,5 @@ dependencies {
     //실시간 위치
     implementation(libs.play.services.location)
 
-    // 회원가입
-    implementation ("androidx.compose.foundation:foundation:1.4.0")
 
 }

app/src/main/java/com/paw/key/presentation/ui/home/HomeScreen.kt

@@ -14,6 +14,7 @@ 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.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
@@ -30,7 +31,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.view.ViewCompat
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.paw.key.R
+import com.paw.key.core.designsystem.component.CourseCard
 import com.paw.key.core.designsystem.theme.PawKeyTheme
 import com.paw.key.core.util.noRippleClickable
 import com.paw.key.presentation.ui.home.component.DaytimeCard
@@ -85,7 +88,7 @@ fun HomeScreen(
     modifier: Modifier = Modifier,
     viewModel: HomeViewModel = hiltViewModel(),
 ) {
-    val state by viewModel.state.collectAsState()
+    val state by viewModel.state.collectAsStateWithLifecycle()
     val view = LocalView.current
     val window = (view.context as? Activity)?.window
 
@@ -106,48 +109,63 @@ fun HomeScreen(
     ) {
         TopBar(location = "강남구 역삼동", onLocationClick = { viewModel.toggleLocationMenu() })
 
-        Column(
+        LazyColumn (
             verticalArrangement = Arrangement.spacedBy(12.dp),
             modifier = Modifier
                 .padding(horizontal = 16.dp)
                 .background(color = PawKeyTheme.colors.white2),
         ) {
-            Spacer(modifier = Modifier.height(13.dp))
-
-            WeatherCard(
-                weathertitle = "35°",
-                weathersub1 = "35°",
-                weathersub2 = "21°",
-                rating = "0",
-                weatherIcon = R.drawable.ic_home_weather,
-            )
-
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-            ) {
-                DaytimeCard(
-                    daytime = "05:06",
-                    daystate = "일출",
+            item{
+                Spacer(modifier = Modifier.height(12.dp))
+
+                WeatherCard(
+                    weathertitle = "35°",
+                    weathersub1 = "35°",
+                    weathersub2 = "21°",
+                    rating = "0",
+                    weatherIcon = R.drawable.ic_home_weather,
                 )
+            }
+            item{
+                Spacer(modifier = Modifier.height(12.dp))
 
-                Spacer(modifier = Modifier.weight(1F))
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                ) {
+                    DaytimeCard(
+                        daytime = "05:06",
+                        daystate = "일출",
+                    )
+
+                    Spacer(modifier = Modifier.weight(1F))
 
-                TrackingCard(onClick = { navigateNext() })
+                    TrackingCard(onClick = { navigateNext() })
+                }
             }
+            item{
+                RowCalendar(date = "7월")
+            }
+            item{
+                Spacer(modifier = Modifier.height(12.dp))
 
-            Spacer(modifier = Modifier.height(12.dp))
+                Text(
+                    text = stringResource(R.string.ic_home_current_word),
+                    color = PawKeyTheme.colors.black,
+                    style = PawKeyTheme.typography.head18Sb,
+                )
+            }
+            item{
+                CourseCard(
+                    title = "제목을 입력해주세요",
+                    petName = "반려견 이름",
+                    date = "년도/월/일",
+                )
+            }
+            item{}
+            item{}
 
-            RowCalendar(date = "7월")
 
-            // Todo : 이거 공통 컴포넌트로 변경
-//            HistoryCard()
-            Spacer(modifier = Modifier.height(17.dp))
-            Text(
-                text = stringResource(R.string.ic_home_current_word),
-                color = PawKeyTheme.colors.black,
-                style = PawKeyTheme.typography.head18Sb,
-            )
         }
 
     }

app/src/main/java/com/paw/key/presentation/ui/home/component/SettingButton.kt

@@ -32,6 +32,7 @@ private fun PreviewSettingButton() {
 fun SettingButton(
     modifier: Modifier = Modifier,
 ) {
+
     Box(
         modifier = modifier
             .height(64.dp)

app/src/main/java/com/paw/key/presentation/ui/main/PawKeyNavHost.kt

@@ -25,16 +25,13 @@ import com.paw.key.presentation.ui.mypage.navigation.archivedDetailNavGraph
 import com.paw.key.presentation.ui.mypage.navigation.myPageNavGraph
 import com.paw.key.presentation.ui.mypage.navigation.petProfileNavGraph
 import com.paw.key.presentation.ui.mypage.navigation.savedCourseNavGraph
+import com.paw.key.presentation.ui.mypage.navigation.savedDetailNavGraph
 import com.paw.key.presentation.ui.mypage.navigation.userProfileNavGraph
 import com.paw.key.presentation.ui.onboard.navigation.onboardingNavGraph
 import com.paw.key.presentation.ui.region.navigation.regionalNavGraph
-
-import com.paw.key.presentation.ui.mypage.navigation.myPageNavGraph
-import com.paw.key.presentation.ui.mypage.navigation.savedDetailNavGraph
-
-import com.paw.key.presentation.ui.signup.navigation.signupLevelNavGraph
+import com.paw.key.presentation.ui.signup.navigation.signUpActivityNavGraph
+import com.paw.key.presentation.ui.signup.navigation.signUpLevelNavGraph
 import com.paw.key.presentation.ui.signup.navigation.signupNavGraph
-import com.paw.key.presentation.ui.signup.navigation.signupactivityNavGraph
 import com.paw.key.presentation.ui.signup.navigation.signupdogNavGraph
 import com.paw.key.presentation.ui.splash.navigation.splashNavGraph
 
@@ -200,15 +197,15 @@ fun PawKeyNavHost(
             navigateSignUpActivity = navigator::navigateSignUpActivity,
         )
 
-        signupactivityNavGraph(
+        signUpActivityNavGraph(
             navigateSignUpDog = navigator::navigateSignUpDog,
         )
 
         signupdogNavGraph(
             navigateNext = navigator::navigateSignUpLevel,
         )
 
-        signupLevelNavGraph(
+        signUpLevelNavGraph(
             navigateNext = navigator::navigateHome,
 
             )

app/src/main/java/com/paw/key/presentation/ui/mypage/ArchivedCourseListScreen.kt

@@ -88,7 +88,8 @@ fun ArchivedCourseListScreen(
             CourseCard(
                 title = course.title,
                 petName = course.petName,
-                date = course.date
+                date = course.date,
+
             )
         }
     }

app/src/main/java/com/paw/key/presentation/ui/mypage/SavedCourseListScreen.kt

@@ -110,7 +110,8 @@ fun SavedCourseListScreen(
             CourseCard(
                 title = course.title,
                 petName = course.petName,
-                date = course.date
+                date = course.date,
+
             )
         }
     }

app/src/main/java/com/paw/key/presentation/ui/signup/SignUpActivityScreen.kt

@@ -6,13 +6,13 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.paw.key.R
 import com.paw.key.core.designsystem.component.PawkeyButton
 import com.paw.key.core.designsystem.theme.PawKeyTheme
@@ -27,7 +27,7 @@ import com.paw.key.presentation.ui.signup.viewmodel.SignUpViewModel
 private fun PreviewSignUpActivityScreen() {
     PawKeyTheme {
         SignUpActivityScreen(
-            step = 0.25F,
+            step = 0.5F,
             navigateSignUpDog = {},
         )
     }
@@ -52,64 +52,68 @@ fun SignUpActivityScreen(
     modifier: Modifier = Modifier,
     viewModel: SignUpViewModel = hiltViewModel(),
 ) {
-    val state by viewModel.state.collectAsState()
+    val state by viewModel.state.collectAsStateWithLifecycle()
 
     Column(
         modifier = modifier
             .fillMaxSize()
-            .padding(horizontal = 16.dp)
     ) {
         SignUpHeader(
             title = stringResource(R.string.ic_onboarding_signup),
             subtitle = stringResource(id = R.string.ic_onboarding_signup_subtitle_step2),
             progress = step,
         )
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 16.dp)
+        ) {
+            Spacer(modifier = Modifier.height(27.dp))
 
-        Spacer(modifier = Modifier.height(27.dp))
-
-        FormField(
-            label = stringResource(id = R.string.ic_onboarding_signup_main_location),
-            content = {
-                LocationButton(
-                    isEnable = true,
-                    location = "강남구",
-                    onClick = { viewModel.toggleLocationMenu() }
-                )
-            }
-        )
+            FormField(
+                label = stringResource(id = R.string.ic_onboarding_signup_main_location),
+                content = {
+                    LocationButton(
+                        isEnable = state.isLocationMenuVisible,
+                        location = "강남구",
+                        onClick = { viewModel.toggleLocationMenu() }
+                    )
+                }
+            )
 
-        Spacer(modifier = Modifier.height(46.dp))
+            Spacer(modifier = Modifier.height(46.dp))
 
-        FormField(
-            label = stringResource(id = R.string.ic_onboarding_signup_sub_location),
-            content = {
-                if (state.isLocationMenuVisible) {
-                    LocationList(
-                        selected = state.selectedLocation,
-                        locations = listOf("개포동", "논현동", "뭔동", "동동동", "스꾸삐", "4글자유"),
-                        onLocationSelected = { location ->
-                            viewModel.selectLocation(location)
-                        }
-                    )
+            FormField(
+                label = stringResource(id = R.string.ic_onboarding_signup_sub_location),
+                content = {
+                    if (state.isLocationMenuVisible) {
+                        LocationList(
+                            selected = state.selectedLocation,
+                            locations = listOf("개포동", "논현동", "뭔동", "동동동", "스꾸삐", "4글자유"),
+                            onLocationSelected = { location ->
+                                viewModel.selectLocation(location)
+                            }
+                        )
+                    }
                 }
-            }
-        )
+            )
 
-        Spacer(modifier = Modifier.weight(1f))
+            Spacer(modifier = Modifier.weight(1f))
 
-        val isFormValid = state.selectedLocation.isNotEmpty()
+            val isFormValid = state.selectedLocation.isNotEmpty()
 
-        PawkeyButton(
-            text = stringResource(id = R.string.ic_onboarding_signup_button),
-            enabled = isFormValid,
-            onClick = {
-                if (isFormValid) {
-                    navigateSignUpDog()
+            PawkeyButton(
+                text = stringResource(id = R.string.ic_onboarding_signup_button),
+                enabled = isFormValid,
+                onClick = {
+                    if (isFormValid) {
+                        navigateSignUpDog()
+                    }
                 }
-            }
-        )
-
-        Spacer(modifier = Modifier.height(46.dp))
+            )
 
+            Spacer(modifier = Modifier.height(46.dp))
+        }
     }
-}
+
+}