chore: sync fork with upstream (3 commits) - #53
Merged
Conversation
…min#267) The desktop pet slider topped out at 192px. Double the maximum so the companion can be sized up to 384px. Sprites render with `.interpolation(.none)`, so the extra scale stays crisp pixel art instead of blurring, and `FloatingPetController` already observes `floatingPetSize`, so the panel resizes with the sprite as the slider moves. Also cover the other branch of `max(petSize, bubbleMinWidth)`, where the pet drives the panel width rather than the bubble column. Only 184 and 192 reached it before; now it is most of the range. Claude-Session: https://claude.ai/code/session_01X91ErNfhphSw9gC1pqjjjN Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> (cherry picked from commit cd3125a)
…d weekly) (chattymin#263) * feat: enhance 5-hour reset display with reset time aside countdown * feat: enhance weekly reset display with reset date and time aside countdown (with weekday if not near) * chore: update staled comment about weekly relative-only display (cherry picked from commit f2fe5ac)
) * feat: trigger immediate refresh upon network reconnection * fix: add lock synchronization and flapping debounce to NetworkReachabilityMonitor (cherry picked from commit b34673a)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Sync
Catches the fork up with
chattymin/PokeTokenBar@main(now atb34673a).Includes 3 new upstream commits:
cd3125a— feat: raise the floating pet size ceiling from 192px to 384px (feat: raise the floating pet size ceiling from 192px to 384px chattymin/PokeTokenBar#267)f2fe5ac— Show the absolute reset time next to limit countdowns (both 5-hour and weekly) (Show the absolute reset time next to limit countdowns (both 5-hour and weekly) chattymin/PokeTokenBar#263)b34673a— feat: trigger immediate refresh upon network reconnection (feat: trigger immediate refresh upon network reconnection chattymin/PokeTokenBar#252)Conflict Resolution
Sources/PokeTokenBar/Core/UsageStore.swift:NetworkReachabilityMonitorto trigger immediate refresh on network reconnection.displayAsleepandrestoreFullPolling()instead of upstream'spollingSuspendedandresumePolling()).Verification
./scripts/test-gate.sh— 1080 tests, 0 failures (13 skipped); logic-core line coverage 91.46% ≥ 75%.xcodebuild -scheme PokeTokenBariOS -destination 'generic/platform=iOS' build— BUILD SUCCEEDED.swift build— BUILD SUCCEEDED.