-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Handle date/time conversion in runtime #258
Draft
drewhamilton
wants to merge
11
commits into
main
Choose a base branch
from
drew/handle-date-time-conversion-in-runtime
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
56fbbf2
Add DateTimeConverter to runtime
drewhamilton fbc6f5e
Generate DateTimeConverter instance in FormattedResources
drewhamilton 4f23e46
Rename all functions to `convertToCalendar`
drewhamilton 15f45f9
Generate use of dateTimeConverter in FormattedResources
drewhamilton da33b5d
Convert AndroidDateTimeConverter locale to lazy
drewhamilton 83c9523
Add sample FormattedResourcesTest using dateTimeConverter substitution
drewhamilton 71417eb
API dump
drewhamilton 3db0ac1
Delete extra `copy`s
drewhamilton 78dfe60
Add SubclassOptInRequired to DateTimeConverter
drewhamilton fef216f
Test ICU4J in TypesTest to compare results with Android ICU
drewhamilton f9feae2
Make `dateTimeConverter` public, visible for testing
drewhamilton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
runtime/src/main/java/app/cash/paraphrase/AndroidDateTimeConverter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| * Copyright (C) 2023 Cash App | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package app.cash.paraphrase | ||
|
|
||
| import android.icu.util.Calendar | ||
| import android.icu.util.TimeZone | ||
| import android.icu.util.ULocale | ||
| import java.time.LocalDate | ||
| import java.time.LocalDateTime | ||
| import java.time.LocalTime | ||
| import java.time.OffsetDateTime | ||
| import java.time.OffsetTime | ||
| import java.time.ZoneOffset | ||
| import java.time.ZonedDateTime | ||
|
|
||
| /** | ||
| * Converts `java.time` types used by Paraphrase to a [Calendar] that can be used by ICU to format. | ||
| */ | ||
| @OptIn(DateTimeConverter.SubclassOptIn::class) | ||
| public object AndroidDateTimeConverter : DateTimeConverter<Calendar> { | ||
|
|
||
| private val Iso8601Locale by lazy(LazyThreadSafetyMode.NONE) { | ||
| ULocale.Builder() | ||
| .setExtension('u', "ca-iso8601") | ||
| .build() | ||
| } | ||
|
|
||
| override fun convertToCalendar(date: LocalDate): Calendar { | ||
| return Calendar.getInstance( | ||
| TimeZone.GMT_ZONE, | ||
| Iso8601Locale, | ||
| ).apply { | ||
| set(date.year, date.monthValue - 1, date.dayOfMonth) | ||
| } | ||
| } | ||
|
|
||
| override fun convertToCalendar(time: OffsetTime): Calendar { | ||
| return Calendar.getInstance( | ||
| TimeZone.getTimeZone("GMT${time.offset.id}"), | ||
| Iso8601Locale, | ||
| ).apply { | ||
| set(Calendar.HOUR_OF_DAY, time.hour) | ||
| set(Calendar.MINUTE, time.minute) | ||
| set(Calendar.SECOND, time.second) | ||
| set(Calendar.MILLISECOND, time.nano / 1_000_000) | ||
| } | ||
| } | ||
|
|
||
| override fun convertToCalendar(time: LocalTime): Calendar { | ||
| return Calendar.getInstance( | ||
| TimeZone.GMT_ZONE, | ||
| Iso8601Locale, | ||
| ).apply { | ||
| set(Calendar.HOUR_OF_DAY, time.hour) | ||
| set(Calendar.MINUTE, time.minute) | ||
| set(Calendar.SECOND, time.second) | ||
| set(Calendar.MILLISECOND, time.nano / 1_000_000) | ||
| } | ||
| } | ||
|
|
||
| override fun convertToCalendar(dateTime: ZonedDateTime): Calendar { | ||
| return Calendar.getInstance( | ||
| TimeZone.getTimeZone(dateTime.zone.id), | ||
| Iso8601Locale, | ||
| ).apply { | ||
| set( | ||
| dateTime.year, | ||
| dateTime.monthValue - 1, | ||
| dateTime.dayOfMonth, | ||
| dateTime.hour, | ||
| dateTime.minute, | ||
| dateTime.second, | ||
| ) | ||
| set(Calendar.MILLISECOND, dateTime.nano / 1_000_000) | ||
| } | ||
| } | ||
|
|
||
| override fun convertToCalendar(dateTime: OffsetDateTime): Calendar { | ||
| return Calendar.getInstance( | ||
| TimeZone.getTimeZone("GMT${dateTime.offset.id}"), | ||
| Iso8601Locale, | ||
| ).apply { | ||
| set( | ||
| dateTime.year, | ||
| dateTime.monthValue - 1, | ||
| dateTime.dayOfMonth, | ||
| dateTime.hour, | ||
| dateTime.minute, | ||
| dateTime.second, | ||
| ) | ||
| set(Calendar.MILLISECOND, dateTime.nano / 1_000_000) | ||
| } | ||
| } | ||
|
|
||
| override fun convertToCalendar(dateTime: LocalDateTime): Calendar { | ||
| return Calendar.getInstance( | ||
| TimeZone.GMT_ZONE, | ||
| Iso8601Locale, | ||
| ).apply { | ||
| set( | ||
| dateTime.year, | ||
| dateTime.monthValue - 1, | ||
| dateTime.dayOfMonth, | ||
| dateTime.hour, | ||
| dateTime.minute, | ||
| dateTime.second, | ||
| ) | ||
| set(Calendar.MILLISECOND, dateTime.nano / 1_000_000) | ||
| } | ||
| } | ||
|
|
||
| override fun convertToCalendar(zoneOffset: ZoneOffset): Calendar { | ||
| return Calendar.getInstance( | ||
| TimeZone.getTimeZone("GMT${zoneOffset.id}"), | ||
| Iso8601Locale, | ||
| ) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since
AndroidDateTimeConverteris anobject, thisULocaleinstantiation was happening immediately whenFormattedResourceswas accessed, causing the JVM test to (still) crash. Loading it lazily avoids this.