Merge: SIMT-104 메인 페이지, 일정 작성 달력 크기 수정

Author: limsaehyun

feature/feature-home/src/main/java/com/comit/feature_home/calendar/SimTongCalendar.kt

@@ -80,6 +80,7 @@ enum class SimTongCalendarStatus(
     ),
 }
 
+private val CalendarLoadingHeight: Dp = 255.dp
 private const val Week: Int = 7
 
 @Stable
@@ -216,14 +217,16 @@ fun SimTongCalendar(
                 CircularProgressIndicator(
                     color = SimTongColor.MainColor,
                     modifier = Modifier
-                        .fillMaxSize()
+                        .fillMaxWidth()
+                        .height(CalendarLoadingHeight)
                         .wrapContentSize(Alignment.Center),
                 )
             } else {
                 SimTongCalendarList(
                     list = calendarList,
                     onItemClicked = onItemClicked
                 )
+                Spacer(modifier = Modifier.height(40.dp))
             }
         }
     }
@@ -327,9 +330,7 @@ fun SimTongCalendarList(
     list: List<SimTongCalendarData>,
     onItemClicked: (Int, String) -> Unit = { _, _ -> },
 ) {
-    Column(
-        modifier = Modifier.fillMaxSize()
-    ) {
+    Column {
         repeat(list.size / Week) { size ->
             val rowList = list.subList(size * Week, size * Week + Week)
 

feature/feature-home/src/main/java/com/comit/feature_home/screen/HomeScreen.kt

@@ -59,8 +59,6 @@ private val HomeScreenPadding = PaddingValues(
     horizontal = 25.dp,
 )
 
-private val HomeCalendarHeight: Dp = 343.dp
-
 private const val StartDateAdd = -3
 private const val EndDateAdd = 3
 
@@ -177,7 +175,6 @@ fun HomeScreen(
         SimTongCalendar(
             modifier = Modifier
                 .fillMaxWidth()
-                .height(HomeCalendarHeight)
                 .simClickable(
                     rippleEnabled = false,
                 ) {

feature/feature-home/src/main/java/com/comit/feature_home/screen/schedule/ShowScheduleScreen.kt

@@ -36,7 +36,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
@@ -69,16 +68,12 @@ import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.launch
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
-import java.util.Calendar
-import java.util.GregorianCalendar
 import java.util.UUID
 
 private val HorizontalPadding = PaddingValues(
     horizontal = 30.dp,
 )
 
-private val HomeCalendarHeight: Dp = 343.dp
-
 private val CalendarPadding = PaddingValues(
     horizontal = 20.dp,
 )
@@ -95,25 +90,8 @@ fun ShowScheduleScreen(
     val showScheduleState = showScheduleContainer.stateFlow.collectAsState().value
     val showScheduleSideEffect = showScheduleContainer.sideEffectFlow
 
-    val today = GregorianCalendar()
-    val calendar = GregorianCalendar(
-        today.get(Calendar.YEAR),
-        today.get(Calendar.MONTH),
-        today.get(Calendar.DATE)
-    )
     var checkMonth by remember { mutableStateOf(0) }
 
-//    var date by remember {
-//        mutableStateOf<Date>(
-//            Date.valueOf(
-//                string.format("%02d", calendar.get(Calendar.YEAR)) +
-//                    "-" +
-//                    string.format("%02d", calendar.get(Calendar.MONTH) + 1) +
-//                    "-01"
-//            )
-//        )
-//    }
-
     LaunchedEffect(showScheduleViewModel) {
         showScheduleViewModel.showSchedule(
             startAt = getStartAt(checkMonth),
@@ -262,6 +240,9 @@ fun ShowScheduleScreen(
                 Spacer(modifier = Modifier.height(20.dp))
 
                 SimTongCalendar(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(CalendarPadding),
                     onBeforeClicked = { _, _checkMonth ->
                         checkMonth = _checkMonth
                         showScheduleViewModel.showSchedule(
@@ -276,10 +257,6 @@ fun ShowScheduleScreen(
                             endAt = getEndAt(checkMonth)
                         )
                     },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(HomeCalendarHeight)
-                        .padding(CalendarPadding),
                 )
 
                 Spacer(modifier = Modifier.height(7.dp))