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

Improvement: Hoppity Live Display Date/Time #2973

Merged
merged 29 commits into from
Dec 15, 2024
Merged

Improvement: Hoppity Live Display Date/Time #2973

merged 29 commits into from
Dec 15, 2024

Conversation

DavidArthurCole
Copy link
Contributor

@DavidArthurCole DavidArthurCole commented Nov 22, 2024 •
edited by hannibal002
Loading

What

Adds a toggleable and formattable date/time display to Hoppity Live Event cards, that can be configured to show for Past/Current/Future events separately.

Also did some technical cleanup of some of the Date/Time logic that the hoppity codebase was relying on.

Images

image

image

image

image

Changelog Improvements

  • Added option to display Date/Time on Hoppity Event Live Display. - Daveed

@github-actions github-actions bot added the Detekt Has detekt problem label Nov 22, 2024
@github-actions GitHub Actions
Copy link

One or more Detekt Failures were detected:

@github-actions GitHub Actions
Copy link

One or more Detekt Failures were detected:

@github-actions github-actions bot removed the Detekt Has detekt problem label Nov 22, 2024
@hannibal002 hannibal002 added this to the Version 0.28 milestone Nov 23, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Nov 23, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 24, 2024
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 24, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 5, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 5, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 5, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 5, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Detekt Has detekt problem label Dec 5, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 5, 2024

One or more Detekt Failures were detected:

@github-actions github-actions bot removed the Detekt Has detekt problem label Dec 5, 2024
@github-actions github-actions bot removed the Detekt Has detekt problem label Dec 9, 2024
@CalMWolfs CalMWolfs mentioned this pull request Dec 10, 2024
Merged
hannibal002
hannibal002 requested changes Dec 13, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

with next event disabled:

image

with next event enabled:
image

when selected, this not only shows the time, but also adds the option to show the the next event at all. this behaviour feels unintended when reading the changelog. either always show the next event or change the changelog/config option that the next event is visible only when the setting inclused "next event" please.

@DavidArthurCole
Copy link
Contributor Author

when selected, this not only shows the time, but also adds the option to show the the next event at all. this behaviour feels unintended

This was intentional - I will try to fix the config to make more sense.

@DavidArthurCole DavidArthurCole mentioned this pull request Dec 13, 2024
Merged
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 14, 2024
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@CalMWolfs
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/HoppityGuiDa…
97edd6f 
…teTime

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEventSummary.kt
@CalMWolfs
fix merge
2e7cf1f
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 14, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 enabled auto-merge (squash) December 15, 2024 12:53
@hannibal002 hannibal002 merged commit 542c619 into hannibal002:beta Dec 15, 2024
6 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Dec 15, 2024
@DavidArthurCole DavidArthurCole deleted the HoppityGuiDateTime branch December 16, 2024 13:17
@hannibal002 hannibal002 changed the title Feature: Hoppity Live Display Date/Time Improvement: Hoppity Live Display Date/Time Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hannibal002 hannibal002 Awaiting requested review from hannibal002

@CalMWolfs CalMWolfs Awaiting requested review from CalMWolfs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.0 (old Version 0.28)
Development

Successfully merging this pull request may close these issues.
3 participants
@DavidArthurCole @hannibal002 @CalMWolfs