Kotlinx datetime CalendarModel (support date picker on darwin and web) #717

alexzhirkevich · 2023-07-29T09:34:23Z

Proposed Changes

Fix some bugs in String.format
Implement KotlinxDatetimeCalendarModel
Full support of calendar model on darwin including weekdays localization and date skeletons (respects iOS Language & Region preferences)
Full support of calendar model on JS with date skeleton and weekdays localization

macOS native

Testing

Test: KotlinxDatetimeCalendarModelTest + mpp Date & Time pickers

Issues Fixed

Fixes: JetBrains/compose-multiplatform#3359
Fixes: JetBrains/compose-multiplatform#3354
Fixes: JetBrains/compose-multiplatform#1299

compose/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/Strings.skiko.kt

...erial3/src/desktopTest/kotlin/androidx/compose/material3/KotlinxDatetimeCalendarModelTest.kt

alexzhirkevich · 2023-08-02T11:36:20Z

I am not sure how multiplatform tests work. Need some help here.

~~How to properly setup tests in skiko? For some reason my AS doesn't treat skikoTest directory as a module...~~ Looks like i need to add dependsOn from other test module to activate it. And 2nd question is probably can be solved with dependsOn
If i add tests for expect object in skikoTest, will it be tested on each platform or do i need to add test for actuals in each module?

eymar · 2023-08-02T13:23:05Z

If i add tests for expect object in skikoTest, will it be tested on each platform or do i need to add test for actuals in each module?

Unless actual implementations intentionally produce different results, there is no need to add the same test to platform-specific test source sets. skikoTests should be fine.

...ial3/material3/src/jsWasmMain/kotlin/androidx/compose/material3/PlatformDateFormat.jsWasm.kt

...erial3/src/desktopTest/kotlin/androidx/compose/material3/KotlinxDatetimeCalendarModelTest.kt

alexzhirkevich · 2023-08-02T18:50:55Z

Should we use new calendar model for desktop too and set it as actual in skiko? Or it's better to left legacy one for now? Date format is delegated to legacy anyway.

...ial3/material3/src/jsWasmMain/kotlin/androidx/compose/material3/PlatformDateFormat.jsWasm.kt

eymar · 2023-08-03T08:43:52Z

Should we use new calendar model for desktop too and set it as actual in skiko? Or it's better to left legacy one for now? Date format is delegated to legacy anyway.

If the desktop tests pass, then I think it's better to use a common implementation (common for skiko targets without android). And as for formatter, let it delegate to legacy impl for now. Maybe adding a link to Kotlin/kotlinx-datetime#251 in desktop formatter could be helpful in the future.

Co-authored-by: Oleksandr Karpovich <a.n.karpovich@gmail.com>

alexzhirkevich · 2023-08-03T09:50:53Z

If the desktop tests pass,

They do. Except 2 muted (only on desktop) tests for a non-implemented desktop ICU skeleton feature.

eymar · 2023-08-04T16:21:08Z

Is such date formatting (without spaces) expected on jvm/desktop untill we use kotlinx.datetime? I'm on Ubuntu (haven't tested other OS yet).

left - browser
right - desktop

eymar

Web part looks good to me! thank you!

alexzhirkevich · 2023-08-04T17:04:18Z

Is such date formatting (without spaces) expected on jvm/desktop untill we use kotlinx.datetime

It is a consequence of non-implemented ICU date skeletons.

We can replace it for now with something readable without localization (for ex. take patterns from the left screen). The only thing there can be troubles c падежами in some languages.
Or we can use a 3rd party library such as ibm ICU4j

compose/material3/material3/src/skikoTest/kotlin/androidx/compose/material3/Assert.kt

Co-authored-by: dima.avdeev <dima.avdeev@jetbrains.com>

dima-avdeev-jb · 2023-08-05T13:50:15Z

@alexzhirkevich We added automatically check Google CLA.
Can you please follow instructions here: https://github.com/JetBrains/compose-multiplatform-core/pull/717/checks?check_run_id=15644479000

You need to add an additional email (in GitHub account) to which you accepted the signature

alexzhirkevich · 2023-08-05T13:52:41Z

It seems like it is not because of me :D

dima-avdeev-jb · 2023-08-05T14:36:23Z

Yeah, thanks! Overall LGTM. I will merge it

#717) implement Calender on all platforms Co-authored-by: Oleksandr Karpovich <a.n.karpovich@gmail.com> Co-authored-by: dima.avdeev <dima.avdeev@jetbrains.com>

alexzhirkevich added 8 commits July 29, 2023 11:58

darwin CalendarModel

32d04ea

test

23c8f9b

weekdayNames desktop

68ffc21

move skiko actual to actual.skiko.kt

2c29d94

reverse popups

2ac3dc9

date skeleton js

36c2594

js better format

a893355

format

32a54c7

alexzhirkevich changed the title ~~Kotlinx datetime CalendarModel (support date picker on darwin)~~ Kotlinx datetime CalendarModel (support date picker on darwin and web) Jul 29, 2023

null fix

3803d39

