Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Migrating away from java.util.Date to java.time - DateTimePickerFragment #4552

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Migrating away from java.util.Date to java.time - DateTimePickerFragment #4552

wants to merge 7 commits into from
+410 −531

Conversation

rapterjet2004
Copy link
Contributor

@rapterjet2004 rapterjet2004 commented Dec 17, 2024 •
edited
Loading

#4274

Migrating to java.time would remove so much code in DateTimePickerFragment that I figured I might as well also convert the dialog fragment to compose too. Honestly looks and feels way better now.

  • Added DateTimeCompose
    • Embedded the Date and Time pickers into the dialog
  • Removed DateTimeFragment + XML
  • Now uses java.time for all-in-one timezone handling + more robust features, instead of java.util.Calendar and java.util.TimeZone

Core logic

        val laterToday = LocalDateTime.now()
            .withHour(18)
            .withMinute(0)
            .withSecond(0)

        val tomorrow = LocalDateTime.now()
            .plusDays(1)
            .withHour(8)
            .withMinute(0)
            .withSecond(0)

        val thisWeekend = LocalDateTime.now()
            .with(nextOrSame(DayOfWeek.SATURDAY))
            .withHour(8)
            .withMinute(0)
            .withSecond(0)
        
        val nextWeek = LocalDateTime.now()
            .plusWeeks(1)
            .with(DayOfWeek.MONDAY)
            .withHour(8)
            .withMinute(0)
            .withSecond(0)
issue-4274.webm

🚧 TODO

  • Delete the old fragment + xml
  • Making the labels strings res
  • Checking the offset from datePicker
  • Theming

🏁 Checklist

  • ⛑️ Tests (unit and/or integration) are included or not needed
  • 🔖 Capability is checked or not needed
  • 🔙 Backport requests are created or not needed: /backport to stable-xx.x
  • 📅 Milestone is set
  • 🌸 PR title is meaningful (if it should be in the changelog: is it meaningful to users?)

@rapterjet2004 rapterjet2004 added the 2. developing Work in progress label Dec 17, 2024
@rapterjet2004 rapterjet2004 self-assigned this Dec 17, 2024
@rapterjet2004 rapterjet2004 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 19, 2024
@rapterjet2004 rapterjet2004 marked this pull request as ready for review December 19, 2024 15:32
@rapterjet2004 rapterjet2004 force-pushed the issue-4274-migrate-javautil-date-time-1 branch from 99f1c46 to bcb7b60 Compare December 20, 2024 14:53
sowjanyakch

This comment was marked as resolved.

Sign in to view

@nickvergessen nickvergessen removed their request for review January 7, 2025 05:36
mahibi
mahibi requested changes Jan 7, 2025
View reviewed changes
Copy link
Collaborator

@mahibi mahibi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

worked fine for me when testing. Was not able to reproduce the reported issues from Sowjanya.

app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimeCompose.kt Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimeCompose.kt Show resolved Hide resolved
app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimeCompose.kt Show resolved Hide resolved
@mahibi
Copy link
Collaborator

mahibi commented Jan 9, 2025

i'm currently looking into the lint warings regarding the Uyghur(ug) translations so we don't have to merge with red CI

@rapterjet2004 @mahibi
Migrating away from java.util.Date to java.time
0ba2b34 
- Also converted dialog fragment to compose

Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 @mahibi
Small fixes - new theming
6289371 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 @mahibi
Deleted old fragment + xml
ebb2d0d 
Added string res
Fixed bug with embedded date picker boundaries, animated size change

Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 @mahibi
linter
f75b368 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 @mahibi
linter
c4be96a 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 @mahibi
oops
f5fece9 
Signed-off-by: rapterjet2004 <[email protected]>
@rapterjet2004 @mahibi
Impl changes, unable to replicate 1.)
dcffa62 
Signed-off-by: rapterjet2004 <[email protected]>
@mahibi mahibi force-pushed the issue-4274-migrate-javautil-date-time-1 branch from 7418847 to dcffa62 Compare January 9, 2025 16:51
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 9, 2025

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/4552-talk.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 9, 2025

Codacy

Lint

TypemasterPR
Warnings158106
Errors6692

SpotBugs

CategoryBaseNew
Bad practice66
Correctness222222
Dodgy code7171
Internationalization33
Malicious code vulnerability33
Performance44
Security11
Total310310

Lint increased!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mahibi mahibi Awaiting requested review from mahibi

@sowjanyakch sowjanyakch Awaiting requested review from sowjanyakch

Requested changes must be addressed to merge this pull request.

Assignees

@rapterjet2004 rapterjet2004

Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rapterjet2004 @mahibi @sowjanyakch