diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..3892a83 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Calendar.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Calendar.kt index 7fb3005..b5aa8e6 100644 --- a/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Calendar.kt +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Calendar.kt @@ -92,7 +92,7 @@ fun MonthToggler(calendarState: CalendarState) { } } - +//TODO доделать свертку календаря, он почти идеально работает @Composable fun NiceCalendar( startMonth: YearMonth, @@ -117,7 +117,7 @@ fun NiceCalendar( var selectedDate by remember { mutableStateOf(null) } - Column() { + Column { MonthToggler(calendarState = state) @@ -134,12 +134,11 @@ fun NiceCalendar( onClick(day, startMonth, startMonth.year) } }, - monthHeader = { month -> - DaysOfWeekTitle(daysOfWeek = DayOfWeek.values().asList()) - }, + monthHeader = { DaysOfWeekTitle(daysOfWeek = DayOfWeek.values().asList()) }, modifier = Modifier.padding(10.dp) ) else + //TODO по возможности устранить повторы WeekCalendar( state = weekState, weekHeader = { _ ->