Rebase: main onto gsoc-final-project-2025#947
Open
NihalDR wants to merge 69 commits intoCCExtractor:mainfrom
Open
Rebase: main onto gsoc-final-project-2025#947NihalDR wants to merge 69 commits intoCCExtractor:mainfrom
NihalDR wants to merge 69 commits intoCCExtractor:mainfrom
Conversation
…l widget errors, and resolve overflow issues
Firestore authcheck
SQLite Database Schema Migration for Alarm Clock App
Resolved merge conflicts between shared alarm functionality and system ringtones: - Combined shared alarm features with system ringtone support - Merged MainActivity.kt with both shared alarm methods and system ringtone methods - Integrated time input controllers with shared alarm functionality - Preserved both notification systems and audio management - Fixed all import conflicts and maintained backward compatibility Features merged: ✅ Shared alarm functionality with push notifications ✅ System ringtone selection and playback ✅ Max snooze count settings ✅ Time input controllers ✅ Guardian angel improvements ✅ Audio focus management ✅ Controller lifecycle improvements
…ed alarm functionality - Combined negative condition alarm logic (4 activity condition types) with shared alarm system - Updated database schema to version 3 with activityConditionType and weatherConditionType columns - Enhanced AlarmReceiver to support both shared and local alarms with proper logging - Updated BootReceiver with shared alarm rescheduling after boot - Modified MainActivity with proper alarm cancellation logic preserving dual alarm types - Fixed database providers to support both Firestore (shared) and SQLite (local) storage - Integrated AlarmUtils.scheduleAlarm calls throughout the system
added negative condition
- Fixed snooze button instantly closing when duration is 0 - Added default 5-minute snooze when snoozeDuration is 0 or unset - Enhanced debug logs UI with improved cards and filtering - Added sunrise alarm effect widget for visual wake-up experience - Improved alarm ring controller with better error handling - Enhanced shared alarm functionality and location/weather conditions
…ed alarm features
- Remove node_modules/ directory (58 files) from version control - Remove ios/Podfile.lock from tracking - Update .gitignore to prevent future build artifacts - Add comprehensive ignore patterns for build/, gradle/, lock files - Clean up repository for professional GSoC submission This removes unnecessary artifacts while preserving all legitimate GSoC work.
Fix/alarm bugs
…ssions are denied (CCExtractor#889)
Co-authored-by: Inderjeet Singh <inderjet05@gmail.com>
…tor#915) Fixes CCExtractor#914 - Removed duplicate import of debug_view.dart - Removed unused import of DebugController - Resolves analyzer warnings that fail CI
* Implement a graceful UI fallback when system ringtones are unavailable on iOS * fix(android): remove null-unsafe unwraps in location/weather services Resolve crash-prone null assertions in LocationFetcherService and WeatherFetcherService with guarded parsing, logging, and graceful exits.\n\nCloses CCExtractor#931 * fix(android): make foreground start API-safe for minSdk 24 Use SDK-gated foreground service startup to avoid 3-arg startForeground on older Android versions.\n\nRefs CCExtractor#933
…tractor#926) * Implement a graceful UI fallback when system ringtones are unavailable on iOS * Update alarm_challenge_controller.dart * Update share_dialog.dart * Fix email validation regex in share_dialog.dart * docs: reflect support for subdomains and hyphens in shared emails
* fix: Stopped the laggy UI animation everytime the app is rebuilt * fix: Used confirmDismiss instead of ondismissed which prevents unnecessary rebuilds and error * fix: prevents default animation for when multipleSelected mode is true
…CCExtractor#833) * Stage 1: Added alarmDate parameter to timeUntilAlarm * Updated and Controller * Done
Co-authored-by: Kush Choudhary <kushchoudhary@Kushs-MacBook-Pro.local>
…loop cancellation (CCExtractor#902)
…inute without offset (CCExtractor#881)
…actor#940) * feat(world-clock): add visible remove action for added clocks * Enhance Shared Alarm System to Support Full Alarm Feature Set - Extend shared alarm payload to include full alarm configuration and payload versioning - Reconstruct accepted alarms from full payload with backward-compatible fallback - Improve notification UI with time, label, and repeat schedule details - Add robust deserialization defaults for legacy/partial payloads - Add tests for serialization compatibility and notification payload parsing Refs CCExtractor#939 * Delete test/shared_alarm_payload_test.dart
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
10 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.
Description
This PR rebases the
mainbranch ontoorigin/gsoc-final-project-2025to incorporate the latest changes from the GSoC 2025 final project branch into the current development flow. The objective is to maintain a clean, linear history while resolving critical infrastructure and logic conflicts.Key Changes
Kotlin Syntax Fix (LocationFetcherService.kt)
Resolved a compilation issue caused by an extra closing brace that was breaking the class structure.
Alarm Model Conflict Resolution (alarm_model.dart)
Refactored the model to address merge conflicts involving shadowed variables (
rawDatavsalarmData).Implemented safer per-user offset selection with appropriate fallback logic.
Manual Verification
Ensured that all field accesses in Dart models correctly reference the intended data maps after the rebase.
Rebase Details
origin/gsoc-final-project-2025mainConflicts Encountered
LocationFetcherService.kt(structural/syntax issue)alarm_model.dart(logic and variable shadowing)Steps to Review
alarm_model.dart, especially userId mapping and offset logic, to ensure there are no regressions.Note
This rebase ensures that the
mainbranch aligns with the final structural and architectural changes from the GSoC 2025 lifecycle.