Week mode #89

andrey-ananiev · 2023-02-14T08:12:37Z

I added a weekly mode to the calendar.
Closes #39

boguszpawlowski · 2023-02-15T13:20:18Z

Hi @andrey-ananiev. Thank you for your contribution! I'm a little short on time right now, but I should be able to review this on the weekend. Until then, please make sure that Detekt is passing and run ./gradlew apiDump to generate new API scheme.

andrey-ananiev · 2023-02-16T19:30:01Z

Hi. I don`t know how I can retate the Detect Check. I am new to github.

boguszpawlowski

Overall, I think it would be beneficial to change the approach a bit, and create a separate WeekCalendar composable. This would require a bit more of duplication but would allow us to simplify the logic which is pretty complicated right now. I think you could reuse WeekPager and WeekListState and after that it shouldn't be too much work.

boguszpawlowski · 2023-02-19T18:49:59Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt

  val daysOfWeek = remember(firstDayOfWeek) {
    DayOfWeek.values().rotateRight(DaysOfWeek - firstDayOfWeek.ordinal)
  }

  Column(
-    modifier = modifier,
+    modifier = modifier
+      .animateContentSize(),


I wouldn't add additional parameters to the modifier here. If the use-case requires such behavior, you can easily pass your own modifier from outside this function. The library should be as unopinionated as possible to fit the largest amount of possible use-cases.

boguszpawlowski · 2023-02-19T19:12:41Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/day/DayState.kt

@@ -13,4 +14,5 @@ public typealias NonSelectableDayState = DayState<EmptySelectionState>
 public data class DayState<T : SelectionState>(
  private val day: Day,
  val selectionState: T,
+  val eventState: EventState


I believe adding such functionality shouldn't be in scope of this PR.

In my project, I display the events of the day as dots in the calendar. Why not add this functionality to this PR?

Because this is easily achievable via the existing library API, and adding additional parameters to the API increases its complexity and reduces readability. Also, not every project will want to represent events as dots.

boguszpawlowski · 2023-02-19T19:13:12Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt

+  weekContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit = { content ->
+    Box { content(PaddingValues()) }
+  },
+  onSwipe: (LocalDate) -> Unit = { },


Why is this necessary?

When the month changes, I load data to display dots representing events.

boguszpawlowski · 2023-02-19T19:14:42Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt

        .replaceFirstChar { it.titlecase() },
-      style = MaterialTheme.typography.h4,
+      style = MaterialTheme.typography.h5,


What is the reason for this change?

I think H4 is too big.

boguszpawlowski · 2023-02-19T19:15:03Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekDaysNames.kt

-package io.github.boguszpawlowski.composecalendar.week
+package io.github.boguszpawlowski.composecalendar.header


Why changing the package?

I thought it made more sense.

boguszpawlowski · 2023-02-19T19:26:42Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/states/EventState.kt

+
+
+
+//@Suppress("FunctionName") // Factory function


Please remove commented code.

I'm sorry, I'll delete it.

boguszpawlowski · 2023-02-19T19:28:41Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt

+@Stable
+internal class WeekListState(


This and WeekPager could be easily used in order to create separate WeekCalendar composable.

Why do it separately when you can combine it?

boguszpawlowski · 2023-02-19T19:29:17Z

library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt

+internal fun LocalDate.getWeek(
+  today: LocalDate = LocalDate.now(),
+): Week {
+  val firstDayOfWeek = minusDays(this.dayOfWeek.value.toLong() - 1)


Shouldn't this take into account the firstDayOfTheWeek parameter?

I'm sorry... I'll fix it. I will definitely add this option.

boguszpawlowski · 2023-02-19T19:29:53Z

sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt

+  val scrollState = rememberScrollState()
+  Column(modifier = Modifier
+    .fillMaxWidth()
+    .verticalScroll(scrollState)
+  ) {
+    val calendarState = rememberCalendarState(
+      eventState = EventState( dayEventList )
+    )
+    ModeControls(modeState = calendarState.modeState)
+    StaticCalendar(
+      modifier = Modifier.animateContentSize(),
+      showAdjacentMonths = false,
+      firstDayOfWeek = SUNDAY,
+      monthContainer = { MonthContainer(it) },
+      dayContent = { DayContent(dayState = it) },
+      weekDaysNames = { DefaultWeekDaysNames(listDays = it) },
+      monthHeader = { MonthHeader(currentState = it) },
+      calendarState = calendarState
+    )
+  }


This cuould be in a separate WeekCalendar sample

I see that you are doing it in the next fork as you see fit. Tomorrow or the day after tomorrow I will have time to look at your varant in detail.

boguszpawlowski · 2023-02-19T19:30:12Z

sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomSelectionSample.kt

+    val calendarState = rememberMonthSelectionState(
+      eventState = EventState( dayEventList )
+    )
+    ModeControls(modeState = calendarState.modeState)


I don't think adding mode controls to every sample is necessary

boguszpawlowski · 2023-02-19T19:36:47Z

Hi. I don`t know how I can retate the Detect Check. I am new to github