alexzhirkevich marked this pull request as ready for review July 29, 2023 13:08

alexzhirkevich added 6 commits July 29, 2023 19:25

fix weekdays, implement iOS getDateInputFormat

d0e7517

implement js getDateInputFormat

8fab673

js firstDayOfWeek

57f6b50

weekdays localization js

91e6e94

cleanup

e7452ef

js format without leading zeros

7075cce

dima-avdeev-jb self-requested a review August 1, 2023 09:22

alexzhirkevich added 2 commits August 1, 2023 14:13

cleanup

988fd88

fix string format

4824a56

alexzhirkevich commented Aug 1, 2023

View reviewed changes

compose/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/Strings.skiko.kt Show resolved Hide resolved

remove invalid \ in strings

a196c46

dima-avdeev-jb reviewed Aug 2, 2023

View reviewed changes

...erial3/src/desktopTest/kotlin/androidx/compose/material3/KotlinxDatetimeCalendarModelTest.kt Outdated Show resolved Hide resolved

...erial3/src/desktopTest/kotlin/androidx/compose/material3/KotlinxDatetimeCalendarModelTest.kt Outdated Show resolved Hide resolved

eymar reviewed Aug 2, 2023

View reviewed changes

alexzhirkevich added 4 commits August 2, 2023 21:16

fixed bugs, implemented all tests

13bb8fe

fixed bugs, implemented all tests

864a0a7

unmute date input test for desktop

1893bef

fix

ae52b6b

eymar reviewed Aug 3, 2023

View reviewed changes

...ial3/material3/src/jsWasmMain/kotlin/androidx/compose/material3/PlatformDateFormat.jsWasm.kt Outdated Show resolved Hide resolved

add link to datetime format PR

5132740

Co-authored-by: Oleksandr Karpovich <a.n.karpovich@gmail.com>

set new model as an actual in skikoMain

6af9b8e

alexzhirkevich requested review from dima-avdeev-jb and eymar August 3, 2023 10:34

alexzhirkevich added 2 commits August 3, 2023 13:58

set proper name for test file

97ca44f

change year in js date input format to avoid epoch inconsistencies

2f70816

eymar approved these changes Aug 4, 2023

View reviewed changes

dima-avdeev-jb approved these changes Aug 5, 2023

View reviewed changes

compose/material3/material3/src/skikoTest/kotlin/androidx/compose/material3/Assert.kt Outdated Show resolved Hide resolved

Update copyright

99b2813

Co-authored-by: dima.avdeev <dima.avdeev@jetbrains.com>

dima-avdeev-jb merged commit c63c81e into JetBrains:jb-main Aug 5, 2023
1 check failed

dima-avdeev-jb mentioned this pull request Aug 7, 2023

StringFormatTests on skikoTest #733

Merged

MatkovIvan mentioned this pull request Aug 7, 2023

Missing compose functions in material3 JetBrains/compose-multiplatform#2037

Closed

alexzhirkevich mentioned this pull request Aug 21, 2023

Fix bug in calendar model #763

Merged

alexzhirkevich mentioned this pull request Aug 31, 2023

DatePicker. Fix today circle #782

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kotlinx datetime CalendarModel (support date picker on darwin and web) #717

Kotlinx datetime CalendarModel (support date picker on darwin and web) #717

alexzhirkevich commented Jul 29, 2023 •

edited

alexzhirkevich commented Aug 2, 2023 •

edited

eymar commented Aug 2, 2023

alexzhirkevich commented Aug 2, 2023 •

edited

eymar commented Aug 3, 2023

alexzhirkevich commented Aug 3, 2023 •

edited

eymar commented Aug 4, 2023 •

edited

eymar left a comment

alexzhirkevich commented Aug 4, 2023

dima-avdeev-jb commented Aug 5, 2023

alexzhirkevich commented Aug 5, 2023

dima-avdeev-jb commented Aug 5, 2023

Kotlinx datetime CalendarModel (support date picker on darwin and web) #717

Kotlinx datetime CalendarModel (support date picker on darwin and web) #717

Conversation

alexzhirkevich commented Jul 29, 2023 • edited

Proposed Changes

Testing

Issues Fixed

alexzhirkevich commented Aug 2, 2023 • edited

eymar commented Aug 2, 2023

alexzhirkevich commented Aug 2, 2023 • edited

eymar commented Aug 3, 2023

alexzhirkevich commented Aug 3, 2023 • edited

eymar commented Aug 4, 2023 • edited

eymar left a comment

Choose a reason for hiding this comment

alexzhirkevich commented Aug 4, 2023

dima-avdeev-jb commented Aug 5, 2023

alexzhirkevich commented Aug 5, 2023

dima-avdeev-jb commented Aug 5, 2023

alexzhirkevich commented Jul 29, 2023 •

edited

alexzhirkevich commented Aug 2, 2023 •

edited

alexzhirkevich commented Aug 2, 2023 •

edited

alexzhirkevich commented Aug 3, 2023 •

edited

eymar commented Aug 4, 2023 •

edited