From 0768d84ee603d5ad409b368c0e5385e8a99e7e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sat, 16 Apr 2022 15:17:16 +0200 Subject: [PATCH 01/31] Add module with a support for kotlinx-datetime (#61) --- .github/workflows/publish-snapshot.yml | 2 +- .github/workflows/publish.yml | 2 +- LICENSE | 2 +- README.md | 9 +- buildSrc/src/main/kotlin/Dependencies.kt | 1 + detekt-config.yml | 4 +- gradle.properties | 12 ++ kotlinx-datetime/.gitignore | 1 + kotlinx-datetime/build.gradle.kts | 26 +++++ kotlinx-datetime/gradle.properties | 3 + .../kotlinxDateTime/Converters.kt | 5 + .../kotlinxDateTime/DateTimeExtensions.kt | 15 +++ .../kotlinxDateTime/YearMonth.kt | 87 +++++++++++++++ .../kotlinxDateTime/YearMonthTest.kt | 92 ++++++++++++++++ library/consumer-rules.pro | 0 library/gradle.properties | 17 +-- library/proguard-rules.pro | 21 ---- .../selection/SelectionState.kt | 6 +- sample/build.gradle.kts | 1 + .../sample/KotlinDateTimeSample.kt | 103 ++++++++++++++++++ .../composecalendar/sample/MainActivity.kt | 6 + 21 files changed, 369 insertions(+), 46 deletions(-) create mode 100644 kotlinx-datetime/.gitignore create mode 100644 kotlinx-datetime/build.gradle.kts create mode 100644 kotlinx-datetime/gradle.properties create mode 100644 kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/Converters.kt create mode 100644 kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt create mode 100644 kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt create mode 100644 kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt delete mode 100644 library/consumer-rules.pro delete mode 100644 library/proguard-rules.pro create mode 100644 sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index d7f0015..370baa6 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -33,7 +33,7 @@ jobs: env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - run: ./gradlew :library:publish --no-daemon --no-parallel --stacktrace + run: ./gradlew publish --no-daemon --no-parallel --stacktrace - name: Stop Gradle diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 35e6d21..44d5835 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,7 +35,7 @@ jobs: ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SONATYPE_NEXUS_SIGNING_KEY }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SONATYPE_NEXUS_SIGNING_KEY_PASSWORD }} - run: ./gradlew :library:publish --no-daemon --no-parallel --stacktrace + run: ./gradlew publish --no-daemon --no-parallel --stacktrace - name: Publish release env: diff --git a/LICENSE b/LICENSE index 261eeb9..b1f280a 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2022 Bogusz Pawłowski Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 4e04bbe..b30e9ac 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,9 @@ Library is available on Maven Central repository. // module-level build.gradle dependecies { implementation "io.github.boguszpawlowski.composecalendar:composecalendar:" + + // separate artifact with utilities for working with kotlinx-datetime + implementation "io.github.boguszpawlowski.composecalendar:kotlinx-datetime:" } ``` Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.sonatype.org/content/repositories/snapshots/io/github/boguszpawlowski/composecalendar/). @@ -182,9 +185,13 @@ Selection modes are represented by `SelectionMode` enum, with following values: - `Multiple` - a list of dates can be selected. - `Period` - selectable period - implemented by `start` and `end` dates. - selection will contain all dates between start and the end date. +## KotlinX DateTime +As the core of the library is built on `java.time` library, on Android it requires to use [core libary desugaring](https://developer.android.com/studio/write/java8-support) to be able to access it's API. +As a result library may be unavailable to some project built around different date libraries. Although the library wont be migrating from `java.time`, as it's the best suited for this project, there is a separate `kotlinx-datetime` artifact for those who need to use the library from a codebase based on it. It doesn't consist of a separate version of `ComposeCalendar` features, but offers a small bunch of utilities, that will enable you to create your own wrapper, as briefly presented in `KotlinDateTimeSample`. + ## License - Copyright 2021 Bogusz Pawłowski + Copyright 2022 Bogusz Pawłowski Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 417d4ef..ceb267d 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -26,6 +26,7 @@ object Kotlin { const val JvmPluginId = "jvm" const val DesugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5" + const val DateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.3.2" } object Android { diff --git a/detekt-config.yml b/detekt-config.yml index 735ad91..86dbad2 100644 --- a/detekt-config.yml +++ b/detekt-config.yml @@ -154,7 +154,7 @@ naming: privatePropertyPattern: '^[A-Z][a-z]+(?:[A-Z][a-z]+)*$' PackageNaming: active: true - packagePattern: '^[a-z]+(\.[a-z][a-z]*)*$' + packagePattern: '^[a-z]+(\.[a-z][a-zA-Z]*)*$' TopLevelPropertyNaming: active: false constantPattern: '^[a-z]+(?:[A-Z][a-z]+)*$' @@ -244,7 +244,7 @@ style: active: true RedundantVisibilityModifierRule: active: true - excludes: ['**/library/**'] + excludes: ['**/library/**', '**/kotlinx-datetime/**'] SafeCast: active: true SerialVersionUIDInSerializableClass: diff --git a/gradle.properties b/gradle.properties index 89ef59b..3b9ac76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,3 +10,15 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official + +POM_NAME=Compose Calendar +GROUP=io.github.boguszpawlowski.composecalendar +POM_URL=https://github.com/boguszpawlowski/ComposeCalendar +POM_SCM_URL=https://github.com/boguszpawlowski/ComposeCalendar +POM_SCM_CONNECTION=git@github.com:boguszpawlowski/ComposeCalendar.git +POM_SCM_DEV_CONNECTION=git@github.com:boguszpawlowski/ComposeCalendar.git +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=boguszp +POM_DEVELOPER_NAME=Bogusz Pawlowski diff --git a/kotlinx-datetime/.gitignore b/kotlinx-datetime/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/kotlinx-datetime/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/kotlinx-datetime/build.gradle.kts b/kotlinx-datetime/build.gradle.kts new file mode 100644 index 0000000..0662bba --- /dev/null +++ b/kotlinx-datetime/build.gradle.kts @@ -0,0 +1,26 @@ +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + kotlin(Kotlin.JvmPluginId) + id(MavenPublish.PluginId) +} + +kotlin { + explicitApi() +} + +dependencies { + api(Kotlin.DateTime) + implementation(Kotlin.StdLib) + + testImplementation(Kotest.Assertions) + testImplementation(Kotest.RunnerJunit5) + testImplementation(Kotlin.Reflect) +} + +plugins.withId("com.vanniktech.maven.publish") { + mavenPublish { + sonatypeHost = SonatypeHost.S01 + releaseSigningEnabled = true + } +} diff --git a/kotlinx-datetime/gradle.properties b/kotlinx-datetime/gradle.properties new file mode 100644 index 0000000..dea31af --- /dev/null +++ b/kotlinx-datetime/gradle.properties @@ -0,0 +1,3 @@ +POM_ARTIFACT_ID=kotlinx-datetime +POM_DESCRIPTION=A set of utilities supporting usage of kotlin datetime instead of java.time. +POM_PACKAGING=aar diff --git a/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/Converters.kt b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/Converters.kt new file mode 100644 index 0000000..04f2cc3 --- /dev/null +++ b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/Converters.kt @@ -0,0 +1,5 @@ +package io.github.boguszpawlowski.composecalendar.kotlinxDateTime + +public fun YearMonth.toJavaYearMonth(): java.time.YearMonth = java.time.YearMonth.of(year, month) + +public fun java.time.YearMonth.toKotlinYearMonth(): YearMonth = YearMonth.of(year, month) diff --git a/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt new file mode 100644 index 0000000..7887914 --- /dev/null +++ b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensions.kt @@ -0,0 +1,15 @@ +package io.github.boguszpawlowski.composecalendar.kotlinxDateTime + +import kotlinx.datetime.Clock +import kotlinx.datetime.DayOfWeek +import kotlinx.datetime.LocalDate +import kotlinx.datetime.TimeZone +import kotlinx.datetime.toLocalDateTime +import java.time.temporal.WeekFields +import java.util.Locale + +public fun LocalDate.Companion.now(): LocalDate = + Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).date + +public val Locale.firstDayOfWeek: DayOfWeek + get() = WeekFields.of(this).firstDayOfWeek diff --git a/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt new file mode 100644 index 0000000..ca0811c --- /dev/null +++ b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt @@ -0,0 +1,87 @@ +package io.github.boguszpawlowski.composecalendar.kotlinxDateTime + +import kotlinx.datetime.DateTimeUnit +import kotlinx.datetime.LocalDate +import kotlinx.datetime.Month +import java.time.Month.DECEMBER +import java.time.Month.JANUARY +import java.time.temporal.ChronoField.YEAR + +/** + * Kotlin implementation of `YearMonth` available in java.time, since `KotlinxDateTime` doesn't + * include a substitute for it: https://github.com/Kotlin/kotlinx-datetime/issues/168 + * + * For construction use factory methods 'of' provided in companion object + */ +@Suppress("DataClassPrivateConstructor") +public data class YearMonth private constructor( + val year: Int, + val month: Month, +) { + + /** + * Increment by one month + */ + public operator fun inc(): YearMonth = when (month.value) { + in 1..11 -> YearMonth(year, month) + else -> YearMonth(year + 1, JANUARY) + } + + /** + * Decrement by one month + */ + public operator fun dec(): YearMonth = when (month.value) { + in 2..12 -> YearMonth(year, month) + else -> YearMonth(year - 1, DECEMBER) + } + + /** + * Add specified amount of months to current date + */ + public fun plus(value: Int, unit: DateTimeUnit.MonthBased): YearMonth = + plus(value.toLong(), unit) + + /** + * Subtract specified amount of months from current date + */ + public fun minus(value: Int, unit: DateTimeUnit.MonthBased): YearMonth = + plus(-value.toLong(), unit) + + public fun minus(value: Long, unit: DateTimeUnit.MonthBased): YearMonth = + plus(-value, unit) + + public fun plus(value: Long, unit: DateTimeUnit.MonthBased): YearMonth { + val monthsToAdd = value * unit.months + if (monthsToAdd == 0L) { + return this + } + val monthCount = year * 12L + (month.value - 1) + val calcMonths = monthCount + monthsToAdd + + val newYear = YEAR.checkValidIntValue(calcMonths.floorDiv(12)) + val newMonth = calcMonths.floorMod(12) + 1 + return of(newYear, newMonth.toInt()) + } + + override fun toString(): String = toJavaYearMonth().toString() + + public companion object { + public fun of(year: Int, month: Int): YearMonth = YearMonth(year, Month.of(month)) + + public fun of(year: Int, month: Month): YearMonth = YearMonth(year, month) + + public fun parse(value: String): YearMonth = + java.time.YearMonth.parse(value).toKotlinYearMonth() + + public fun now(): YearMonth { + val today = LocalDate.now() + + return of(today.year, today.month.value) + } + } +} + +private fun Long.floorMod(other: Long): Long = when (other) { + 0L -> this + else -> this - floorDiv(other) * other +} diff --git a/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt b/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt new file mode 100644 index 0000000..9a2eb48 --- /dev/null +++ b/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt @@ -0,0 +1,92 @@ +package io.github.boguszpawlowski.composecalendar.kotlinxDateTime + +import io.kotest.assertions.throwables.shouldThrow +import io.kotest.core.spec.style.ShouldSpec +import io.kotest.data.Headers3 +import io.kotest.data.Row3 +import io.kotest.data.forAll +import io.kotest.data.table +import io.kotest.matchers.shouldBe +import kotlinx.datetime.DateTimeUnit +import java.time.DateTimeException + +internal class YearMonthTest : ShouldSpec({ + + context("Year Month") { + should("overflow a year if adding months") { + val yearMonth = YearMonth.of(2002, 11) + val expectedResult = YearMonth.of(2003, 1) + + val result = yearMonth.plus(2, DateTimeUnit.MONTH) + + result shouldBe expectedResult + } + should("add years if adding months") { + val yearMonth = YearMonth.of(2002, 11) + val expectedResult = YearMonth.of(2202, 11) + + val result = yearMonth.plus(2, DateTimeUnit.CENTURY) + + result shouldBe expectedResult + } + should("subtract years if subtracting months") { + val yearMonth = YearMonth.of(2002, 1) + val expectedResult = YearMonth.of(2001, 11) + + val result = yearMonth.minus(2, DateTimeUnit.MONTH) + + result shouldBe expectedResult + } + should("subtract year if subtracting months") { + val yearMonth = YearMonth.of(2002, 11) + val expectedResult = YearMonth.of(2000, 11) + + val result = yearMonth.minus(2, DateTimeUnit.YEAR) + + result shouldBe expectedResult + } + should("throw an error if months greater than 12") { + shouldThrow { + YearMonth.of(1222, 13) + } + } + should("correctly add months") { + forAll( + table( + Headers3("starting month", "months to add", "expected month"), + Row3(1, 2, 3), + Row3(12, 24, 12), + Row3(11, 2, 1), + Row3(1, 14, 3), + Row3(6, 7, 1), + Row3(10, 20, 6), + ) + ) { startingMonth: Int, monthsToAdd: Int, expectedMonth: Int -> + val yearMonth = YearMonth.of(2000, startingMonth) + + val result = yearMonth.plus(monthsToAdd, DateTimeUnit.MONTH).month.value + + result shouldBe expectedMonth + } + } + should("correctly add years") { + forAll( + table( + Headers3("starting month", "months to add", "expected year"), + Row3(1, 2, 2000), + Row3(12, 24, 2002), + Row3(11, 2, 2001), + Row3(1, 14, 2001), + Row3(6, 7, 2001), + Row3(10, 20, 2002), + ) + ) { startingMonth: Int, monthsToAdd: Int, expectedYear: Int -> + val yearMonth = YearMonth.of(2000, startingMonth) + + val result = yearMonth.plus(monthsToAdd, DateTimeUnit.MONTH).year + + result shouldBe expectedYear + } + } + } +}) diff --git a/library/consumer-rules.pro b/library/consumer-rules.pro deleted file mode 100644 index e69de29..0000000 diff --git a/library/gradle.properties b/library/gradle.properties index 5c156fc..79d1798 100644 --- a/library/gradle.properties +++ b/library/gradle.properties @@ -1,18 +1,3 @@ POM_ARTIFACT_ID=composecalendar -POM_NAME=Compose Calendar -POM_PACKAGING=aar - -GROUP=io.github.boguszpawlowski.composecalendar POM_DESCRIPTION=Library for handling the Calendar view in Jetpack Compose. - -POM_URL=https://github.com/boguszpawlowski/ComposeCalendar -POM_SCM_URL=https://github.com/boguszpawlowski/ComposeCalendar -POM_SCM_CONNECTION=git@github.com:boguszpawlowski/ComposeCalendar.git -POM_SCM_DEV_CONNECTION=git@github.com:boguszpawlowski/ComposeCalendar.git - -POM_LICENCE_NAME=The Apache Software License, Version 2.0 -POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt - -POM_LICENCE_DIST=repo -POM_DEVELOPER_ID=boguszp -POM_DEVELOPER_NAME=Bogusz Pawlowski +POM_PACKAGING=aar diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/library/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt index d667d4a..fcb6d5f 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt @@ -54,11 +54,11 @@ public class DynamicSelectionState( } internal companion object { - @Suppress("FunctionName") // Factory function + @Suppress("FunctionName", "UNCHECKED_CAST") // Factory function fun Saver(onSelectionChanged: (List) -> Unit): Saver = listSaver( - save = { - listOf(it.selectionMode, it.selection.map { it.toString() }) + save = { raw -> + listOf(raw.selectionMode, raw.selection.map { it.toString() }) }, restore = { restored -> DynamicSelectionState( diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 2dd10d2..23bfca5 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -17,6 +17,7 @@ android { dependencies { implementation(project(autoModules.library)) + implementation(project(autoModules.kotlinxDatetime)) implementation(Kotlin.StdLib) diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt new file mode 100644 index 0000000..596e651 --- /dev/null +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt @@ -0,0 +1,103 @@ +package io.github.boguszpawlowski.composecalendar.sample + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import io.github.boguszpawlowski.composecalendar.SelectableCalendar +import io.github.boguszpawlowski.composecalendar.kotlinxDateTime.now +import io.github.boguszpawlowski.composecalendar.rememberSelectableCalendarState +import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState +import io.github.boguszpawlowski.composecalendar.selection.SelectionMode.Multiple +import io.github.boguszpawlowski.composecalendar.selection.SelectionState +import kotlinx.datetime.LocalDate +import kotlinx.datetime.toJavaLocalDate +import kotlinx.datetime.toKotlinLocalDate + +@Composable +fun KotlinXDateTimeSample() { + var selection by remember { mutableStateOf(emptyList()) } + + Column { + DateTimeCalendar( + today = LocalDate.now(), + onSelectionChanged = { selection = it }, + dayContent = { DayContent(dayState = it) }, + ) + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = "Selection: ${selection.joinToString { it.toString() }}", + style = MaterialTheme.typography.h6, + ) + } +} + +@Composable +fun BoxScope.DayContent( + dayState: KotlinDayState, +) { + val isSelected = dayState.selectionState.isDateSelected(dayState.date) + + Text( + text = dayState.date.dayOfMonth.toString(), + modifier = Modifier + .fillMaxWidth() + .align(Alignment.Center) + .aspectRatio(1f) + .clickable { + dayState.selectionState.onDateSelected(dayState.date) + }, + color = if (isSelected) Color.Red else Color.Unspecified, + textAlign = TextAlign.Center, + style = MaterialTheme.typography.h6, + ) +} + +@Composable +fun DateTimeCalendar( + today: LocalDate, + onSelectionChanged: (List) -> Unit, + dayContent: @Composable BoxScope.(KotlinDayState) -> Unit, +) { + SelectableCalendar( + calendarState = rememberSelectableCalendarState( + onSelectionChanged = { selection -> onSelectionChanged(selection.map { it.toKotlinLocalDate() }) }, + initialSelectionMode = Multiple, + ), + today = today.toJavaLocalDate(), + showAdjacentMonths = false, + dayContent = { dayState -> + dayContent( + KotlinDayState( + date = dayState.date.toKotlinLocalDate(), + isCurrentDay = dayState.isCurrentDay, + selectionState = dayState.selectionState, + ) + ) + } + ) +} + +data class KotlinDayState( + val date: LocalDate, + val isCurrentDay: Boolean, + val selectionState: T, +) + +private fun SelectionState.isDateSelected(date: LocalDate) = isDateSelected(date.toJavaLocalDate()) +private fun SelectionState.onDateSelected(date: LocalDate) = onDateSelected(date.toJavaLocalDate()) diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt index f919541..c59d97a 100644 --- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt @@ -50,6 +50,7 @@ fun MainScreen() { composable("components") { CustomComponentsSample() } composable("custom_selection") { CustomSelectionSample() } composable("viewmodel") { ViewModelSample() } + composable("kotlinx_datetime") { KotlinXDateTimeSample() } } } } @@ -85,5 +86,10 @@ fun MainMenu(navController: NavController) { Button(onClick = { navController.navigate("viewmodel") }) { Text(text = "ViewModel") } + Spacer(modifier = Modifier.height(16.dp)) + + Button(onClick = { navController.navigate("kotlinx_datetime") }) { + Text(text = "Kotlinx DateTime") + } } } From 2492ad731f1cbbd270d0ee43eb74718505859027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sat, 16 Apr 2022 17:49:46 +0200 Subject: [PATCH 02/31] Change working in Readme KotlinXDateTime section. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b30e9ac..01909e3 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ Selection modes are represented by `SelectionMode` enum, with following values: ## KotlinX DateTime As the core of the library is built on `java.time` library, on Android it requires to use [core libary desugaring](https://developer.android.com/studio/write/java8-support) to be able to access it's API. -As a result library may be unavailable to some project built around different date libraries. Although the library wont be migrating from `java.time`, as it's the best suited for this project, there is a separate `kotlinx-datetime` artifact for those who need to use the library from a codebase based on it. It doesn't consist of a separate version of `ComposeCalendar` features, but offers a small bunch of utilities, that will enable you to create your own wrapper, as briefly presented in `KotlinDateTimeSample`. +As a result it's features may be unavailable to some project built around different date-time libraries (e.g. kotlinx-datetime). Although the project wont be migrating from `java.time`, as it's the best suited for it, there is a separate `kotlinx-datetime` artifact for those who need to use the library from a codebase based on it. It doesn't consist of a separate version of `ComposeCalendar` features, but offers a small bunch of utilities, that will enable you to create your own wrapper, as briefly presented in `KotlinDateTimeSample`. If the provided functionality, doesn't match your use-case, please submit an issue. ## License From 4ae9e0ef411bd8c2c27af765e94e649eabd34764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sat, 16 Apr 2022 19:23:57 +0200 Subject: [PATCH 03/31] Add compatibility check to workflow (#62) --- .github/workflows/check.yml | 27 ++++ build.gradle.kts | 5 + buildSrc/src/main/kotlin/Dependencies.kt | 8 +- kotlinx-datetime/api/kotlinx-datetime.api | 37 ++++++ library/api/library.api | 146 ++++++++++++++++++++++ 5 files changed, 221 insertions(+), 2 deletions(-) create mode 100644 kotlinx-datetime/api/kotlinx-datetime.api create mode 100644 library/api/library.api diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fe78932..6321204 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -54,3 +54,30 @@ jobs: - name: Stop Gradle run: ./gradlew --stop + + compatibility-check: + name: Compatibility Check + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Cache Gradle + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches/ + ~/.gradle/wrapper/ + key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: cache-gradle- + + - name: Setup Java 15 + uses: actions/setup-java@v1 + with: + java-version: '15' + + - name: Check API compatibility + run: ./gradlew apiCheck + + - name: Stop Gradle + run: ./gradlew --stop diff --git a/build.gradle.kts b/build.gradle.kts index 9b39ce5..856e6e2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,6 +9,7 @@ plugins { id(Shipkit.AutoVersion.PluginId) version Shipkit.AutoVersion.Version id(Shipkit.Changelog.PluginId) version Shipkit.Changelog.Version id(Shipkit.GithubRelease.PluginId) version Shipkit.GithubRelease.Version + id(Kotlin.CompatibilityPlugin) version Kotlin.CompatibilityPluginVersion } buildscript { @@ -58,6 +59,10 @@ dependencies { detekt(DetektLib.Cli) } +apiValidation { + ignoredProjects.add("sample") +} + tasks { withType { parallel = true diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index ceb267d..236f69a 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -12,12 +12,11 @@ object AndroidSdk { object Kotlin { const val Version = "1.6.10" + const val CompatibilityPluginVersion = "0.8.0" const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$Version" const val DokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0" - const val StdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$Version" - const val Reflect = "org.jetbrains.kotlin:kotlin-reflect:$Version" const val SafeArgsPlugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.0" const val AndroidPluginId = "android" @@ -25,7 +24,12 @@ object Kotlin { const val SafeArgsPluginId = "androidx.navigation.safeargs.kotlin" const val JvmPluginId = "jvm" + const val CompatibilityPlugin = "org.jetbrains.kotlinx.binary-compatibility-validator" + const val CompatibilityPluginId = "binary-compatibility-validator" + const val DesugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5" + const val StdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$Version" + const val Reflect = "org.jetbrains.kotlin:kotlin-reflect:$Version" const val DateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.3.2" } diff --git a/kotlinx-datetime/api/kotlinx-datetime.api b/kotlinx-datetime/api/kotlinx-datetime.api new file mode 100644 index 0000000..c5e8ba1 --- /dev/null +++ b/kotlinx-datetime/api/kotlinx-datetime.api @@ -0,0 +1,37 @@ +public final class io/github/boguszpawlowski/composecalendar/kotlinxDateTime/ConvertersKt { + public static final fun toJavaYearMonth (Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth;)Ljava/time/YearMonth; + public static final fun toKotlinYearMonth (Ljava/time/YearMonth;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; +} + +public final class io/github/boguszpawlowski/composecalendar/kotlinxDateTime/DateTimeExtensionsKt { + public static final fun getFirstDayOfWeek (Ljava/util/Locale;)Ljava/time/DayOfWeek; + public static final fun now (Lkotlinx/datetime/LocalDate$Companion;)Lkotlinx/datetime/LocalDate; +} + +public final class io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth { + public static final field Companion Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth$Companion; + public synthetic fun (ILjava/time/Month;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun component1 ()I + public final fun component2 ()Ljava/time/Month; + public final fun copy (ILjava/time/Month;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public static synthetic fun copy$default (Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth;ILjava/time/Month;ILjava/lang/Object;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun dec ()Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public fun equals (Ljava/lang/Object;)Z + public final fun getMonth ()Ljava/time/Month; + public final fun getYear ()I + public fun hashCode ()I + public final fun inc ()Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun minus (ILkotlinx/datetime/DateTimeUnit$MonthBased;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun minus (JLkotlinx/datetime/DateTimeUnit$MonthBased;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun plus (ILkotlinx/datetime/DateTimeUnit$MonthBased;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun plus (JLkotlinx/datetime/DateTimeUnit$MonthBased;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public fun toString ()Ljava/lang/String; +} + +public final class io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth$Companion { + public final fun now ()Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun of (II)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun of (ILjava/time/Month;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; + public final fun parse (Ljava/lang/String;)Lio/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth; +} + diff --git a/library/api/library.api b/library/api/library.api new file mode 100644 index 0000000..2ecfd26 --- /dev/null +++ b/library/api/library.api @@ -0,0 +1,146 @@ +public final class com/boguszpawlowski/composecalendar/BuildConfig { + public static final field BUILD_TYPE Ljava/lang/String; + public static final field DEBUG Z + public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; + public fun ()V +} + +public final class io/github/boguszpawlowski/composecalendar/CalendarKt { + public static final fun Calendar (Lio/github/boguszpawlowski/composecalendar/CalendarState;Landroidx/compose/ui/Modifier;Ljava/time/DayOfWeek;Ljava/time/LocalDate;ZZLkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V + public static final fun SelectableCalendar (Landroidx/compose/ui/Modifier;Ljava/time/DayOfWeek;Ljava/time/LocalDate;ZZLio/github/boguszpawlowski/composecalendar/CalendarState;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V + public static final fun StaticCalendar (Landroidx/compose/ui/Modifier;Ljava/time/DayOfWeek;Ljava/time/LocalDate;ZZLio/github/boguszpawlowski/composecalendar/CalendarState;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V + public static final fun rememberCalendarState (Ljava/time/YearMonth;Lio/github/boguszpawlowski/composecalendar/header/MonthState;Landroidx/compose/runtime/Composer;II)Lio/github/boguszpawlowski/composecalendar/CalendarState; + public static final fun rememberSelectableCalendarState (Ljava/time/YearMonth;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;Lkotlin/jvm/functions/Function1;Lio/github/boguszpawlowski/composecalendar/header/MonthState;Lio/github/boguszpawlowski/composecalendar/selection/DynamicSelectionState;Landroidx/compose/runtime/Composer;II)Lio/github/boguszpawlowski/composecalendar/CalendarState; +} + +public final class io/github/boguszpawlowski/composecalendar/CalendarState { + public fun (Lio/github/boguszpawlowski/composecalendar/header/MonthState;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;)V + public final fun getMonthState ()Lio/github/boguszpawlowski/composecalendar/header/MonthState; + public final fun getSelectionState ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionState; +} + +public final class io/github/boguszpawlowski/composecalendar/ComposableSingletons$CalendarKt { + public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/ComposableSingletons$CalendarKt; + public static field lambda-1 Lkotlin/jvm/functions/Function4; + public static field lambda-10 Lkotlin/jvm/functions/Function4; + public static field lambda-11 Lkotlin/jvm/functions/Function4; + public static field lambda-12 Lkotlin/jvm/functions/Function3; + public static field lambda-2 Lkotlin/jvm/functions/Function4; + public static field lambda-3 Lkotlin/jvm/functions/Function4; + public static field lambda-4 Lkotlin/jvm/functions/Function3; + public static field lambda-5 Lkotlin/jvm/functions/Function4; + public static field lambda-6 Lkotlin/jvm/functions/Function4; + public static field lambda-7 Lkotlin/jvm/functions/Function4; + public static field lambda-8 Lkotlin/jvm/functions/Function3; + public static field lambda-9 Lkotlin/jvm/functions/Function4; + public fun ()V + public final fun getLambda-1$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-10$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-11$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-12$library_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-3$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-4$library_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-5$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-6$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-7$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-8$library_release ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-9$library_release ()Lkotlin/jvm/functions/Function4; +} + +public abstract interface class io/github/boguszpawlowski/composecalendar/day/Day { + public abstract fun getDate ()Ljava/time/LocalDate; + public abstract fun isCurrentDay ()Z + public abstract fun isFromCurrentMonth ()Z +} + +public final class io/github/boguszpawlowski/composecalendar/day/DayState : io/github/boguszpawlowski/composecalendar/day/Day { + public fun (Lio/github/boguszpawlowski/composecalendar/day/Day;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;)V + public final fun component2 ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionState; + public final fun copy (Lio/github/boguszpawlowski/composecalendar/day/Day;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;)Lio/github/boguszpawlowski/composecalendar/day/DayState; + public static synthetic fun copy$default (Lio/github/boguszpawlowski/composecalendar/day/DayState;Lio/github/boguszpawlowski/composecalendar/day/Day;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;ILjava/lang/Object;)Lio/github/boguszpawlowski/composecalendar/day/DayState; + public fun equals (Ljava/lang/Object;)Z + public fun getDate ()Ljava/time/LocalDate; + public final fun getSelectionState ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionState; + public fun hashCode ()I + public fun isCurrentDay ()Z + public fun isFromCurrentMonth ()Z + public fun toString ()Ljava/lang/String; +} + +public final class io/github/boguszpawlowski/composecalendar/day/DefaultDayKt { + public static final fun DefaultDay-t6yy7ic (Lio/github/boguszpawlowski/composecalendar/day/DayState;Landroidx/compose/ui/Modifier;JJLkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V +} + +public final class io/github/boguszpawlowski/composecalendar/header/ComposableSingletons$DefaultMonthHeaderKt { + public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/header/ComposableSingletons$DefaultMonthHeaderKt; + public static field lambda-1 Lkotlin/jvm/functions/Function2; + public static field lambda-2 Lkotlin/jvm/functions/Function2; + public fun ()V + public final fun getLambda-1$library_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-2$library_release ()Lkotlin/jvm/functions/Function2; +} + +public final class io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeaderKt { + public static final fun DefaultMonthHeader (Lio/github/boguszpawlowski/composecalendar/header/MonthState;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V +} + +public abstract interface class io/github/boguszpawlowski/composecalendar/header/MonthState { + public static final field Companion Lio/github/boguszpawlowski/composecalendar/header/MonthState$Companion; + public abstract fun getCurrentMonth ()Ljava/time/YearMonth; + public abstract fun setCurrentMonth (Ljava/time/YearMonth;)V +} + +public final class io/github/boguszpawlowski/composecalendar/header/MonthState$Companion { + public final fun Saver ()Landroidx/compose/runtime/saveable/Saver; +} + +public final class io/github/boguszpawlowski/composecalendar/header/MonthStateKt { + public static final fun MonthState (Ljava/time/YearMonth;)Lio/github/boguszpawlowski/composecalendar/header/MonthState; +} + +public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionHandler { + public static final field $stable I + public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/selection/DynamicSelectionHandler; + public final fun calculateNewSelection (Ljava/time/LocalDate;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;)Ljava/util/List; +} + +public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionState : io/github/boguszpawlowski/composecalendar/selection/SelectionState { + public fun (Lkotlin/jvm/functions/Function1;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;)V + public final fun getSelection ()Ljava/util/List; + public final fun getSelectionMode ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; + public fun isDateSelected (Ljava/time/LocalDate;)Z + public fun onDateSelected (Ljava/time/LocalDate;)V + public final fun setSelection (Ljava/util/List;)V + public final fun setSelectionMode (Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;)V +} + +public final class io/github/boguszpawlowski/composecalendar/selection/EmptySelectionState : io/github/boguszpawlowski/composecalendar/selection/SelectionState { + public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/selection/EmptySelectionState; + public fun isDateSelected (Ljava/time/LocalDate;)Z + public fun onDateSelected (Ljava/time/LocalDate;)V +} + +public final class io/github/boguszpawlowski/composecalendar/selection/SelectionMode : java/lang/Enum { + public static final field Multiple Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; + public static final field None Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; + public static final field Period Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; + public static final field Single Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; + public static fun valueOf (Ljava/lang/String;)Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; + public static fun values ()[Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; +} + +public abstract interface class io/github/boguszpawlowski/composecalendar/selection/SelectionState { + public abstract fun isDateSelected (Ljava/time/LocalDate;)Z + public abstract fun onDateSelected (Ljava/time/LocalDate;)V +} + +public final class io/github/boguszpawlowski/composecalendar/selection/SelectionState$DefaultImpls { + public static fun isDateSelected (Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;Ljava/time/LocalDate;)Z + public static fun onDateSelected (Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;Ljava/time/LocalDate;)V +} + +public final class io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeaderKt { + public static final fun DefaultWeekHeader (Ljava/util/List;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V +} + From 1fb5cfcf124b5a9253ea43739820645f72d05ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sun, 1 May 2022 20:48:21 +0200 Subject: [PATCH 04/31] Fix wrong implementation of decrementing and incrementing months (#67) --- .../kotlinxDateTime/YearMonth.kt | 12 ++----- .../kotlinxDateTime/YearMonthTest.kt | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt index ca0811c..eb2a8e8 100644 --- a/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt +++ b/kotlinx-datetime/src/main/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonth.kt @@ -3,8 +3,6 @@ package io.github.boguszpawlowski.composecalendar.kotlinxDateTime import kotlinx.datetime.DateTimeUnit import kotlinx.datetime.LocalDate import kotlinx.datetime.Month -import java.time.Month.DECEMBER -import java.time.Month.JANUARY import java.time.temporal.ChronoField.YEAR /** @@ -22,18 +20,12 @@ public data class YearMonth private constructor( /** * Increment by one month */ - public operator fun inc(): YearMonth = when (month.value) { - in 1..11 -> YearMonth(year, month) - else -> YearMonth(year + 1, JANUARY) - } + public operator fun inc(): YearMonth = plus(1, DateTimeUnit.MONTH) /** * Decrement by one month */ - public operator fun dec(): YearMonth = when (month.value) { - in 2..12 -> YearMonth(year, month) - else -> YearMonth(year - 1, DECEMBER) - } + public operator fun dec(): YearMonth = minus(1, DateTimeUnit.MONTH) /** * Add specified amount of months to current date diff --git a/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt b/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt index 9a2eb48..6de0bf6 100644 --- a/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt +++ b/kotlinx-datetime/src/test/java/io/github/boguszpawlowski/composecalendar/kotlinxDateTime/YearMonthTest.kt @@ -88,5 +88,41 @@ internal class YearMonthTest : ShouldSpec({ result shouldBe expectedYear } } + context("when decrementing") { + should("subtract one month") { + val yearMonth = YearMonth.of(2002, 11) + val expectedResult = YearMonth.of(2002, 10) + + val result = yearMonth.dec() + + result shouldBe expectedResult + } + should("overflow the year when january") { + val yearMonth = YearMonth.of(2002, 1) + val expectedResult = YearMonth.of(2001, 12) + + val result = yearMonth.dec() + + result shouldBe expectedResult + } + } + context("when incrementing") { + should("add one month") { + val yearMonth = YearMonth.of(2002, 11) + val expectedResult = YearMonth.of(2002, 12) + + val result = yearMonth.inc() + + result shouldBe expectedResult + } + should("overflow the year when december") { + val yearMonth = YearMonth.of(2002, 12) + val expectedResult = YearMonth.of(2003, 1) + + val result = yearMonth.inc() + + result shouldBe expectedResult + } + } } }) From 269a63e67e210893a71f6e1267341ac14d515fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sun, 1 May 2022 21:24:26 +0200 Subject: [PATCH 05/31] Add vetoing functionality to the selection state (#68) - Removed: `onSelectionChange` callback - Added: `confirmSelectionChange` callback --- README.md | 1 + library/api/library.api | 1 + .../composecalendar/Calendar.kt | 10 ++-- .../selection/SelectionState.kt | 12 +++-- .../selection/SelectionStateTest.kt | 48 ++++++++++++++----- .../sample/KotlinDateTimeSample.kt | 2 +- .../composecalendar/sample/ViewModelSample.kt | 2 +- 7 files changed, 51 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 01909e3..c708146 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,7 @@ Selection modes are represented by `SelectionMode` enum, with following values: - `Single` - only single day is selectable - selection will contain one or zero days selected. - `Multiple` - a list of dates can be selected. - `Period` - selectable period - implemented by `start` and `end` dates. - selection will contain all dates between start and the end date. +This implementation of SelectionState also allows for handling side-effects and vetoing the state change via `confirmSelectionChange` callback. ## KotlinX DateTime As the core of the library is built on `java.time` library, on Android it requires to use [core libary desugaring](https://developer.android.com/studio/write/java8-support) to be able to access it's API. diff --git a/library/api/library.api b/library/api/library.api index 2ecfd26..2d55f3a 100644 --- a/library/api/library.api +++ b/library/api/library.api @@ -107,6 +107,7 @@ public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSe public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionState : io/github/boguszpawlowski/composecalendar/selection/SelectionState { public fun (Lkotlin/jvm/functions/Function1;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;)V + public synthetic fun (Lkotlin/jvm/functions/Function1;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getSelection ()Ljava/util/List; public final fun getSelectionMode ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode; public fun isDateSelected (Ljava/time/LocalDate;)Z diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt index 3f1942d..a3fe559 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt @@ -218,23 +218,21 @@ public fun Calendar( * @param initialMonth initially rendered month * @param initialSelection initial selection of the composable * @param initialSelectionMode initial mode of the selection - * @param onSelectionChanged callback for side effects triggered when the selection state changes + * @param confirmSelectionChange callback for optional side-effects handling and vetoing the state change */ @Composable public fun rememberSelectableCalendarState( initialMonth: YearMonth = YearMonth.now(), initialSelection: List = emptyList(), initialSelectionMode: SelectionMode = SelectionMode.Single, - onSelectionChanged: (List) -> Unit = {}, + confirmSelectionChange: (newValue: List) -> Boolean = { true }, monthState: MonthState = rememberSaveable(saver = MonthState.Saver()) { MonthState(initialMonth = initialMonth) }, selectionState: DynamicSelectionState = rememberSaveable( - saver = DynamicSelectionState.Saver( - onSelectionChanged - ) + saver = DynamicSelectionState.Saver(confirmSelectionChange), ) { - DynamicSelectionState(onSelectionChanged, initialSelection, initialSelectionMode) + DynamicSelectionState(confirmSelectionChange, initialSelection, initialSelectionMode) }, ): CalendarState = remember { CalendarState(monthState, selectionState) } diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt index fcb6d5f..821e006 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/selection/SelectionState.kt @@ -18,10 +18,11 @@ public interface SelectionState { /** * Class that enables for dynamically changing selection modes in the runtime. Depending on the mode, selection changes differently. * Mode can be varied by setting desired [SelectionMode] in the [selectionMode] mutable property. + * @param confirmSelectionChange return false from this callback to veto the selection change */ @Stable public class DynamicSelectionState( - private val onSelectionChanged: (List) -> Unit, + private val confirmSelectionChange: (newValue: List) -> Boolean = { true }, selection: List, selectionMode: SelectionMode, ) : SelectionState { @@ -32,9 +33,8 @@ public class DynamicSelectionState( public var selection: List get() = _selection set(value) { - if (value != selection) { + if (value != selection && confirmSelectionChange(value)) { _selection = value - onSelectionChanged(value) } } @@ -55,14 +55,16 @@ public class DynamicSelectionState( internal companion object { @Suppress("FunctionName", "UNCHECKED_CAST") // Factory function - fun Saver(onSelectionChanged: (List) -> Unit): Saver = + fun Saver( + confirmSelectionChange: (newValue: List) -> Boolean, + ): Saver = listSaver( save = { raw -> listOf(raw.selectionMode, raw.selection.map { it.toString() }) }, restore = { restored -> DynamicSelectionState( - onSelectionChanged = onSelectionChanged, + confirmSelectionChange = confirmSelectionChange, selectionMode = restored[0] as SelectionMode, selection = (restored[1] as? List)?.map { LocalDate.parse(it) }.orEmpty(), ) diff --git a/library/src/test/java/io/github/boguszpawlowski/composecalendar/selection/SelectionStateTest.kt b/library/src/test/java/io/github/boguszpawlowski/composecalendar/selection/SelectionStateTest.kt index fbe25d4..75ca49c 100644 --- a/library/src/test/java/io/github/boguszpawlowski/composecalendar/selection/SelectionStateTest.kt +++ b/library/src/test/java/io/github/boguszpawlowski/composecalendar/selection/SelectionStateTest.kt @@ -2,6 +2,7 @@ package io.github.boguszpawlowski.composecalendar.selection +import io.github.boguszpawlowski.composecalendar.selection.SelectionMode.Multiple import io.kotest.assertions.throwables.shouldNotThrowAny import io.kotest.core.spec.style.ShouldSpec import io.kotest.matchers.collections.shouldContainExactly @@ -17,7 +18,7 @@ internal class SelectionStateTest : ShouldSpec({ context("Selection state with SelectionMode.None") { should("not change selection after new value arrives") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.None) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.None) state.onDateSelected(LocalDate.now()) @@ -25,7 +26,7 @@ internal class SelectionStateTest : ShouldSpec({ } should("be able to change if mode has been changed") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.None) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.None) state.selectionMode = SelectionMode.Single state.onDateSelected(today) @@ -36,7 +37,7 @@ internal class SelectionStateTest : ShouldSpec({ context("Selection state with SelectionMode.Single") { should("change state to single after day is selected") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Single) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Single) state.onDateSelected(today) @@ -44,7 +45,7 @@ internal class SelectionStateTest : ShouldSpec({ } should("change state to none when same day is selected") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Single) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Single) state.onDateSelected(today) state.onDateSelected(today) @@ -53,7 +54,7 @@ internal class SelectionStateTest : ShouldSpec({ } should("change to other day when selected") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Single) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Single) state.onDateSelected(today) state.onDateSelected(tomorrow) @@ -62,7 +63,7 @@ internal class SelectionStateTest : ShouldSpec({ } should("not be mutable after selection mode is changed to None") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Single) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Single) state.selectionMode = SelectionMode.None state.onDateSelected(today) @@ -73,7 +74,7 @@ internal class SelectionStateTest : ShouldSpec({ context("Selection state with SelectionMode.Multiple") { should("allow for multiple days selected") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Multiple) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Multiple) state.onDateSelected(today) state.onDateSelected(tomorrow) @@ -85,7 +86,7 @@ internal class SelectionStateTest : ShouldSpec({ } should("switch selection off once day is selected second time") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Multiple) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Multiple) state.onDateSelected(today) state.onDateSelected(tomorrow) @@ -97,7 +98,7 @@ internal class SelectionStateTest : ShouldSpec({ context("Selection state with SelectionMode.Period") { should("allow for period of days selected") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Period) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Period) state.onDateSelected(today) state.onDateSelected(tomorrow) @@ -107,7 +108,7 @@ internal class SelectionStateTest : ShouldSpec({ } should("switch selection off once start day is selected") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Period) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Period) state.onDateSelected(today) state.onDateSelected(tomorrow) @@ -116,7 +117,7 @@ internal class SelectionStateTest : ShouldSpec({ state.selection shouldBe emptyList() } should("change end date once the date selected is between start and the end") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Period) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Period) state.onDateSelected(yesterday) state.onDateSelected(tomorrow) @@ -126,7 +127,7 @@ internal class SelectionStateTest : ShouldSpec({ state.selection.last() shouldBe today } should("change start day once day before start is selected") { - val state = DynamicSelectionState({}, emptyList(), SelectionMode.Period) + val state = DynamicSelectionState({ true }, emptyList(), SelectionMode.Period) state.onDateSelected(today) state.onDateSelected(tomorrow) @@ -150,4 +151,27 @@ internal class SelectionStateTest : ShouldSpec({ } } } + context("Selection State with confirm state change callback") { + var nextVetoResult = false + val initialSelection = LocalDate.of(1999, 10, 12) + val newSelection = initialSelection.plusDays(1) + + val selectionState = DynamicSelectionState( + confirmSelectionChange = { nextVetoResult }, + selection = listOf(initialSelection), + selectionMode = Multiple, + ) + should("Not change the selection when change is vetoed") { + selectionState.onDateSelected(newSelection) + + selectionState.selection shouldBe listOf(initialSelection) + } + should("Change the selection when change is not vetoed") { + nextVetoResult = true + + selectionState.onDateSelected(newSelection) + + selectionState.selection shouldBe listOf(initialSelection, newSelection) + } + } }) diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt index 596e651..bdbc3be 100644 --- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/KotlinDateTimeSample.kt @@ -76,7 +76,7 @@ fun DateTimeCalendar( ) { SelectableCalendar( calendarState = rememberSelectableCalendarState( - onSelectionChanged = { selection -> onSelectionChanged(selection.map { it.toKotlinLocalDate() }) }, + confirmSelectionChange = { selection -> onSelectionChanged(selection.map { it.toKotlinLocalDate() }); true }, initialSelectionMode = Multiple, ), today = today.toJavaLocalDate(), diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt index 87b062d..2766c2a 100644 --- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/ViewModelSample.kt @@ -53,7 +53,7 @@ fun ViewModelSample() { val selectedPrice by viewModel.selectedRecipesPriceFlow.collectAsState(0) val state = rememberSelectableCalendarState( - onSelectionChanged = viewModel::onSelectionChanged, + confirmSelectionChange = { viewModel.onSelectionChanged(it); true }, initialSelectionMode = Period, ) From 6e0a936c510624d1df88f02eac6ceb2954709cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Wed, 11 May 2022 23:42:13 +0200 Subject: [PATCH 06/31] Run ui tests on FTL on CI (#70) * Run ui tests on FTL on CI * Run only if unit and detekt passed --- .github/workflows/check.yml | 43 +++++++++++++++++++ build.gradle.kts | 1 + buildSrc/src/main/kotlin/Dependencies.kt | 5 +++ library/build.gradle.kts | 7 --- sample/.gitignore | 1 + sample/build.gradle.kts | 9 ++++ .../sample}/ScrollBehaviorTest.kt | 4 +- sample/src/main/AndroidManifest.xml | 5 ++- 8 files changed, 66 insertions(+), 9 deletions(-) rename {library/src/androidTest/java/io/github/boguszpawlowski/composecalendar => sample/src/androidTest/java/io/github/boguszpawlowski/composecalendar/sample}/ScrollBehaviorTest.kt (88%) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 6321204..5b01906 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -54,7 +54,50 @@ jobs: - name: Stop Gradle run: ./gradlew --stop + ui-tests: + name: FTL UI Tests + needs: [unit-tests, detekt] + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Cache Gradle + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches/ + ~/.gradle/wrapper/ + key: cache-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} + restore-keys: cache-gradle- + - name: Setup Java 15 + uses: actions/setup-java@v1 + with: + java-version: '15' + + - name: Build app and test APKs + run: ./gradlew :sample:assembleDebug && ./gradlew :sample:assembleDebugAndroidTest + + - name: Login to Google Cloud + uses: google-github-actions/auth@v0 + with: + credentials_json: ${{ secrets.GCLOUD_AUTH_KEY }} + + - name: Set up Cloud SDK + uses: google-github-actions/setup-gcloud@v0 + + - name: Use gcloud CLI + run: gcloud info + + - name: Set current project + run: gcloud config set project ${{ secrets.FIREBASE_PROJECT_ID }} + + - name: Run Instrumentation Tests in Firebase Test Lab + run: gcloud firebase test android run --type instrumentation --app sample/build/outputs/apk/debug/sample-debug.apk --test sample/build/outputs/apk/androidTest/debug/sample-debug-androidTest.apk --device model=Pixel2,version=28,locale=en,orientation=portrait + + - name: Stop Gradle + run: ./gradlew --stop compatibility-check: name: Compatibility Check runs-on: ubuntu-latest diff --git a/build.gradle.kts b/build.gradle.kts index 856e6e2..b128f22 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,6 +25,7 @@ buildscript { classpath(DetektLib.Plugin) classpath(GradleVersions.Plugin) classpath(MavenPublish.GradlePlugin) + classpath(Firebase.GoogleServicesPlugin) } } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 236f69a..d210f91 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -148,3 +148,8 @@ object ComposeTest { const val Core = "androidx.compose.ui:ui-test-junit4:${Compose.Version}" const val Manifest = "androidx.compose.ui:ui-test-manifest:${Compose.Version}" } + +object Firebase { + const val Bom = "com.google.firebase:firebase-bom:30.0.0" + const val GoogleServicesPlugin = "com.google.gms:google-services:4.3.10" +} diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 8533617..4dca94d 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -14,10 +14,6 @@ android { freeCompilerArgs = freeCompilerArgs + "-Xexplicit-api=strict" } } - packagingOptions { - exclude("META-INF/AL2.0") - exclude("META-INF/LGPL2.1") - } } dependencies { @@ -33,9 +29,6 @@ dependencies { testImplementation(Kotest.Assertions) testImplementation(Kotest.RunnerJunit5) testImplementation(Kotlin.Reflect) - - debugImplementation(ComposeTest.Manifest) - androidTestImplementation(ComposeTest.Core) } plugins.withId("com.vanniktech.maven.publish") { diff --git a/sample/.gitignore b/sample/.gitignore index 796b96d..a2def88 100644 --- a/sample/.gitignore +++ b/sample/.gitignore @@ -1 +1,2 @@ /build +google-services.json diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 23bfca5..16f5856 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -12,6 +12,12 @@ android { defaultConfig { versionCode = commitsCount versionName = "0.0.1" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + packagingOptions { + exclude("META-INF/AL2.0") + exclude("META-INF/LGPL2.1") } } @@ -40,4 +46,7 @@ dependencies { debugImplementation(Hyperion.Crash) debugImplementation(Hyperion.GeigerCounter) debugImplementation(Hyperion.Measurement) + debugImplementation(ComposeTest.Manifest) + + androidTestImplementation(ComposeTest.Core) } diff --git a/library/src/androidTest/java/io/github/boguszpawlowski/composecalendar/ScrollBehaviorTest.kt b/sample/src/androidTest/java/io/github/boguszpawlowski/composecalendar/sample/ScrollBehaviorTest.kt similarity index 88% rename from library/src/androidTest/java/io/github/boguszpawlowski/composecalendar/ScrollBehaviorTest.kt rename to sample/src/androidTest/java/io/github/boguszpawlowski/composecalendar/sample/ScrollBehaviorTest.kt index e426494..b468e3f 100644 --- a/library/src/androidTest/java/io/github/boguszpawlowski/composecalendar/ScrollBehaviorTest.kt +++ b/sample/src/androidTest/java/io/github/boguszpawlowski/composecalendar/sample/ScrollBehaviorTest.kt @@ -1,4 +1,4 @@ -package io.github.boguszpawlowski.composecalendar +package io.github.boguszpawlowski.composecalendar.sample import androidx.compose.ui.test.assertTextEquals import androidx.compose.ui.test.junit4.createComposeRule @@ -7,6 +7,8 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTouchInput import androidx.compose.ui.test.swipeLeft import androidx.compose.ui.test.swipeRight +import io.github.boguszpawlowski.composecalendar.StaticCalendar +import io.github.boguszpawlowski.composecalendar.rememberCalendarState import org.junit.Rule import org.junit.Test import java.time.YearMonth diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index e7bb3aa..8088ada 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -2,6 +2,7 @@ + - @@ -17,6 +19,7 @@ + From 45c3e4aad8082357098341820ede39d97c073944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Fri, 29 Jul 2022 21:57:32 +0200 Subject: [PATCH 07/31] Bump Compose to 1.2.0 (#74) --- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/Dependencies.kt | 26 +++++++++-------------- gradle/dependencies.gradle | 0 gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 ++++++ gradlew.bat | 14 ++++++------ 8 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 gradle/dependencies.gradle diff --git a/build.gradle.kts b/build.gradle.kts index b128f22..2b99689 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ allprojects { tasks.withType { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" freeCompilerArgs = freeCompilerArgs + listOf( "-progressive", "-Xopt-in=kotlin.RequiresOptIn", diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 86351fb..312a439 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,6 +17,6 @@ gradlePlugin { } dependencies { - implementation("com.android.tools.build:gradle:7.1.2") - implementation(kotlin("gradle-plugin", "1.6.10")) + implementation("com.android.tools.build:gradle:7.2.1") + implementation(kotlin("gradle-plugin", "1.7.0")) } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index d210f91..d10cddb 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -6,16 +6,16 @@ object MavenPublish { object AndroidSdk { const val Min = 21 - const val Compile = 31 + const val Compile = 32 const val Target = Compile } object Kotlin { - const val Version = "1.6.10" - const val CompatibilityPluginVersion = "0.8.0" + const val Version = "1.7.10" + const val CompatibilityPluginVersion = "0.11.0" const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$Version" - const val DokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0" + const val DokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$Version" const val SafeArgsPlugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.0" @@ -30,11 +30,11 @@ object Kotlin { const val DesugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5" const val StdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$Version" const val Reflect = "org.jetbrains.kotlin:kotlin-reflect:$Version" - const val DateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.3.2" + const val DateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0" } object Android { - const val GradlePlugin = "com.android.tools.build:gradle:7.1.2" + const val GradlePlugin = "com.android.tools.build:gradle:7.2.1" const val ApplicationPluginId = "com.android.application" const val LibraryPluginId = "com.android.library" @@ -73,12 +73,6 @@ object Shipkit { } } -object Coroutines { - const val Version = "1.4.3" - - const val Core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$Version" -} - object AndroidX { const val Version = "1.0.0" const val LifecycleVersion = "2.2.0" @@ -92,7 +86,7 @@ object Material { } object DetektLib { - const val Version = "1.19.0" + const val Version = "1.21.0" const val PluginId = "io.gitlab.arturbosch.detekt" const val Plugin = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$Version" @@ -107,8 +101,8 @@ object Timber { } object Compose { - const val Version = "1.1.1" - const val AccompanistVersion = "0.23.1" + const val Version = "1.2.0" + const val AccompanistVersion = "0.25.0" const val Runtime = "androidx.compose.runtime:runtime:$Version" const val Compiler = "androidx.compose.compiler:compiler:$Version" @@ -137,7 +131,7 @@ object Hyperion { } object Kotest { - const val Version = "5.1.0" + const val Version = "5.4.1" const val RunnerJunit5 = "io.kotest:kotest-runner-junit5-jvm:$Version" diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle new file mode 100644 index 0000000..e69de29 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10158 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 delta 9041 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..a69d9cb 100755 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From 6a1f424a5f240c090ad7c3f2de9519c1f590ca75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Fri, 29 Jul 2022 21:59:00 +0200 Subject: [PATCH 08/31] Add information about compose versions to the Readme (#75) --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index c708146..a839bb5 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,13 @@ Library is available on Maven Central repository. ``` Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.sonatype.org/content/repositories/snapshots/io/github/boguszpawlowski/composecalendar/). +## Compose versions +| Compose Version | Compose Calendar Version | +|-------------------|----------------------------| +| 1.0.0 | 0.3.0 | +| 1.1.0 | 0.5.1 | +| 1.2.0 | 0.6.0 | + ## Supported features - Selection (single, multiple or a range of days) - Every day as first day of week From c491f7e297844bbafb9ea9b39b8071a0f4ca3d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sat, 30 Jul 2022 22:53:03 +0200 Subject: [PATCH 09/31] Add screenshot back to the readme (#76) --- blob/screenshot_1.jpg | Bin 0 -> 66663 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/blob/screenshot_1.jpg b/blob/screenshot_1.jpg index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3bb37214fdcfb3b2b06897ef7c9be0dd03043491 100644 GIT binary patch literal 66663 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 BlVJb= literal 0 HcmV?d00001 From 6a1b44a80067d52a1a15b865cc55ab72e7a55e5e Mon Sep 17 00:00:00 2001 From: JEONG TAEHUN <52663419+jeongth9446@users.noreply.github.com> Date: Wed, 14 Sep 2022 23:56:22 +0900 Subject: [PATCH 10/31] Add vertical center alignment into DefaultMonthHeader (#78) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 정태훈/연구/인포테인먼트소프트웨어개발팀 --- .../composecalendar/header/DefaultMonthHeader.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt index d47cedb..e868d6c 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeader.kt @@ -13,6 +13,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.KeyboardArrowLeft import androidx.compose.material.icons.filled.KeyboardArrowRight import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.platform.testTag @@ -32,6 +33,7 @@ public fun DefaultMonthHeader( Row( modifier = modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically, ) { IconButton( modifier = Modifier.testTag("Decrement"), From 6fa69c90216f73c106c8bcb280e6fc9742c29fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Mon, 17 Oct 2022 17:40:25 +0200 Subject: [PATCH 11/31] Bump dependencies (#77) --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/CommonAndroidPlugin.kt | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 312a439..41562db 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,5 +18,5 @@ gradlePlugin { dependencies { implementation("com.android.tools.build:gradle:7.2.1") - implementation(kotlin("gradle-plugin", "1.7.0")) + implementation(kotlin("gradle-plugin", "1.7.20")) } diff --git a/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt b/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt index 1d879f9..19b20e5 100644 --- a/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt +++ b/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt @@ -26,7 +26,7 @@ class CommonAndroidPlugin : Plugin { buildFeatures.compose = true composeOptions { - kotlinCompilerExtensionVersion = Compose.Version + kotlinCompilerExtensionVersion = Compose.CompilerVersion } target.dependencies.add("coreLibraryDesugaring", Kotlin.DesugarJdkLibs) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index d10cddb..04ee0cf 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,7 +1,7 @@ @file:Suppress("ObjectPropertyNaming", "ClassNaming", "UnderscoresInNumericLiterals") object MavenPublish { const val PluginId = "com.vanniktech.maven.publish" - const val GradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.18.0" + const val GradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.19.0" } object AndroidSdk { @@ -11,7 +11,7 @@ object AndroidSdk { } object Kotlin { - const val Version = "1.7.10" + const val Version = "1.7.20" const val CompatibilityPluginVersion = "0.11.0" const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$Version" @@ -78,7 +78,7 @@ object AndroidX { const val LifecycleVersion = "2.2.0" const val AppCompat = "androidx.appcompat:appcompat:1.4.1" - const val ComposeActivity = "androidx.activity:activity-compose:1.4.0" + const val ComposeActivity = "androidx.activity:activity-compose:1.5.1" } object Material { @@ -101,11 +101,12 @@ object Timber { } object Compose { - const val Version = "1.2.0" - const val AccompanistVersion = "0.25.0" + const val Version = "1.2.1" + const val CompilerVersion = "1.3.2" + const val AccompanistVersion = "0.25.1" const val Runtime = "androidx.compose.runtime:runtime:$Version" - const val Compiler = "androidx.compose.compiler:compiler:$Version" + const val Compiler = "androidx.compose.compiler:compiler:$CompilerVersion" const val Foundation = "androidx.compose.foundation:foundation:$Version" const val FoundationLayout = "androidx.compose.foundation:foundation-layout:$Version" const val Material = "androidx.compose.material:material:$Version" @@ -131,7 +132,7 @@ object Hyperion { } object Kotest { - const val Version = "5.4.1" + const val Version = "5.4.2" const val RunnerJunit5 = "io.kotest:kotest-runner-junit5-jvm:$Version" From e46fed11e635a05e7391f3da6a92d861be5fe4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Mon, 17 Oct 2022 17:41:50 +0200 Subject: [PATCH 12/31] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a839bb5..3001956 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.s | 1.0.0 | 0.3.0 | | 1.1.0 | 0.5.1 | | 1.2.0 | 0.6.0 | +| 1.2.1 | 1.0.0 | ## Supported features - Selection (single, multiple or a range of days) From f2886b90f666c0ad95c16644180458339e8c60a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Mon, 31 Oct 2022 11:03:40 +0100 Subject: [PATCH 13/31] Revert version of publish plugin (#82) --- build.gradle.kts | 1 + buildSrc/src/main/kotlin/Dependencies.kt | 2 +- sample/build.gradle.kts | 4 ++-- settings.gradle.kts | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2b99689..58bef76 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,6 +32,7 @@ buildscript { allprojects { repositories { mavenCentral() + gradlePluginPortal() google() } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 04ee0cf..322b985 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,7 +1,7 @@ @file:Suppress("ObjectPropertyNaming", "ClassNaming", "UnderscoresInNumericLiterals") object MavenPublish { const val PluginId = "com.vanniktech.maven.publish" - const val GradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.19.0" + const val GradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.18.0" } object AndroidSdk { diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 16f5856..3a44c1e 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -22,8 +22,8 @@ android { } dependencies { - implementation(project(autoModules.library)) - implementation(project(autoModules.kotlinxDatetime)) + implementation(project(":library")) + implementation(project(":kotlinx-datetime")) implementation(Kotlin.StdLib) diff --git a/settings.gradle.kts b/settings.gradle.kts index 0a01ca8..6f5d645 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ rootProject.name = "composecalendar" -plugins { - id("com.pablisco.gradle.automodule") version "0.14" -} +include(":sample") +include(":library") +include(":kotlinx-datetime") From 269c795c7f93f7180abdf215f3fddad35fd70231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Mon, 31 Oct 2022 11:11:52 +0100 Subject: [PATCH 14/31] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3001956..d984df6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.s ## Compose versions | Compose Version | Compose Calendar Version | |-------------------|----------------------------| -| 1.0.0 | 0.3.0 | +| 1.0.1 | 0.3.0 | | 1.1.0 | 0.5.1 | | 1.2.0 | 0.6.0 | | 1.2.1 | 1.0.0 | From 93a25fb9c59b457eb90808eba78a698ae60a0b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Mon, 31 Oct 2022 11:12:09 +0100 Subject: [PATCH 15/31] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d984df6..fb67b6e 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.s ## Compose versions | Compose Version | Compose Calendar Version | |-------------------|----------------------------| -| 1.0.1 | 0.3.0 | +| 1.0.0 | 0.3.0 | | 1.1.0 | 0.5.1 | | 1.2.0 | 0.6.0 | -| 1.2.1 | 1.0.0 | +| 1.2.1 | 1.0.1 | ## Supported features - Selection (single, multiple or a range of days) From f5f2f02d8611ca5e1f99ead798e5e5253c767392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sun, 13 Nov 2022 17:54:52 +0100 Subject: [PATCH 16/31] Remove pager in favor of lazy list (#85) --- .../composecalendar/Calendar.kt | 2 + .../debug/RecomposeHighlighter.kt | 97 +++++++++++++++++++ .../composecalendar/month/MonthContent.kt | 77 +++++++++------ .../{MonthPagerState.kt => MonthListState.kt} | 26 ++--- .../composecalendar/sample/MainActivity.kt | 6 ++ 5 files changed, 167 insertions(+), 41 deletions(-) create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/debug/RecomposeHighlighter.kt rename library/src/main/java/io/github/boguszpawlowski/composecalendar/month/{MonthPagerState.kt => MonthListState.kt} (81%) diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt index a3fe559..07227cb 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable import androidx.compose.runtime.remember @@ -199,6 +200,7 @@ public fun Calendar( ) } else { MonthContent( + modifier = Modifier.fillMaxWidth(), currentMonth = calendarState.monthState.currentMonth, showAdjacentMonths = showAdjacentMonths, selectionState = calendarState.selectionState, diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/debug/RecomposeHighlighter.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/debug/RecomposeHighlighter.kt new file mode 100644 index 0000000..61b2744 --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/debug/RecomposeHighlighter.kt @@ -0,0 +1,97 @@ +package io.github.boguszpawlowski.composecalendar.debug + +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.Stable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.composed +import androidx.compose.ui.draw.drawWithCache +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.drawscope.Fill +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.platform.debugInspectorInfo +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.delay +import kotlin.math.min + +/** + * A [Modifier] that draws a border around elements that are recomposing. The border increases in + * size and interpolates from red to green as more recompositions occur before a timeout. + */ +@Stable +internal fun Modifier.recomposeHighlighter(): Modifier = this.then(recomposeModifier) + +// Use a single instance + @Stable to ensure that recompositions can enable skipping optimizations +// Modifier.composed will still remember unique data per call site. +private val recomposeModifier = + Modifier.composed(inspectorInfo = debugInspectorInfo { name = "recomposeHighlighter" }) { + // The total number of compositions that have occurred. We're not using a State<> here be + // able to read/write the value without invalidating (which would cause infinite + // recomposition). + val totalCompositions = remember { arrayOf(0L) } + totalCompositions[0]++ + + // The value of totalCompositions at the last timeout. + val totalCompositionsAtLastTimeout = remember { mutableStateOf(0L) } + + // Start the timeout, and reset everytime there's a recomposition. (Using totalCompositions + // as the key is really just to cause the timer to restart every composition). + LaunchedEffect(totalCompositions[0]) { + delay(3000) + totalCompositionsAtLastTimeout.value = totalCompositions[0] + } + + Modifier.drawWithCache { + onDrawWithContent { + // Draw actual content. + drawContent() + + // Below is to draw the highlight, if necessary. A lot of the logic is copied from + // Modifier.border + val numCompositionsSinceTimeout = + totalCompositions[0] - totalCompositionsAtLastTimeout.value + + val hasValidBorderParams = size.minDimension > 0f + if (!hasValidBorderParams || numCompositionsSinceTimeout <= 0) { + return@onDrawWithContent + } + + val (color, strokeWidthPx) = + when (numCompositionsSinceTimeout) { + // We need at least one composition to draw, so draw the smallest border + // color in blue. + 1L -> Color.Blue to 1f + // 2 compositions is _probably_ okay. + 2L -> Color.Green to 2.dp.toPx() + // 3 or more compositions before timeout may indicate an issue. lerp the + // color from yellow to red, and continually increase the border size. + else -> lerp( + Color.Yellow.copy(alpha = 0.8f), + Color.Red.copy(alpha = 0.5f), + min(1f, (numCompositionsSinceTimeout - 1).toFloat() / 100f) + ) to numCompositionsSinceTimeout.toInt().dp.toPx() + } + + val halfStroke = strokeWidthPx / 2 + val topLeft = Offset(halfStroke, halfStroke) + val borderSize = Size(size.width - strokeWidthPx, size.height - strokeWidthPx) + + val fillArea = strokeWidthPx * 2 > size.minDimension + val rectTopLeft = if (fillArea) Offset.Zero else topLeft + val size = if (fillArea) size else borderSize + val style = if (fillArea) Fill else Stroke(strokeWidthPx) + + drawRect( + brush = SolidColor(color), + topLeft = rectTopLeft, + size = size, + style = style + ) + } + } + } diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt index ee332f0..0adda7d 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt @@ -1,22 +1,25 @@ package io.github.boguszpawlowski.composecalendar.month +import androidx.compose.animation.rememberSplineBasedDecay import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.rememberLazyListState 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 import androidx.compose.ui.platform.testTag -import com.google.accompanist.pager.ExperimentalPagerApi -import com.google.accompanist.pager.HorizontalPager -import com.google.accompanist.pager.rememberPagerState +import dev.chrisbanes.snapper.ExperimentalSnapperApi +import dev.chrisbanes.snapper.SnapOffsets +import dev.chrisbanes.snapper.SnapperFlingBehaviorDefaults +import dev.chrisbanes.snapper.SnapperLayoutInfo +import dev.chrisbanes.snapper.rememberSnapperFlingBehavior import io.github.boguszpawlowski.composecalendar.day.DayState import io.github.boguszpawlowski.composecalendar.header.MonthState import io.github.boguszpawlowski.composecalendar.pager.PagerItemCount @@ -30,8 +33,9 @@ import java.time.YearMonth internal const val DaysOfWeek = 7 -@OptIn(ExperimentalPagerApi::class) +@OptIn(ExperimentalSnapperApi::class) @Composable +@Suppress("LongMethod") internal fun MonthPager( showAdjacentMonths: Boolean, selectionState: T, @@ -44,37 +48,49 @@ internal fun MonthPager( monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit, ) { val startIndex = PagerItemCount / 2 - val pagerState = rememberPagerState(initialPage = startIndex) val coroutineScope = rememberCoroutineScope() - val monthPagerState = remember { - MonthPagerState( + val listState = rememberLazyListState( + initialFirstVisibleItemIndex = startIndex, + ) + val flingBehavior = rememberSnapperFlingBehavior( + lazyListState = listState, + snapOffsetForItem = SnapOffsets.Start, + springAnimationSpec = SnapperFlingBehaviorDefaults.SpringAnimationSpec, + decayAnimationSpec = rememberSplineBasedDecay(), + snapIndex = coerceSnapIndex, + ) + + val monthListState = remember { + MonthListState( coroutineScope = coroutineScope, monthState = monthState, - pagerState = pagerState, + listState = listState, ) } - HorizontalPager( - count = PagerItemCount, + LazyRow( modifier = modifier.testTag("MonthPager"), - state = pagerState, + state = listState, + flingBehavior = flingBehavior, verticalAlignment = Alignment.Top, - ) { index -> - MonthContent( - showAdjacentMonths = showAdjacentMonths, - selectionState = selectionState, - currentMonth = monthPagerState.getMonthForPage(index.toIndex()), - today = today, - daysOfWeek = daysOfWeek, - dayContent = dayContent, - weekHeader = weekHeader, - monthContainer = monthContainer - ) + ) { + items(PagerItemCount) { index -> + MonthContent( + modifier = Modifier.fillParentMaxWidth(), + showAdjacentMonths = showAdjacentMonths, + selectionState = selectionState, + currentMonth = monthListState.getMonthForPage(index.toIndex()), + today = today, + daysOfWeek = daysOfWeek, + dayContent = dayContent, + weekHeader = weekHeader, + monthContainer = monthContainer + ) + } } } -@OptIn(ExperimentalPagerApi::class) @Composable internal fun MonthContent( showAdjacentMonths: Boolean, @@ -90,15 +106,13 @@ internal fun MonthContent( Column { Box( modifier = modifier - .fillMaxWidth() .wrapContentHeight(), content = { weekHeader(daysOfWeek) }, ) monthContainer { paddingValues -> Column( - modifier = Modifier - .wrapContentWidth() + modifier = modifier .padding(paddingValues) ) { currentMonth.getWeeks( @@ -116,3 +130,10 @@ internal fun MonthContent( } } } + +@OptIn(ExperimentalSnapperApi::class) +private val coerceSnapIndex: (SnapperLayoutInfo, startIndex: Int, targetIndex: Int) -> Int = + { _, startIndex, targetIndex -> + targetIndex + .coerceIn(startIndex - 1, startIndex + 1) + } diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthPagerState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt similarity index 81% rename from library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthPagerState.kt rename to library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt index ccf78e7..5cf3662 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthPagerState.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt @@ -2,16 +2,15 @@ package io.github.boguszpawlowski.composecalendar.month import android.annotation.SuppressLint import androidx.annotation.IntRange +import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Stable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow -import com.google.accompanist.pager.ExperimentalPagerApi -import com.google.accompanist.pager.PagerState import io.github.boguszpawlowski.composecalendar.header.MonthState -import io.github.boguszpawlowski.composecalendar.pager.currentIndex +import io.github.boguszpawlowski.composecalendar.pager.toIndex import io.github.boguszpawlowski.composecalendar.util.dec import io.github.boguszpawlowski.composecalendar.util.inc import kotlinx.coroutines.CoroutineScope @@ -23,18 +22,17 @@ import java.time.YearMonth internal const val PageCount = 3 -@OptIn(ExperimentalPagerApi::class) @Stable -internal class MonthPagerState( +internal class MonthListState( coroutineScope: CoroutineScope, private val monthState: MonthState, - private val pagerState: PagerState, + private val listState: LazyListState, ) { private var monthProvider by mutableStateOf( MonthProvider( initialMonth = monthState.currentMonth, - currentIndex = pagerState.currentIndex, + currentIndex = listState.currentIndex, ) ) @@ -43,7 +41,7 @@ internal class MonthPagerState( moveToMonth(month) }.launchIn(coroutineScope) - snapshotFlow { pagerState.currentIndex }.runningFold(1 to 1) { oldIndices, newIndex -> + snapshotFlow { listState.currentIndex }.runningFold(1 to 1) { oldIndices, newIndex -> oldIndices.second to newIndex }.distinctUntilChanged().onEach { (oldIndex, newIndex) -> onScrolled(oldIndex, newIndex) @@ -55,8 +53,8 @@ internal class MonthPagerState( @SuppressLint("Range") private fun moveToMonth(month: YearMonth) { - if (month - getMonthForPage(pagerState.currentIndex) == 0) return - monthProvider = MonthProvider(monthState.currentMonth, pagerState.currentIndex) + if (month - getMonthForPage(listState.currentIndex) == 0) return + monthProvider = MonthProvider(monthState.currentMonth, listState.currentIndex) } private fun onScrolled(oldIndex: Int, newIndex: Int) { @@ -72,10 +70,10 @@ internal class MonthPagerState( if (this === other) return true if (javaClass != other?.javaClass) return false - other as MonthPagerState + other as MonthListState if (monthState != other.monthState) return false - if (pagerState != other.pagerState) return false + if (listState != other.listState) return false if (monthProvider != other.monthProvider) return false return true @@ -83,7 +81,7 @@ internal class MonthPagerState( override fun hashCode(): Int { var result = monthState.hashCode() - result = 31 * result + pagerState.hashCode() + result = 31 * result + listState.hashCode() result = 31 * result + monthProvider.hashCode() return result } @@ -117,3 +115,5 @@ internal class MonthProvider(initialMonth: YearMonth, currentIndex: Int) { private operator fun YearMonth.minus(other: YearMonth) = year - other.year + month.value - other.month.value + +private val LazyListState.currentIndex get() = firstVisibleItemIndex.toIndex() diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt index c59d97a..4921c63 100644 --- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt @@ -23,10 +23,16 @@ import androidx.navigation.NavController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import io.github.boguszpawlowski.composecalendar.BuildConfig +import timber.log.Timber +import timber.log.Timber.DebugTree class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + if (BuildConfig.DEBUG) { + Timber.plant(DebugTree()) + } setContent { MainScreen() } From f070b62c174f002ea1e598e163c93dda1110330a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sun, 13 Nov 2022 18:00:58 +0100 Subject: [PATCH 17/31] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb67b6e..f45e65f 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.s | 1.0.0 | 0.3.0 | | 1.1.0 | 0.5.1 | | 1.2.0 | 0.6.0 | -| 1.2.1 | 1.0.1 | +| 1.2.1 | 1.0.2 | ## Supported features - Selection (single, multiple or a range of days) From 9435077d9f399fa2a17a7bdadaba4f198c0c179c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Tue, 15 Nov 2022 19:29:23 +0100 Subject: [PATCH 18/31] Simplify calculating showed month, add animations when changing month (#86) --- .../composecalendar/Calendar.kt | 3 +- .../composecalendar/month/MonthContent.kt | 11 ++- .../composecalendar/month/MonthListState.kt | 86 +++++-------------- .../composecalendar/pager/PagerHelper.kt | 20 ----- .../composecalendar/pager/PagerHelperTest.kt | 34 -------- 5 files changed, 27 insertions(+), 127 deletions(-) delete mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelper.kt delete mode 100644 library/src/test/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelperTest.kt diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt index 07227cb..e1d336b 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt @@ -178,7 +178,7 @@ public fun Calendar( Box { content(PaddingValues()) } }, ) { - + val initialMonth = remember { calendarState.monthState.currentMonth } val daysOfWeek = remember(firstDayOfWeek) { DayOfWeek.values().rotateRight(DaysOfWeek - firstDayOfWeek.ordinal) } @@ -189,6 +189,7 @@ public fun Calendar( monthHeader(calendarState.monthState) if (horizontalSwipeEnabled) { MonthPager( + initialMonth = initialMonth, showAdjacentMonths = showAdjacentMonths, monthState = calendarState.monthState, selectionState = calendarState.selectionState, diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt index 0adda7d..0e360c4 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt @@ -22,8 +22,6 @@ import dev.chrisbanes.snapper.SnapperLayoutInfo import dev.chrisbanes.snapper.rememberSnapperFlingBehavior import io.github.boguszpawlowski.composecalendar.day.DayState import io.github.boguszpawlowski.composecalendar.header.MonthState -import io.github.boguszpawlowski.composecalendar.pager.PagerItemCount -import io.github.boguszpawlowski.composecalendar.pager.toIndex import io.github.boguszpawlowski.composecalendar.selection.SelectionState import io.github.boguszpawlowski.composecalendar.week.WeekContent import io.github.boguszpawlowski.composecalendar.week.getWeeks @@ -35,8 +33,9 @@ internal const val DaysOfWeek = 7 @OptIn(ExperimentalSnapperApi::class) @Composable -@Suppress("LongMethod") +@Suppress("LongMethod", "LongParameterList") internal fun MonthPager( + initialMonth: YearMonth, showAdjacentMonths: Boolean, selectionState: T, monthState: MonthState, @@ -47,11 +46,10 @@ internal fun MonthPager( weekHeader: @Composable BoxScope.(List) -> Unit, monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit, ) { - val startIndex = PagerItemCount / 2 val coroutineScope = rememberCoroutineScope() val listState = rememberLazyListState( - initialFirstVisibleItemIndex = startIndex, + initialFirstVisibleItemIndex = StartIndex, ) val flingBehavior = rememberSnapperFlingBehavior( lazyListState = listState, @@ -64,6 +62,7 @@ internal fun MonthPager( val monthListState = remember { MonthListState( coroutineScope = coroutineScope, + initialMonth = initialMonth, monthState = monthState, listState = listState, ) @@ -80,7 +79,7 @@ internal fun MonthPager( modifier = Modifier.fillParentMaxWidth(), showAdjacentMonths = showAdjacentMonths, selectionState = selectionState, - currentMonth = monthListState.getMonthForPage(index.toIndex()), + currentMonth = monthListState.getMonthForPage(index), today = today, daysOfWeek = daysOfWeek, dayContent = dayContent, diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt index 5cf3662..a3809f4 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt @@ -1,68 +1,49 @@ package io.github.boguszpawlowski.composecalendar.month -import android.annotation.SuppressLint -import androidx.annotation.IntRange import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Stable +import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateMapOf -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshotFlow import io.github.boguszpawlowski.composecalendar.header.MonthState -import io.github.boguszpawlowski.composecalendar.pager.toIndex -import io.github.boguszpawlowski.composecalendar.util.dec -import io.github.boguszpawlowski.composecalendar.util.inc import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.flow.runningFold +import kotlinx.coroutines.launch import java.time.YearMonth - -internal const val PageCount = 3 +import java.time.temporal.ChronoUnit @Stable internal class MonthListState( - coroutineScope: CoroutineScope, + private val coroutineScope: CoroutineScope, + private val initialMonth: YearMonth, private val monthState: MonthState, private val listState: LazyListState, ) { - private var monthProvider by mutableStateOf( - MonthProvider( - initialMonth = monthState.currentMonth, - currentIndex = listState.currentIndex, - ) - ) + private val currentlyVisibleMonth by derivedStateOf { + getMonthForPage(listState.firstVisibleItemIndex) + } init { snapshotFlow { monthState.currentMonth }.onEach { month -> moveToMonth(month) }.launchIn(coroutineScope) - snapshotFlow { listState.currentIndex }.runningFold(1 to 1) { oldIndices, newIndex -> - oldIndices.second to newIndex - }.distinctUntilChanged().onEach { (oldIndex, newIndex) -> - onScrolled(oldIndex, newIndex) - monthState.currentMonth = getMonthForPage(newIndex) + snapshotFlow { currentlyVisibleMonth }.onEach { newMonth -> + monthState.currentMonth = newMonth }.launchIn(coroutineScope) } - fun getMonthForPage(@IntRange(from = 0, to = 2) index: Int) = monthProvider.cache[index]!! + fun getMonthForPage(index: Int): YearMonth = + initialMonth.plusMonths((index - StartIndex).toLong()) - @SuppressLint("Range") private fun moveToMonth(month: YearMonth) { - if (month - getMonthForPage(listState.currentIndex) == 0) return - monthProvider = MonthProvider(monthState.currentMonth, listState.currentIndex) - } - - private fun onScrolled(oldIndex: Int, newIndex: Int) { - when (oldIndex - newIndex) { - -1, PageCount - 1 -> monthProvider.cache[(newIndex + 1) % PageCount] = - monthProvider.cache[newIndex]!!.inc() - else -> monthProvider.cache[(newIndex - 1 + PageCount) % PageCount] = - monthProvider.cache[newIndex]!!.dec() + if (month == currentlyVisibleMonth) return + initialMonth.minus(month).let { offset -> + coroutineScope.launch { + listState.animateScrollToItem((StartIndex - offset).toInt()) + } } } @@ -74,7 +55,6 @@ internal class MonthListState( if (monthState != other.monthState) return false if (listState != other.listState) return false - if (monthProvider != other.monthProvider) return false return true } @@ -82,38 +62,12 @@ internal class MonthListState( override fun hashCode(): Int { var result = monthState.hashCode() result = 31 * result + listState.hashCode() - result = 31 * result + monthProvider.hashCode() return result } } -@Stable -internal class MonthProvider(initialMonth: YearMonth, currentIndex: Int) { - val cache = mutableStateMapOf() - - init { - cache[(currentIndex - 1 + PageCount) % PageCount] = initialMonth.dec() - cache[currentIndex] = initialMonth - cache[(currentIndex + 1) % PageCount] = initialMonth.inc() - } - - override fun equals(other: Any?): Boolean { - if (this === other) return true - if (javaClass != other?.javaClass) return false - - other as MonthProvider - - if (cache != other.cache) return false - - return true - } - - override fun hashCode(): Int { - return cache.hashCode() - } -} - private operator fun YearMonth.minus(other: YearMonth) = - year - other.year + month.value - other.month.value + ChronoUnit.MONTHS.between(other, this) -private val LazyListState.currentIndex get() = firstVisibleItemIndex.toIndex() +internal const val PagerItemCount = 20_000 +internal const val StartIndex = PagerItemCount / 2 diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelper.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelper.kt deleted file mode 100644 index a5bde45..0000000 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelper.kt +++ /dev/null @@ -1,20 +0,0 @@ -package io.github.boguszpawlowski.composecalendar.pager - -import com.google.accompanist.pager.ExperimentalPagerApi -import com.google.accompanist.pager.PagerState -import io.github.boguszpawlowski.composecalendar.month.PageCount - -internal const val PagerItemCount = 20_000 -internal const val StartIndex = PagerItemCount / 2 - -internal fun Int.toIndex(startIndex: Int = StartIndex, pageCount: Int = PageCount) = - ((this - startIndex).floorMod(pageCount) + 1).mod(pageCount) - -private fun Int.floorMod(other: Int): Int = when (other) { - 0 -> this - else -> this - floorDiv(other) * other -} - -@OptIn(ExperimentalPagerApi::class) -internal val PagerState.currentIndex - get() = currentPage.toIndex() diff --git a/library/src/test/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelperTest.kt b/library/src/test/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelperTest.kt deleted file mode 100644 index e2123be..0000000 --- a/library/src/test/java/io/github/boguszpawlowski/composecalendar/pager/PagerHelperTest.kt +++ /dev/null @@ -1,34 +0,0 @@ -package io.github.boguszpawlowski.composecalendar.pager - -import io.kotest.core.spec.style.ShouldSpec -import io.kotest.inspectors.forAll -import io.kotest.matchers.ints.shouldBeExactly - -internal class PagerHelperTest : ShouldSpec({ - - context("Recalculation of page index") { - val startIndex = StartIndex - val pageCount = 3 - - should("return correct numbers for indices") { - listOf( - startIndex to 1, - startIndex + 1 to 2, - startIndex + 2 to 0, - startIndex + 3 to 1, - startIndex + 4 to 2, - startIndex + 5 to 0, - startIndex - 1 to 0, - startIndex - 2 to 2, - startIndex - 3 to 1, - startIndex - 4 to 0, - startIndex - 5 to 2, - ).forAll { (index, expectedActualPage) -> - index.toIndex( - startIndex = startIndex, - pageCount = pageCount, - ) shouldBeExactly expectedActualPage - } - } - } -}) From 4109165af32a1465892e356aeb313e821dc95d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Fri, 3 Mar 2023 19:35:46 +0100 Subject: [PATCH 19/31] Add Week calendar (#91) --- README.md | 22 +- buildSrc/build.gradle.kts | 4 +- .../src/main/kotlin/CommonAndroidPlugin.kt | 6 +- buildSrc/src/main/kotlin/Dependencies.kt | 18 +- detekt-config.yml | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 12 +- gradlew.bat | 1 + kotlinx-datetime/build.gradle.kts | 2 - library/api/library.api | 94 +++++++ library/build.gradle.kts | 2 - .../composecalendar/Calendar.kt | 28 +-- .../composecalendar/WeekCalendar.kt | 235 ++++++++++++++++++ .../header/DefaultWeekHeader.kt | 73 ++++++ .../composecalendar/header/WeekState.kt | 39 +++ .../composecalendar/month/MonthContent.kt | 12 +- .../composecalendar/week/DefaultWeekHeader.kt | 27 ++ .../composecalendar/week/Week.kt | 50 +++- .../composecalendar/week/WeekDays.kt | 10 + .../composecalendar/week/WeekListState.kt | 70 ++++++ .../composecalendar/week/WeekPager.kt | 125 ++++++++++ .../week/{WeekContent.kt => WeekRow.kt} | 8 +- .../composecalendar/week/WeekUtil.kt | 6 +- .../composecalendar/week/WeekTest.kt | 68 +++++ sample/build.gradle.kts | 2 - .../sample/CustomComponentsSample.kt | 2 +- .../composecalendar/sample/MainActivity.kt | 6 + .../sample/WeekCalendarSample.kt | 57 +++++ 29 files changed, 919 insertions(+), 65 deletions(-) create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekDays.kt create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt rename library/src/main/java/io/github/boguszpawlowski/composecalendar/week/{WeekContent.kt => WeekRow.kt} (81%) create mode 100644 library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekTest.kt create mode 100644 sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/WeekCalendarSample.kt diff --git a/README.md b/README.md index f45e65f..fb4181a 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.s - Customizable month container - Fully customizable day content - Horizontal swipe for changing a current month +- Month / Week mode ## Basic Usage @@ -50,7 +51,15 @@ To show the basic version of the calendar, without any kind of selection mechani ``` This chunk will render the calendar with default components for each day, and also month and week headers. -See the `StaticCalendarSample` file for a full example. +See the `StaticCalendarSample` file for a full example. For showing a week calendar, you can similarly use `StaticWeekCalendar`: +```kotlin + + @Composable + fun MainScreen() { + StaticWeekCalendar() + } + +``` @@ -67,7 +76,16 @@ Calendar with a mechanism for selection. The default implementation uses `Dynami ``` By the default, after changing the selection mode, selection is cleared. -See the `SelectableCalendarSample` file for a full example +See the `SelectableCalendarSample` file for a full example. For showing a week calendar, you can similarly use `SelectableWeekCalendar`: +```kotlin + + @Composable + fun MainScreen() { + SelectableWeekCalendar() + } + +``` +See the `WeekCalendarSample` file for a full example. https://user-images.githubusercontent.com/36514058/126049987-685a7b81-1596-48a4-95a1-c342f6c796bf.mp4 diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 41562db..ee2472e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,6 +17,6 @@ gradlePlugin { } dependencies { - implementation("com.android.tools.build:gradle:7.2.1") - implementation(kotlin("gradle-plugin", "1.7.20")) + implementation("com.android.tools.build:gradle:7.4.2") + implementation(kotlin("gradle-plugin", "1.8.10")) } diff --git a/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt b/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt index 19b20e5..822f99f 100644 --- a/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt +++ b/buildSrc/src/main/kotlin/CommonAndroidPlugin.kt @@ -1,5 +1,5 @@ import com.android.build.gradle.BaseExtension -import org.gradle.api.JavaVersion.VERSION_1_8 +import org.gradle.api.JavaVersion.VERSION_11 import org.gradle.api.Plugin import org.gradle.api.Project @@ -18,8 +18,8 @@ class CommonAndroidPlugin : Plugin { } compileOptions { - sourceCompatibility = VERSION_1_8 - targetCompatibility = VERSION_1_8 + sourceCompatibility = VERSION_11 + targetCompatibility = VERSION_11 isCoreLibraryDesugaringEnabled = true } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 322b985..10116c2 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -6,16 +6,16 @@ object MavenPublish { object AndroidSdk { const val Min = 21 - const val Compile = 32 + const val Compile = 33 const val Target = Compile } object Kotlin { - const val Version = "1.7.20" + const val Version = "1.8.10" const val CompatibilityPluginVersion = "0.11.0" const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$Version" - const val DokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$Version" + const val DokkaGradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20" const val SafeArgsPlugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.2.0" @@ -28,13 +28,11 @@ object Kotlin { const val CompatibilityPluginId = "binary-compatibility-validator" const val DesugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5" - const val StdLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$Version" - const val Reflect = "org.jetbrains.kotlin:kotlin-reflect:$Version" const val DateTime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0" } object Android { - const val GradlePlugin = "com.android.tools.build:gradle:7.2.1" + const val GradlePlugin = "com.android.tools.build:gradle:7.4.2" const val ApplicationPluginId = "com.android.application" const val LibraryPluginId = "com.android.library" @@ -77,8 +75,8 @@ object AndroidX { const val Version = "1.0.0" const val LifecycleVersion = "2.2.0" - const val AppCompat = "androidx.appcompat:appcompat:1.4.1" - const val ComposeActivity = "androidx.activity:activity-compose:1.5.1" + const val AppCompat = "androidx.appcompat:appcompat:1.6.1" + const val ComposeActivity = "androidx.activity:activity-compose:1.6.1" } object Material { @@ -101,8 +99,8 @@ object Timber { } object Compose { - const val Version = "1.2.1" - const val CompilerVersion = "1.3.2" + const val Version = "1.3.1" + const val CompilerVersion = "1.4.3" const val AccompanistVersion = "0.25.1" const val Runtime = "androidx.compose.runtime:runtime:$Version" diff --git a/detekt-config.yml b/detekt-config.yml index 86dbad2..92c2fcc 100644 --- a/detekt-config.yml +++ b/detekt-config.yml @@ -23,6 +23,7 @@ complexity: active: true functionThreshold: 10 constructorThreshold: 5 + ignoreAnnotated: [ 'Composable' ] NestedBlockDepth: active: true StringLiteralDuplication: @@ -140,6 +141,7 @@ naming: FunctionNaming: active: false functionPattern: '^[a-z]+(?:[A-Z][a-z]+)*$' + ignoreAnnotated: [ 'Composable' ] FunctionParameterNaming: active: true parameterPattern: '^[a-z]+(?:[A-Z][a-z]+)*$' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 36524 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%0DGK?7GHTj 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 VwlMN}`%er%aGR6olj~j${vQ;P=LY}) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..f398c33 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/kotlinx-datetime/build.gradle.kts b/kotlinx-datetime/build.gradle.kts index 0662bba..ebe8cd3 100644 --- a/kotlinx-datetime/build.gradle.kts +++ b/kotlinx-datetime/build.gradle.kts @@ -11,11 +11,9 @@ kotlin { dependencies { api(Kotlin.DateTime) - implementation(Kotlin.StdLib) testImplementation(Kotest.Assertions) testImplementation(Kotest.RunnerJunit5) - testImplementation(Kotlin.Reflect) } plugins.withId("com.vanniktech.maven.publish") { diff --git a/library/api/library.api b/library/api/library.api index 2d55f3a..6a9ca08 100644 --- a/library/api/library.api +++ b/library/api/library.api @@ -14,6 +14,7 @@ public final class io/github/boguszpawlowski/composecalendar/CalendarKt { } public final class io/github/boguszpawlowski/composecalendar/CalendarState { + public static final field $stable I public fun (Lio/github/boguszpawlowski/composecalendar/header/MonthState;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;)V public final fun getMonthState ()Lio/github/boguszpawlowski/composecalendar/header/MonthState; public final fun getSelectionState ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionState; @@ -48,6 +49,44 @@ public final class io/github/boguszpawlowski/composecalendar/ComposableSingleton public final fun getLambda-9$library_release ()Lkotlin/jvm/functions/Function4; } +public final class io/github/boguszpawlowski/composecalendar/ComposableSingletons$WeekCalendarKt { + public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/ComposableSingletons$WeekCalendarKt; + public static field lambda-1 Lkotlin/jvm/functions/Function4; + public static field lambda-2 Lkotlin/jvm/functions/Function4; + public static field lambda-3 Lkotlin/jvm/functions/Function4; + public static field lambda-4 Lkotlin/jvm/functions/Function4; + public static field lambda-5 Lkotlin/jvm/functions/Function4; + public static field lambda-6 Lkotlin/jvm/functions/Function4; + public static field lambda-7 Lkotlin/jvm/functions/Function4; + public static field lambda-8 Lkotlin/jvm/functions/Function4; + public static field lambda-9 Lkotlin/jvm/functions/Function4; + public fun ()V + public final fun getLambda-1$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-2$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-3$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-4$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-5$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-6$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-7$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-8$library_release ()Lkotlin/jvm/functions/Function4; + public final fun getLambda-9$library_release ()Lkotlin/jvm/functions/Function4; +} + +public final class io/github/boguszpawlowski/composecalendar/WeekCalendarKt { + public static final fun SelectableWeekCalendar (Landroidx/compose/ui/Modifier;Ljava/time/DayOfWeek;Ljava/time/LocalDate;ZLio/github/boguszpawlowski/composecalendar/WeekCalendarState;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V + public static final fun StaticWeekCalendar (Landroidx/compose/ui/Modifier;Ljava/time/DayOfWeek;Ljava/time/LocalDate;ZLio/github/boguszpawlowski/composecalendar/WeekCalendarState;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V + public static final fun WeekCalendar (Lio/github/boguszpawlowski/composecalendar/WeekCalendarState;Landroidx/compose/ui/Modifier;Ljava/time/LocalDate;Ljava/time/DayOfWeek;ZLkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V + public static final fun rememberSelectableWeekCalendarState (Ljava/time/DayOfWeek;Lio/github/boguszpawlowski/composecalendar/week/Week;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;Lkotlin/jvm/functions/Function1;Lio/github/boguszpawlowski/composecalendar/header/WeekState;Lio/github/boguszpawlowski/composecalendar/selection/DynamicSelectionState;Landroidx/compose/runtime/Composer;II)Lio/github/boguszpawlowski/composecalendar/WeekCalendarState; + public static final fun rememberWeekCalendarState (Ljava/time/DayOfWeek;Lio/github/boguszpawlowski/composecalendar/week/Week;Lio/github/boguszpawlowski/composecalendar/header/WeekState;Landroidx/compose/runtime/Composer;II)Lio/github/boguszpawlowski/composecalendar/WeekCalendarState; +} + +public final class io/github/boguszpawlowski/composecalendar/WeekCalendarState { + public static final field $stable I + public fun (Lio/github/boguszpawlowski/composecalendar/header/WeekState;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;)V + public final fun getSelectionState ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionState; + public final fun getWeekState ()Lio/github/boguszpawlowski/composecalendar/header/WeekState; +} + public abstract interface class io/github/boguszpawlowski/composecalendar/day/Day { public abstract fun getDate ()Ljava/time/LocalDate; public abstract fun isCurrentDay ()Z @@ -55,6 +94,7 @@ public abstract interface class io/github/boguszpawlowski/composecalendar/day/Da } public final class io/github/boguszpawlowski/composecalendar/day/DayState : io/github/boguszpawlowski/composecalendar/day/Day { + public static final field $stable I public fun (Lio/github/boguszpawlowski/composecalendar/day/Day;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;)V public final fun component2 ()Lio/github/boguszpawlowski/composecalendar/selection/SelectionState; public final fun copy (Lio/github/boguszpawlowski/composecalendar/day/Day;Lio/github/boguszpawlowski/composecalendar/selection/SelectionState;)Lio/github/boguszpawlowski/composecalendar/day/DayState; @@ -81,10 +121,23 @@ public final class io/github/boguszpawlowski/composecalendar/header/ComposableSi public final fun getLambda-2$library_release ()Lkotlin/jvm/functions/Function2; } +public final class io/github/boguszpawlowski/composecalendar/header/ComposableSingletons$DefaultWeekHeaderKt { + public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/header/ComposableSingletons$DefaultWeekHeaderKt; + public static field lambda-1 Lkotlin/jvm/functions/Function2; + public static field lambda-2 Lkotlin/jvm/functions/Function2; + public fun ()V + public final fun getLambda-1$library_release ()Lkotlin/jvm/functions/Function2; + public final fun getLambda-2$library_release ()Lkotlin/jvm/functions/Function2; +} + public final class io/github/boguszpawlowski/composecalendar/header/DefaultMonthHeaderKt { public static final fun DefaultMonthHeader (Lio/github/boguszpawlowski/composecalendar/header/MonthState;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } +public final class io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeaderKt { + public static final fun DefaultWeekHeader (Lio/github/boguszpawlowski/composecalendar/header/WeekState;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V +} + public abstract interface class io/github/boguszpawlowski/composecalendar/header/MonthState { public static final field Companion Lio/github/boguszpawlowski/composecalendar/header/MonthState$Companion; public abstract fun getCurrentMonth ()Ljava/time/YearMonth; @@ -99,6 +152,20 @@ public final class io/github/boguszpawlowski/composecalendar/header/MonthStateKt public static final fun MonthState (Ljava/time/YearMonth;)Lio/github/boguszpawlowski/composecalendar/header/MonthState; } +public abstract interface class io/github/boguszpawlowski/composecalendar/header/WeekState { + public static final field Companion Lio/github/boguszpawlowski/composecalendar/header/WeekState$Companion; + public abstract fun getCurrentWeek ()Lio/github/boguszpawlowski/composecalendar/week/Week; + public abstract fun setCurrentWeek (Lio/github/boguszpawlowski/composecalendar/week/Week;)V +} + +public final class io/github/boguszpawlowski/composecalendar/header/WeekState$Companion { + public final fun Saver ()Landroidx/compose/runtime/saveable/Saver; +} + +public final class io/github/boguszpawlowski/composecalendar/header/WeekStateKt { + public static final fun WeekState (Lio/github/boguszpawlowski/composecalendar/week/Week;)Lio/github/boguszpawlowski/composecalendar/header/WeekState; +} + public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionHandler { public static final field $stable I public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/selection/DynamicSelectionHandler; @@ -106,6 +173,7 @@ public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSe } public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSelectionState : io/github/boguszpawlowski/composecalendar/selection/SelectionState { + public static final field $stable I public fun (Lkotlin/jvm/functions/Function1;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;)V public synthetic fun (Lkotlin/jvm/functions/Function1;Ljava/util/List;Lio/github/boguszpawlowski/composecalendar/selection/SelectionMode;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getSelection ()Ljava/util/List; @@ -117,6 +185,7 @@ public final class io/github/boguszpawlowski/composecalendar/selection/DynamicSe } public final class io/github/boguszpawlowski/composecalendar/selection/EmptySelectionState : io/github/boguszpawlowski/composecalendar/selection/SelectionState { + public static final field $stable I public static final field INSTANCE Lio/github/boguszpawlowski/composecalendar/selection/EmptySelectionState; public fun isDateSelected (Ljava/time/LocalDate;)Z public fun onDateSelected (Ljava/time/LocalDate;)V @@ -142,6 +211,31 @@ public final class io/github/boguszpawlowski/composecalendar/selection/Selection } public final class io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeaderKt { + public static final fun DefaultDaysOfWeekHeader (Ljava/util/List;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V public static final fun DefaultWeekHeader (Ljava/util/List;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V } +public final class io/github/boguszpawlowski/composecalendar/week/Week { + public static final field $stable I + public static final field Companion Lio/github/boguszpawlowski/composecalendar/week/Week$Companion; + public fun (Ljava/util/List;)V + public final fun component1 ()Ljava/util/List; + public final fun copy (Ljava/util/List;)Lio/github/boguszpawlowski/composecalendar/week/Week; + public static synthetic fun copy$default (Lio/github/boguszpawlowski/composecalendar/week/Week;Ljava/util/List;ILjava/lang/Object;)Lio/github/boguszpawlowski/composecalendar/week/Week; + public final fun dec ()Lio/github/boguszpawlowski/composecalendar/week/Week; + public fun equals (Ljava/lang/Object;)Z + public final fun getDays ()Ljava/util/List; + public final fun getEnd ()Ljava/time/LocalDate; + public final fun getStart ()Ljava/time/LocalDate; + public final fun getYearMonth ()Ljava/time/YearMonth; + public fun hashCode ()I + public final fun inc ()Lio/github/boguszpawlowski/composecalendar/week/Week; + public final fun plusWeeks (J)Lio/github/boguszpawlowski/composecalendar/week/Week; + public fun toString ()Ljava/lang/String; +} + +public final class io/github/boguszpawlowski/composecalendar/week/Week$Companion { + public final fun now (Ljava/time/DayOfWeek;)Lio/github/boguszpawlowski/composecalendar/week/Week; + public static synthetic fun now$default (Lio/github/boguszpawlowski/composecalendar/week/Week$Companion;Ljava/time/DayOfWeek;ILjava/lang/Object;)Lio/github/boguszpawlowski/composecalendar/week/Week; +} + diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 4dca94d..aff0c2f 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -17,7 +17,6 @@ android { } dependencies { - implementation(Kotlin.StdLib) implementation(Compose.Ui) implementation(Compose.UiTooling) implementation(Compose.AccompanistPager) @@ -28,7 +27,6 @@ dependencies { testImplementation(Kotest.Assertions) testImplementation(Kotest.RunnerJunit5) - testImplementation(Kotlin.Reflect) } plugins.withId("com.vanniktech.maven.publish") { diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt index e1d336b..04367b3 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/Calendar.kt @@ -1,4 +1,4 @@ -@file:Suppress("MatchingDeclarationName", "LongParameterList") +@file:Suppress("MatchingDeclarationName") package io.github.boguszpawlowski.composecalendar @@ -17,14 +17,14 @@ import io.github.boguszpawlowski.composecalendar.day.DayState import io.github.boguszpawlowski.composecalendar.day.DefaultDay import io.github.boguszpawlowski.composecalendar.header.DefaultMonthHeader import io.github.boguszpawlowski.composecalendar.header.MonthState -import io.github.boguszpawlowski.composecalendar.month.DaysOfWeek import io.github.boguszpawlowski.composecalendar.month.MonthContent import io.github.boguszpawlowski.composecalendar.month.MonthPager import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState import io.github.boguszpawlowski.composecalendar.selection.EmptySelectionState import io.github.boguszpawlowski.composecalendar.selection.SelectionMode import io.github.boguszpawlowski.composecalendar.selection.SelectionState -import io.github.boguszpawlowski.composecalendar.week.DefaultWeekHeader +import io.github.boguszpawlowski.composecalendar.week.DaysInAWeek +import io.github.boguszpawlowski.composecalendar.week.DefaultDaysOfWeekHeader import io.github.boguszpawlowski.composecalendar.week.rotateRight import java.time.DayOfWeek import java.time.LocalDate @@ -63,7 +63,7 @@ public class CalendarState( * @param calendarState state of the composable * @param dayContent composable rendering the current day * @param monthHeader header for showing the current month and controls for changing it - * @param weekHeader header for showing captions for each day of week + * @param daysOfWeekHeader header for showing captions for each day of week * @param monthContainer container composable for all the days in current month */ @Composable @@ -76,7 +76,7 @@ public fun SelectableCalendar( calendarState: CalendarState = rememberSelectableCalendarState(), dayContent: @Composable BoxScope.(DayState) -> Unit = { DefaultDay(it) }, monthHeader: @Composable ColumnScope.(MonthState) -> Unit = { DefaultMonthHeader(it) }, - weekHeader: @Composable BoxScope.(List) -> Unit = { DefaultWeekHeader(it) }, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit = { DefaultDaysOfWeekHeader(it) }, monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit = { content -> Box { content(PaddingValues()) } }, @@ -90,7 +90,7 @@ public fun SelectableCalendar( calendarState = calendarState, dayContent = dayContent, monthHeader = monthHeader, - weekHeader = weekHeader, + daysOfWeekHeader = daysOfWeekHeader, monthContainer = monthContainer ) } @@ -114,7 +114,7 @@ public fun SelectableCalendar( * @param calendarState state of the composable * @param dayContent composable rendering the current day * @param monthHeader header for showing the current month and controls for changing it - * @param weekHeader header for showing captions for each day of week + * @param daysOfWeekHeader header for showing captions for each day of week * @param monthContainer container composable for all the days in current month */ @Composable @@ -127,7 +127,7 @@ public fun StaticCalendar( calendarState: CalendarState = rememberCalendarState(), dayContent: @Composable BoxScope.(DayState) -> Unit = { DefaultDay(it) }, monthHeader: @Composable ColumnScope.(MonthState) -> Unit = { DefaultMonthHeader(it) }, - weekHeader: @Composable BoxScope.(List) -> Unit = { DefaultWeekHeader(it) }, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit = { DefaultDaysOfWeekHeader(it) }, monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit = { content -> Box { content(PaddingValues()) } }, @@ -141,7 +141,7 @@ public fun StaticCalendar( calendarState = calendarState, dayContent = dayContent, monthHeader = monthHeader, - weekHeader = weekHeader, + daysOfWeekHeader = daysOfWeekHeader, monthContainer = monthContainer ) } @@ -160,7 +160,7 @@ public fun StaticCalendar( * @param calendarState state of the composable * @param dayContent composable rendering the current day * @param monthHeader header for showing the current month and controls for changing it - * @param weekHeader header for showing captions for each day of week + * @param daysOfWeekHeader header for showing captions for each day of week * @param monthContainer container composable for all the days in current month */ @Composable @@ -173,14 +173,14 @@ public fun Calendar( horizontalSwipeEnabled: Boolean = true, dayContent: @Composable BoxScope.(DayState) -> Unit = { DefaultDay(it) }, monthHeader: @Composable ColumnScope.(MonthState) -> Unit = { DefaultMonthHeader(it) }, - weekHeader: @Composable BoxScope.(List) -> Unit = { DefaultWeekHeader(it) }, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit = { DefaultDaysOfWeekHeader(it) }, monthContainer: @Composable (content: @Composable (PaddingValues) -> Unit) -> Unit = { content -> Box { content(PaddingValues()) } }, ) { val initialMonth = remember { calendarState.monthState.currentMonth } val daysOfWeek = remember(firstDayOfWeek) { - DayOfWeek.values().rotateRight(DaysOfWeek - firstDayOfWeek.ordinal) + DayOfWeek.values().rotateRight(DaysInAWeek - firstDayOfWeek.ordinal) } Column( @@ -196,7 +196,7 @@ public fun Calendar( today = today, daysOfWeek = daysOfWeek, dayContent = dayContent, - weekHeader = weekHeader, + weekHeader = daysOfWeekHeader, monthContainer = monthContainer, ) } else { @@ -208,7 +208,7 @@ public fun Calendar( today = today, daysOfWeek = daysOfWeek, dayContent = dayContent, - weekHeader = weekHeader, + weekHeader = daysOfWeekHeader, monthContainer = monthContainer, ) } diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt new file mode 100644 index 0000000..fb0a3fe --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/WeekCalendar.kt @@ -0,0 +1,235 @@ +@file:Suppress("MatchingDeclarationName", "LongParameterList") + +package io.github.boguszpawlowski.composecalendar + +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.runtime.Composable +import androidx.compose.runtime.Stable +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Modifier +import io.github.boguszpawlowski.composecalendar.day.DayState +import io.github.boguszpawlowski.composecalendar.day.DefaultDay +import io.github.boguszpawlowski.composecalendar.header.WeekState +import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState +import io.github.boguszpawlowski.composecalendar.selection.EmptySelectionState +import io.github.boguszpawlowski.composecalendar.selection.SelectionMode +import io.github.boguszpawlowski.composecalendar.selection.SelectionState +import io.github.boguszpawlowski.composecalendar.week.DaysInAWeek +import io.github.boguszpawlowski.composecalendar.week.DefaultDaysOfWeekHeader +import io.github.boguszpawlowski.composecalendar.week.Week +import io.github.boguszpawlowski.composecalendar.week.WeekContent +import io.github.boguszpawlowski.composecalendar.week.WeekPager +import io.github.boguszpawlowski.composecalendar.week.getWeekDays +import io.github.boguszpawlowski.composecalendar.week.rotateRight +import java.time.DayOfWeek +import java.time.LocalDate +import java.time.temporal.WeekFields +import java.util.Locale +import io.github.boguszpawlowski.composecalendar.header.DefaultWeekHeader as DefaultProperWeekHeader + +/** + * State of the week calendar composable + * + * @property weekState currently showed week + * @property selectionState handler for the calendar's selection + */ +@Stable +public class WeekCalendarState( + public val weekState: WeekState, + public val selectionState: T, +) + +/** + * [WeekCalendar] implementation using a [DynamicSelectionState] as a selection handler. + * + * * Basic usage: + * ``` + * @Composable + * fun MainScreen() { + * SelectableWeekCalendar() + * } + * ``` + * + * @param modifier + * @param firstDayOfWeek first day of a week, defaults to current locale's + * @param today current day, defaults to [LocalDate.now] + * @param horizontalSwipeEnabled whenever user is able to change the week by horizontal swipe + * @param calendarState state of the composable + * @param dayContent composable rendering the current day + * @param weekHeader header for showing the current week and controls for changing it + * @param daysOfWeekHeader header for showing captions for each day of week + */ +@Composable +public fun SelectableWeekCalendar( + modifier: Modifier = Modifier, + firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek, + today: LocalDate = LocalDate.now(), + horizontalSwipeEnabled: Boolean = true, + calendarState: WeekCalendarState = rememberSelectableWeekCalendarState(), + dayContent: @Composable BoxScope.(DayState) -> Unit = { DefaultDay(it) }, + weekHeader: @Composable ColumnScope.(WeekState) -> Unit = { + DefaultProperWeekHeader(it) + }, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit = { DefaultDaysOfWeekHeader(it) }, +) { + WeekCalendar( + modifier = modifier, + calendarState = calendarState, + today = today, + horizontalSwipeEnabled = horizontalSwipeEnabled, + firstDayOfWeek = firstDayOfWeek, + dayContent = dayContent, + weekHeader = weekHeader, + daysOfWeekHeader = daysOfWeekHeader, + ) +} + +/** + * [WeekCalendar] implementation without any mechanism for the selection. + * + * * Basic usage: + * ``` + * @Composable + * fun MainScreen() { + * StaticWeekCalendar() + * } + * ``` + * + * @param modifier + * @param firstDayOfWeek first day of a week, defaults to current locale's + * @param today current day, defaults to [LocalDate.now] + * @param horizontalSwipeEnabled whenever user is able to change the week by horizontal swipe + * @param calendarState state of the composable + * @param dayContent composable rendering the current day + * @param weekHeader header for showing the current week and controls for changing it + * @param daysOfWeekHeader header for showing captions for each day of week + */ +@Composable +public fun StaticWeekCalendar( + modifier: Modifier = Modifier, + firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek, + today: LocalDate = LocalDate.now(), + horizontalSwipeEnabled: Boolean = true, + calendarState: WeekCalendarState = rememberWeekCalendarState(), + dayContent: @Composable BoxScope.(DayState) -> Unit = { DefaultDay(it) }, + weekHeader: @Composable ColumnScope.(WeekState) -> Unit = { + DefaultProperWeekHeader(it) + }, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit = { DefaultDaysOfWeekHeader(it) }, +) { + WeekCalendar( + modifier = modifier, + calendarState = calendarState, + today = today, + horizontalSwipeEnabled = horizontalSwipeEnabled, + firstDayOfWeek = firstDayOfWeek, + dayContent = dayContent, + weekHeader = weekHeader, + daysOfWeekHeader = daysOfWeekHeader, + ) +} + +/** + * Composable for showing a week calendar. The calendar state has to be provided by the call site. If you + * want to use built-in implementation, check out: + * [SelectableWeekCalendar] - calendar composable handling selection that can be changed at runtime + * [StaticWeekCalendar] - calendar without any mechanism for selection + * + * @param modifier + * @param firstDayOfWeek first day of a week, defaults to current locale's + * @param today current day, defaults to [LocalDate.now] + * @param horizontalSwipeEnabled whenever user is able to change the week by horizontal swipe + * @param calendarState state of the composable + * @param dayContent composable rendering the current day + * @param weekHeader header for showing the current week and controls for changing it + * @param daysOfWeekHeader header for showing captions for each day of week + */ +@Composable +public fun WeekCalendar( + calendarState: WeekCalendarState, + modifier: Modifier = Modifier, + today: LocalDate = LocalDate.now(), + firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek, + horizontalSwipeEnabled: Boolean = true, + dayContent: @Composable BoxScope.(DayState) -> Unit = { DefaultDay(it) }, + weekHeader: @Composable ColumnScope.(WeekState) -> Unit = { + DefaultProperWeekHeader(it) + }, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit = { DefaultDaysOfWeekHeader(it) }, +) { + val initialWeek = remember { calendarState.weekState.currentWeek } + val daysOfWeek = remember(firstDayOfWeek) { + DayOfWeek.values().rotateRight(DaysInAWeek - firstDayOfWeek.ordinal) + } + + Column( + modifier = modifier, + ) { + weekHeader(calendarState.weekState) + if (horizontalSwipeEnabled) { + WeekPager( + initialWeek = initialWeek, + daysOfWeek = daysOfWeek, + weekState = calendarState.weekState, + selectionState = calendarState.selectionState, + today = today, + dayContent = dayContent, + daysOfWeekHeader = daysOfWeekHeader, + ) + } else { + WeekContent( + daysOfWeek = daysOfWeek, + weekDays = calendarState.weekState.currentWeek.getWeekDays(today), + selectionState = calendarState.selectionState, + dayContent = dayContent, + daysOfWeekHeader = daysOfWeekHeader, + ) + } + } +} + +/** + * Helper function for providing a [WeekCalendarState] implementation with selection mechanism. + * + * @param firstDayOfWeek first day of a week, defaults to current locale's + * @param initialWeek initially rendered month + * @param initialSelection initial selection of the composable + * @param initialSelectionMode initial mode of the selection + * @param confirmSelectionChange callback for optional side-effects handling and vetoing the state change + */ +@Composable +public fun rememberSelectableWeekCalendarState( + firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek, + initialWeek: Week = Week.now(firstDayOfWeek), + initialSelection: List = emptyList(), + initialSelectionMode: SelectionMode = SelectionMode.Single, + confirmSelectionChange: (newValue: List) -> Boolean = { true }, + weekState: WeekState = rememberSaveable(saver = WeekState.Saver()) { + WeekState(initialWeek = initialWeek) + }, + selectionState: DynamicSelectionState = rememberSaveable( + saver = DynamicSelectionState.Saver(confirmSelectionChange), + ) { + DynamicSelectionState(confirmSelectionChange, initialSelection, initialSelectionMode) + }, +): WeekCalendarState = + remember { WeekCalendarState(weekState, selectionState) } + +/** + * Helper function for providing a [WeekCalendarState] implementation without a selection mechanism. + * + * @param firstDayOfWeek first day of a week, defaults to current locale's + * @param initialWeek initially rendered week + */ +@Composable +public fun rememberWeekCalendarState( + firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek, + initialWeek: Week = Week.now(firstDayOfWeek), + weekState: WeekState = rememberSaveable(saver = WeekState.Saver()) { + WeekState(initialWeek = initialWeek) + }, +): WeekCalendarState = + remember { WeekCalendarState(weekState, EmptySelectionState) } diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt new file mode 100644 index 0000000..ed399a1 --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/DefaultWeekHeader.kt @@ -0,0 +1,73 @@ +package io.github.boguszpawlowski.composecalendar.header + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.width +import androidx.compose.material.IconButton +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.KeyboardArrowLeft +import androidx.compose.material.icons.filled.KeyboardArrowRight +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.unit.dp +import java.time.format.TextStyle.FULL +import java.util.Locale + +/** + * Default implementation of month header, shows current month and year, as well as + * 2 arrows for changing currently showed month + */ +@Composable +@Suppress("LongMethod") +public fun DefaultWeekHeader( + weekState: WeekState, + modifier: Modifier = Modifier, +) { + Row( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically, + ) { + IconButton( + modifier = Modifier.testTag("Decrement"), + onClick = { weekState.currentWeek = weekState.currentWeek.dec() } + ) { + Image( + imageVector = Icons.Default.KeyboardArrowLeft, + colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface), + contentDescription = "Previous", + ) + } + Text( + modifier = Modifier.testTag("MonthLabel"), + text = weekState.currentWeek.yearMonth.month + .getDisplayName(FULL, Locale.getDefault()) + .lowercase() + .replaceFirstChar { it.titlecase() }, + style = MaterialTheme.typography.h4, + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = weekState.currentWeek.yearMonth.year.toString(), + style = MaterialTheme.typography.h4 + ) + IconButton( + modifier = Modifier.testTag("Increment"), + onClick = { weekState.currentWeek = weekState.currentWeek.inc() } + ) { + Image( + imageVector = Icons.Default.KeyboardArrowRight, + colorFilter = ColorFilter.tint(MaterialTheme.colors.onSurface), + contentDescription = "Next", + ) + } + } +} diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt new file mode 100644 index 0000000..b2c6aff --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/header/WeekState.kt @@ -0,0 +1,39 @@ +package io.github.boguszpawlowski.composecalendar.header + +import androidx.compose.runtime.Stable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.Saver +import androidx.compose.runtime.setValue +import io.github.boguszpawlowski.composecalendar.week.Week +import java.time.LocalDate + +@Suppress("FunctionName") // Factory function +public fun WeekState(initialWeek: Week): WeekState = WeekStateImpl(initialWeek) + +@Stable +public interface WeekState { + public var currentWeek: Week + + public companion object { + @Suppress("FunctionName") // Factory function + public fun Saver(): Saver = Saver( + save = { it.currentWeek.start.toString() }, + restore = { WeekState(initialWeek = Week(firstDay = LocalDate.parse(it))) } + ) + } +} + +@Stable +private class WeekStateImpl( + initialWeek: Week, +) : WeekState { + + private var _currentWeek by mutableStateOf(initialWeek) + + override var currentWeek: Week + get() = _currentWeek + set(value) { + _currentWeek = value + } +} diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt index 0e360c4..47cc6e3 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthContent.kt @@ -23,17 +23,15 @@ import dev.chrisbanes.snapper.rememberSnapperFlingBehavior import io.github.boguszpawlowski.composecalendar.day.DayState import io.github.boguszpawlowski.composecalendar.header.MonthState import io.github.boguszpawlowski.composecalendar.selection.SelectionState -import io.github.boguszpawlowski.composecalendar.week.WeekContent +import io.github.boguszpawlowski.composecalendar.week.WeekRow import io.github.boguszpawlowski.composecalendar.week.getWeeks import java.time.DayOfWeek import java.time.LocalDate import java.time.YearMonth -internal const val DaysOfWeek = 7 - @OptIn(ExperimentalSnapperApi::class) @Composable -@Suppress("LongMethod", "LongParameterList") +@Suppress("LongMethod") internal fun MonthPager( initialMonth: YearMonth, showAdjacentMonths: Boolean, @@ -119,8 +117,8 @@ internal fun MonthContent( firstDayOfTheWeek = daysOfWeek.first(), today = today, ).forEach { week -> - WeekContent( - week = week, + WeekRow( + weekDays = week, selectionState = selectionState, dayContent = dayContent, ) @@ -131,7 +129,7 @@ internal fun MonthContent( } @OptIn(ExperimentalSnapperApi::class) -private val coerceSnapIndex: (SnapperLayoutInfo, startIndex: Int, targetIndex: Int) -> Int = +internal val coerceSnapIndex: (SnapperLayoutInfo, startIndex: Int, targetIndex: Int) -> Int = { _, startIndex, targetIndex -> targetIndex .coerceIn(startIndex - 1, startIndex + 1) diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt index dbc48da..4bc7d74 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/DefaultWeekHeader.kt @@ -9,8 +9,17 @@ import androidx.compose.ui.text.style.TextAlign import java.time.DayOfWeek import java.time.format.TextStyle.SHORT import java.util.Locale +import kotlin.DeprecationLevel.WARNING @Composable +@Deprecated( + level = WARNING, + replaceWith = ReplaceWith( + "DefaultDaysOfWeekHeader(daysOfWeek, modifier)", + "io.github.boguszpawlowski.composecalendar.week.DefaultDaysOfWeekHeader", + ), + message = "Replace with DefaultDaysOfWeekHeader, DefaultWeekHeader will be removed in future versions" +) public fun DefaultWeekHeader( daysOfWeek: List, modifier: Modifier = Modifier, @@ -28,4 +37,22 @@ public fun DefaultWeekHeader( } } +@Composable +public fun DefaultDaysOfWeekHeader( + daysOfWeek: List, + modifier: Modifier = Modifier, +) { + Row(modifier = modifier) { + daysOfWeek.forEach { dayOfWeek -> + Text( + textAlign = TextAlign.Center, + text = dayOfWeek.getDisplayName(SHORT, Locale.getDefault()), + modifier = modifier + .weight(1f) + .wrapContentHeight() + ) + } + } +} + internal fun Array.rotateRight(n: Int): List = takeLast(n) + dropLast(n) diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt index 4f65525..192197d 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/Week.kt @@ -1,10 +1,44 @@ package io.github.boguszpawlowski.composecalendar.week -import androidx.compose.runtime.Immutable -import io.github.boguszpawlowski.composecalendar.day.Day - -@Immutable -internal data class Week( - val isFirstWeekOfTheMonth: Boolean = false, - val days: List, -) +import io.github.boguszpawlowski.composecalendar.selection.fillUpTo +import io.github.boguszpawlowski.composecalendar.util.daysUntil +import java.time.DayOfWeek +import java.time.LocalDate +import java.time.YearMonth +import java.time.temporal.WeekFields +import java.util.Locale + +public data class Week( + val days: List, +) { + + init { + require(days.size == DaysInAWeek) + } + + internal constructor(firstDay: LocalDate) : this( + listOf(firstDay).fillUpTo(firstDay.plusDays((DaysInAWeek - 1).toLong())) + ) + + public val start: LocalDate get() = days.first() + + public val end: LocalDate get() = days.last() + + public val yearMonth: YearMonth = YearMonth.of(start.year, start.month) + + public operator fun inc(): Week = plusWeeks(1) + + public operator fun dec(): Week = plusWeeks(-1) + + public fun plusWeeks(value: Long): Week = copy(days = days.map { it.plusWeeks(value) }) + + public companion object { + public fun now(firstDayOfWeek: DayOfWeek = WeekFields.of(Locale.getDefault()).firstDayOfWeek): Week { + val today = LocalDate.now() + val offset = today.dayOfWeek.daysUntil(firstDayOfWeek) + val firstDay = today.minusDays(offset.toLong()) + + return Week(firstDay) + } + } +} diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekDays.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekDays.kt new file mode 100644 index 0000000..374e175 --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekDays.kt @@ -0,0 +1,10 @@ +package io.github.boguszpawlowski.composecalendar.week + +import androidx.compose.runtime.Immutable +import io.github.boguszpawlowski.composecalendar.day.Day + +@Immutable +internal data class WeekDays( + val isFirstWeekOfTheMonth: Boolean = false, + val days: List, +) diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt new file mode 100644 index 0000000..c6d75c4 --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt @@ -0,0 +1,70 @@ +package io.github.boguszpawlowski.composecalendar.week + +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.runtime.Stable +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.snapshotFlow +import io.github.boguszpawlowski.composecalendar.header.WeekState +import io.github.boguszpawlowski.composecalendar.month.StartIndex +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.launch +import java.time.temporal.ChronoUnit + +@Stable +internal class WeekListState( + private val coroutineScope: CoroutineScope, + private val initialWeek: Week, + private val weekState: WeekState, + private val listState: LazyListState, +) { + + private val currentlyVisibleMonth by derivedStateOf { + getWeekForPage(listState.firstVisibleItemIndex) + } + + init { + snapshotFlow { weekState.currentWeek }.onEach { week -> + moveToWeek(week) + }.launchIn(coroutineScope) + + snapshotFlow { currentlyVisibleMonth }.onEach { newMonth -> + weekState.currentWeek = newMonth + }.launchIn(coroutineScope) + } + + fun getWeekForPage(index: Int): Week = + initialWeek.plusWeeks((index - StartIndex).toLong()) + + private fun moveToWeek(week: Week) { + if (week == currentlyVisibleMonth) return + initialWeek.minus(week).let { offset -> + coroutineScope.launch { + listState.animateScrollToItem((StartIndex - offset).toInt()) + } + } + } + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as WeekListState + + if (weekState != other.weekState) return false + if (listState != other.listState) return false + + return true + } + + override fun hashCode(): Int { + var result = weekState.hashCode() + result = 31 * result + listState.hashCode() + return result + } +} + +private operator fun Week.minus(other: Week) = + ChronoUnit.WEEKS.between(other.start, this.start) diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt new file mode 100644 index 0000000..32a3d27 --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekPager.kt @@ -0,0 +1,125 @@ +package io.github.boguszpawlowski.composecalendar.week + +import androidx.compose.animation.rememberSplineBasedDecay +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.rememberLazyListState +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 +import androidx.compose.ui.platform.testTag +import dev.chrisbanes.snapper.ExperimentalSnapperApi +import dev.chrisbanes.snapper.SnapOffsets +import dev.chrisbanes.snapper.SnapperFlingBehaviorDefaults +import dev.chrisbanes.snapper.rememberSnapperFlingBehavior +import io.github.boguszpawlowski.composecalendar.day.DayState +import io.github.boguszpawlowski.composecalendar.day.WeekDay +import io.github.boguszpawlowski.composecalendar.header.WeekState +import io.github.boguszpawlowski.composecalendar.month.PagerItemCount +import io.github.boguszpawlowski.composecalendar.month.StartIndex +import io.github.boguszpawlowski.composecalendar.month.coerceSnapIndex +import io.github.boguszpawlowski.composecalendar.selection.SelectionState +import java.time.DayOfWeek +import java.time.LocalDate + +@OptIn(ExperimentalSnapperApi::class) +@Composable +@Suppress("LongMethod") +internal fun WeekPager( + initialWeek: Week, + selectionState: T, + weekState: WeekState, + daysOfWeek: List, + today: LocalDate, + modifier: Modifier = Modifier, + dayContent: @Composable BoxScope.(DayState) -> Unit, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit, +) { + val coroutineScope = rememberCoroutineScope() + + val listState = rememberLazyListState( + initialFirstVisibleItemIndex = StartIndex, + ) + val flingBehavior = rememberSnapperFlingBehavior( + lazyListState = listState, + snapOffsetForItem = SnapOffsets.Start, + springAnimationSpec = SnapperFlingBehaviorDefaults.SpringAnimationSpec, + decayAnimationSpec = rememberSplineBasedDecay(), + snapIndex = coerceSnapIndex, + ) + + val weekListState = remember { + WeekListState( + coroutineScope = coroutineScope, + initialWeek = initialWeek, + weekState = weekState, + listState = listState, + ) + } + + LazyRow( + modifier = modifier.testTag("WeekPager"), + state = listState, + flingBehavior = flingBehavior, + verticalAlignment = Alignment.Top, + ) { + items(PagerItemCount) { index -> + WeekContent( + modifier = Modifier.fillParentMaxWidth(), + daysOfWeek = daysOfWeek, + weekDays = weekListState.getWeekForPage(index).getWeekDays(today = today), + selectionState = selectionState, + dayContent = dayContent, + daysOfWeekHeader = daysOfWeekHeader, + ) + } + } +} + +@Composable +internal fun WeekContent( + selectionState: T, + weekDays: WeekDays, + daysOfWeek: List, + modifier: Modifier = Modifier, + dayContent: @Composable BoxScope.(DayState) -> Unit, + daysOfWeekHeader: @Composable BoxScope.(List) -> Unit, +) { + Column( + modifier = modifier, + ) { + Box( + modifier = Modifier + .wrapContentHeight() + .fillMaxWidth(), + content = { daysOfWeekHeader(daysOfWeek) }, + ) + WeekRow( + weekDays = weekDays, + modifier = Modifier.fillMaxWidth(), + selectionState = selectionState, + dayContent = dayContent, + ) + } +} + +internal fun Week.getWeekDays(today: LocalDate): WeekDays { + val weekDays = days.map { + WeekDay( + date = it, + isCurrentDay = it == today, + isFromCurrentMonth = true, + ) + } + + return WeekDays( + isFirstWeekOfTheMonth = false, + days = weekDays, + ) +} diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekContent.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekRow.kt similarity index 81% rename from library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekContent.kt rename to library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekRow.kt index 3c15d90..61881e1 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekContent.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekRow.kt @@ -12,8 +12,8 @@ import io.github.boguszpawlowski.composecalendar.day.DayState import io.github.boguszpawlowski.composecalendar.selection.SelectionState @Composable -internal fun WeekContent( - week: Week, +internal fun WeekRow( + weekDays: WeekDays, selectionState: T, modifier: Modifier = Modifier, dayContent: @Composable BoxScope.(DayState) -> Unit @@ -22,9 +22,9 @@ internal fun WeekContent( modifier = modifier .fillMaxWidth() .wrapContentHeight(), - horizontalArrangement = if (week.isFirstWeekOfTheMonth) Arrangement.End else Arrangement.Start + horizontalArrangement = if (weekDays.isFirstWeekOfTheMonth) Arrangement.End else Arrangement.Start ) { - week.days.forEachIndexed { index, day -> + weekDays.days.forEachIndexed { index, day -> Box( modifier = Modifier.fillMaxWidth(1f / (7 - index)) ) { diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt index ad5fc0e..938c587 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekUtil.kt @@ -6,13 +6,13 @@ import java.time.DayOfWeek import java.time.LocalDate import java.time.YearMonth -private const val DaysInAWeek = 7 +internal const val DaysInAWeek = 7 internal fun YearMonth.getWeeks( includeAdjacentMonths: Boolean, firstDayOfTheWeek: DayOfWeek, today: LocalDate = LocalDate.now(), -): List { +): List { val daysLength = lengthOfMonth() val starOffset = atDay(1).dayOfWeek daysUntil firstDayOfTheWeek @@ -20,7 +20,7 @@ internal fun YearMonth.getWeeks( DaysInAWeek - (atDay(daysLength).dayOfWeek daysUntil firstDayOfTheWeek) - 1 return (1 - starOffset..daysLength + endOffset).chunked(DaysInAWeek).mapIndexed { index, days -> - Week( + WeekDays( isFirstWeekOfTheMonth = index == 0, days = days.mapNotNull { dayOfMonth -> val (date, isFromCurrentMonth) = when (dayOfMonth) { diff --git a/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekTest.kt b/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekTest.kt new file mode 100644 index 0000000..c59c4fc --- /dev/null +++ b/library/src/test/java/io/github/boguszpawlowski/composecalendar/week/WeekTest.kt @@ -0,0 +1,68 @@ +package io.github.boguszpawlowski.composecalendar.week + +import io.kotest.assertions.asClue +import io.kotest.assertions.throwables.shouldThrow +import io.kotest.core.spec.style.ShouldSpec +import io.kotest.matchers.shouldBe +import java.time.LocalDate + +internal class WeekTest : ShouldSpec({ + + val today = LocalDate.of(2000, 10, 2) + + context("Secondary constructor") { + val week = Week(firstDay = today) + + should("properly create an instance of week") { + week.asClue { + it.days.first() shouldBe today + it.days.last() shouldBe today.plusDays(6) + it.days.size shouldBe 7 + } + } + } + + context("Incrementing") { + val week = Week(firstDay = today).inc() + + should("shift the days by 7") { + week.asClue { + it.days.first() shouldBe today.plusWeeks(1) + it.days.last() shouldBe today.plusDays(6).plusWeeks(1) + it.days.size shouldBe 7 + } + } + } + + context("Decrementing") { + val week = Week(firstDay = today).dec() + + should("shift the days by -7") { + week.asClue { + it.days.first() shouldBe today.plusWeeks(-1) + it.days.last() shouldBe today.plusDays(6).plusWeeks(-1) + it.days.size shouldBe 7 + } + } + } + + context("Adding a week") { + val week = Week(firstDay = today).plusWeeks(7) + + should("add correct number of days") { + week.asClue { + it.days.first() shouldBe today.plusWeeks(7) + it.days.last() shouldBe today.plusDays(6).plusWeeks(7) + it.days.size shouldBe 7 + } + } + } + + context("Constructing a week with invalid number of days") { + should("throw") { + shouldThrow { + Week(List(18) { LocalDate.now() }) + } + } + } +}) diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 3a44c1e..ecee142 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -25,8 +25,6 @@ dependencies { implementation(project(":library")) implementation(project(":kotlinx-datetime")) - implementation(Kotlin.StdLib) - implementation(Material.Core) implementation(AndroidX.AppCompat) diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt index 4387cb0..4a77f49 100644 --- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/CustomComponentsSample.kt @@ -38,7 +38,7 @@ fun CustomComponentsSample() { firstDayOfWeek = SUNDAY, monthContainer = { MonthContainer(it) }, dayContent = { DayContent(dayState = it) }, - weekHeader = { WeekHeader(daysOfWeek = it) }, + daysOfWeekHeader = { WeekHeader(daysOfWeek = it) }, monthHeader = { MonthHeader(monthState = it) }, ) } diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt index 4921c63..ddb5fb7 100644 --- a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/MainActivity.kt @@ -52,6 +52,7 @@ fun MainScreen() { NavHost(navController = navController, startDestination = "main") { composable("main") { MainMenu(navController = navController) } composable("static") { StaticCalendarSample() } + composable("week") { WeekCalendarSample() } composable("selection") { SelectableCalendarSample() } composable("components") { CustomComponentsSample() } composable("custom_selection") { CustomSelectionSample() } @@ -79,6 +80,11 @@ fun MainMenu(navController: NavController) { } Spacer(modifier = Modifier.height(16.dp)) + Button(onClick = { navController.navigate("week") }) { + Text(text = "Week Calendar") + } + Spacer(modifier = Modifier.height(16.dp)) + Button(onClick = { navController.navigate("components") }) { Text(text = "Custom Components") } diff --git a/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/WeekCalendarSample.kt b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/WeekCalendarSample.kt new file mode 100644 index 0000000..9420be0 --- /dev/null +++ b/sample/src/main/java/io/github/boguszpawlowski/composecalendar/sample/WeekCalendarSample.kt @@ -0,0 +1,57 @@ +package io.github.boguszpawlowski.composecalendar.sample + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.MaterialTheme +import androidx.compose.material.RadioButton +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import io.github.boguszpawlowski.composecalendar.SelectableWeekCalendar +import io.github.boguszpawlowski.composecalendar.rememberSelectableWeekCalendarState +import io.github.boguszpawlowski.composecalendar.selection.DynamicSelectionState +import io.github.boguszpawlowski.composecalendar.selection.SelectionMode + +@Composable +fun WeekCalendarSample() { + val calendarState = rememberSelectableWeekCalendarState() + + Column( + Modifier.verticalScroll(rememberScrollState()) + ) { + SelectableWeekCalendar(calendarState = calendarState) + + SelectionControls(selectionState = calendarState.selectionState) + } +} + +@Composable +private fun SelectionControls( + selectionState: DynamicSelectionState, +) { + Text( + text = "Calendar Selection Mode", + style = MaterialTheme.typography.h5, + ) + SelectionMode.values().forEach { selectionMode -> + Row(modifier = Modifier.fillMaxWidth()) { + RadioButton( + selected = selectionState.selectionMode == selectionMode, + onClick = { selectionState.selectionMode = selectionMode } + ) + Text(text = selectionMode.name) + Spacer(modifier = Modifier.height(4.dp)) + } + } + + Text( + text = "Selection: ${selectionState.selection.joinToString { it.toString() }}", + style = MaterialTheme.typography.h6, + ) +} From 29258fbbcf4111f1fd6f2d5c6400f92a1e5207ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Fri, 3 Mar 2023 19:55:38 +0100 Subject: [PATCH 20/31] Add info about new Compose version in readme (#92) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fb4181a..818ea02 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ Snapshots are available on [Sonatype’s snapshots repository](https://s01.oss.s | 1.1.0 | 0.5.1 | | 1.2.0 | 0.6.0 | | 1.2.1 | 1.0.2 | +| 1.3.1 | 1.1.0 | ## Supported features - Selection (single, multiple or a range of days) From 296289222bbcb322895891347b53acca07cc3355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Tue, 14 Mar 2023 18:16:02 +0100 Subject: [PATCH 21/31] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 818ea02..f50d95d 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ Initial state for the static calendar is provided by the `rememberCalendarState( fun MainScreen() { StaticCalendar( calendarState = rememberCalendarState( - initialDate = YearMonth.now().plusYears(1), + initialMonth = YearMonth.now().plusYears(1), ) ) } @@ -178,7 +178,7 @@ In case of the selectable calendar, the state has additional parameters, used to fun MainScreen() { SelectableCalendar( calendarState = rememberSelectableCalendarState( - initialDate = YearMonth.now().plusYears(1), + initialMonth = YearMonth.now().plusYears(1), initialSelection = listOf(LocalDate.parse("20-01-2020")), initialSelectionMode = SelectionMode.Period, ) From d7cd0406e503394beca70485d49e9f8e4dbb2b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Sat, 18 Mar 2023 20:36:48 +0100 Subject: [PATCH 22/31] Add month changes throttling (#95) --- library/build.gradle.kts | 2 +- .../composecalendar/month/MonthListState.kt | 15 ++++++++++----- .../util/ListStateExtensions.kt | 19 +++++++++++++++++++ .../composecalendar/week/WeekListState.kt | 15 ++++++++++----- 4 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 library/src/main/java/io/github/boguszpawlowski/composecalendar/util/ListStateExtensions.kt diff --git a/library/build.gradle.kts b/library/build.gradle.kts index aff0c2f..70dcc37 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -11,7 +11,7 @@ plugins { android { tasks.withType { kotlinOptions { - freeCompilerArgs = freeCompilerArgs + "-Xexplicit-api=strict" + freeCompilerArgs = freeCompilerArgs + "-Xexplicit-api=strict" + "-Xcontext-receivers" } } } diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt index a3809f4..16c781f 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/month/MonthListState.kt @@ -6,6 +6,7 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.snapshotFlow import io.github.boguszpawlowski.composecalendar.header.MonthState +import io.github.boguszpawlowski.composecalendar.util.throttleOnOffset import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -21,7 +22,7 @@ internal class MonthListState( private val listState: LazyListState, ) { - private val currentlyVisibleMonth by derivedStateOf { + private val currentFirstVisibleMonth by derivedStateOf { getMonthForPage(listState.firstVisibleItemIndex) } @@ -30,16 +31,20 @@ internal class MonthListState( moveToMonth(month) }.launchIn(coroutineScope) - snapshotFlow { currentlyVisibleMonth }.onEach { newMonth -> - monthState.currentMonth = newMonth - }.launchIn(coroutineScope) + with(listState) { + snapshotFlow { currentFirstVisibleMonth } + .throttleOnOffset() + .onEach { newMonth -> + monthState.currentMonth = newMonth + }.launchIn(coroutineScope) + } } fun getMonthForPage(index: Int): YearMonth = initialMonth.plusMonths((index - StartIndex).toLong()) private fun moveToMonth(month: YearMonth) { - if (month == currentlyVisibleMonth) return + if (month == currentFirstVisibleMonth) return initialMonth.minus(month).let { offset -> coroutineScope.launch { listState.animateScrollToItem((StartIndex - offset).toInt()) diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/ListStateExtensions.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/ListStateExtensions.kt new file mode 100644 index 0000000..07c576d --- /dev/null +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/util/ListStateExtensions.kt @@ -0,0 +1,19 @@ +package io.github.boguszpawlowski.composecalendar.util + +import androidx.compose.foundation.lazy.LazyListState +import androidx.compose.runtime.snapshotFlow +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.flow.map + +context(LazyListState) internal fun Flow.throttleOnOffset() = + combine( + snapshotFlow { firstVisibleItemScrollOffset } + ) { newMonth, offset -> + newMonth to (offset <= MinimalOffsetForEmit) + }.filter { (_, shouldUpdate) -> + shouldUpdate + }.map { (newValue, _) -> newValue } + +private const val MinimalOffsetForEmit = 10 diff --git a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt index c6d75c4..be8b38c 100644 --- a/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt +++ b/library/src/main/java/io/github/boguszpawlowski/composecalendar/week/WeekListState.kt @@ -7,6 +7,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.snapshotFlow import io.github.boguszpawlowski.composecalendar.header.WeekState import io.github.boguszpawlowski.composecalendar.month.StartIndex +import io.github.boguszpawlowski.composecalendar.util.throttleOnOffset import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -21,7 +22,7 @@ internal class WeekListState( private val listState: LazyListState, ) { - private val currentlyVisibleMonth by derivedStateOf { + private val currentlyFirstVisibleMonth by derivedStateOf { getWeekForPage(listState.firstVisibleItemIndex) } @@ -30,16 +31,20 @@ internal class WeekListState( moveToWeek(week) }.launchIn(coroutineScope) - snapshotFlow { currentlyVisibleMonth }.onEach { newMonth -> - weekState.currentWeek = newMonth - }.launchIn(coroutineScope) + with(listState) { + snapshotFlow { currentlyFirstVisibleMonth } + .throttleOnOffset() + .onEach { newMonth -> + weekState.currentWeek = newMonth + }.launchIn(coroutineScope) + } } fun getWeekForPage(index: Int): Week = initialWeek.plusWeeks((index - StartIndex).toLong()) private fun moveToWeek(week: Week) { - if (week == currentlyVisibleMonth) return + if (week == currentlyFirstVisibleMonth) return initialWeek.minus(week).let { offset -> coroutineScope.launch { listState.animateScrollToItem((StartIndex - offset).toInt()) From 6a3c71bf8af5deee6701af9008f1100003ad4041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bogusz=20Paw=C5=82owski?= Date: Wed, 17 May 2023 20:47:49 +0200 Subject: [PATCH 23/31] Add api call scenario to viewmodel sample (#100) --- .idea/codeStyles/Project.xml | 5 -- .../composecalendar/sample/ViewModelSample.kt | 82 +++++++++++-------- 2 files changed, 46 insertions(+), 41 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index bd0dc93..55e7665 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,11 +1,6 @@ - -