@andrey-ananiev If you have a mac, you can run ./gradlew detekt (or gradlew detekt on Windows) locally in a terminal in project directory. This should show you all the errors from detekt.

boguszpawlowski · 2023-02-25T11:02:59Z

@andrey-ananiev I have implemented something similar, using 2 separate composables, would be grateful if you would take a look and tell me what do you think about it: #91
Personally, I think this will be much easier to maintain in the future and the resulting code is much more readable.

andrey-ananiev · 2023-02-25T18:39:22Z

@andrey-ananiev I have implemented something similar, using 2 separate composables, would be grateful if you would take a look and tell me what do you think about it: #91 Personally, I think this will be much easier to maintain in the future and the resulting code is much more readable.

Thank you for supporting the weekly calendar idea. I will definitely look at your implementation and give feedback.

boguszpawlowski · 2023-03-03T18:36:53Z

@andrey-ananiev Thank you for your contribution, but I will be going with the second pr.

andrey-ananiev and others added 12 commits February 11, 2023 21:59

Update Calendar.kt

9430671

Test

ecca8ff

Add weekState in CalendarState

857cb57

Add weekState in CalendarState

e935d1e

Made a week mode

3457953

Made a week mode

058541a

Made a week mode

1cd2fdf

Event count in days view

f248465

Fix bugs with save eventState

1bb5cfc

Fix bugs with save eventState

894b06b

Fix bugs with save eventState

799b427

Add swipe listener

b4b6f1b

restore to old depends

d28a78c

boguszpawlowski reviewed Feb 19, 2023

View reviewed changes

boguszpawlowski closed this Mar 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Week mode #89

Week mode #89

andrey-ananiev commented Feb 14, 2023 •

edited by boguszpawlowski

Loading

boguszpawlowski commented Feb 15, 2023

andrey-ananiev commented Feb 16, 2023

boguszpawlowski left a comment

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023 •

edited

Loading

boguszpawlowski Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski Feb 19, 2023

andrey-ananiev Feb 25, 2023

boguszpawlowski commented Feb 19, 2023 •

edited

Loading

boguszpawlowski commented Feb 25, 2023

andrey-ananiev commented Feb 25, 2023

boguszpawlowski commented Mar 3, 2023

		package io.github.boguszpawlowski.composecalendar.week
		package io.github.boguszpawlowski.composecalendar.header

		@Stable
		internal class WeekListState(

Week mode #89

Week mode #89

Conversation

andrey-ananiev commented Feb 14, 2023 • edited by boguszpawlowski Loading

boguszpawlowski commented Feb 15, 2023

andrey-ananiev commented Feb 16, 2023

boguszpawlowski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrey-ananiev Feb 25, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

boguszpawlowski commented Feb 19, 2023 • edited Loading

boguszpawlowski commented Feb 25, 2023

andrey-ananiev commented Feb 25, 2023

boguszpawlowski commented Mar 3, 2023

andrey-ananiev commented Feb 14, 2023 •

edited by boguszpawlowski

Loading

andrey-ananiev Feb 25, 2023 •

edited

Loading

boguszpawlowski commented Feb 19, 2023 •

edited

Loading