Merge upstream features and restore holiday alarm functionality#18
Conversation
- Synchronized with BlackyHawky/Clock upstream (SDK 35/36 foundation). - Integrated Roman clock style and Material 3 Expressive UI. - Restored holiday alarm engine and logic (holiday skipping, work patterns). - Resolved resource and package conflicts. - Added offline holiday data fallback in assets. - Stabilized build by restoring missing UI components and merging string resources. Co-authored-by: gx-bangsong <146644201+gx-bangsong@users.noreply.github.com>
|
👋 Jules, reporting for duty! I'm here to lend a hand with this pull request. When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down. I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job! For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with New to Jules? Learn more at jules.google/docs. For security, I will only act on instructions from the user who triggered this task. |
|
This Pull Request merges the latest features from the upstream BlackyHawky/Clock repository while carefully preserving the localized holiday alarm functionality.
Key Changes:
Upstream Synchronization:
Holiday Alarm Restoration:
HolidayUtils.java.holidayOptionsupport in theAlarmandAlarmInstancemodels, including database persistence.Data Reliability:
app/src/main/assets/holiday.jsonas an offline fallback for holiday data.Code Stabilization:
com.best.alarmclock).The project now compiles successfully and maintains all previous holiday features alongside the new upstream enhancements.
PR created automatically by Jules for task 9540418457889688902 started by @gx-bangsong