diff --git a/lib/core/models/events.dart b/lib/core/models/events.dart index 12f059a81..8d8f0232a 100644 --- a/lib/core/models/events.dart +++ b/lib/core/models/events.dart @@ -51,8 +51,8 @@ class EventModel { Map toJson() => { "title": title, "description": description, - "startDate": startDate, - "endDate": endDate, + "startDate": startDate.toIso8601String(), + "endDate": endDate.toIso8601String(), "imageHQ": imageHQ, "imageThumb": imageThumb, "link": link, diff --git a/lib/core/providers/events.dart b/lib/core/providers/events.dart index 0b77ef86a..f443e02a4 100644 --- a/lib/core/providers/events.dart +++ b/lib/core/providers/events.dart @@ -1,10 +1,13 @@ import 'package:campus_mobile_experimental/core/models/events.dart'; import 'package:campus_mobile_experimental/core/services/events.dart'; import 'package:flutter/material.dart'; +import 'package:hive/hive.dart'; class EventsDataProvider extends ChangeNotifier { /// STATES bool _isLoading = false; + String? _refreshingCardId; + bool _modelInitialized = false; DateTime? _lastUpdated; String? _error; @@ -14,25 +17,110 @@ class EventsDataProvider extends ChangeNotifier { /// SERVICES var _eventsService = EventsService(); - void fetchEvents() async { + /// The single apply step for both the cache path and the network path. + /// An empty list is a valid applied model. + void _applyModels(List models) { + _eventsModels = models; + _modelInitialized = true; + + /// Re-derive the empty-state text on every apply; this also clears + /// whatever error an earlier state left behind. + _error = _eventsModels.isEmpty ? 'No events found.' : null; + } + + Future loadFromCache() async { + if (_modelInitialized) return; + + try { + final box = await Hive.openBox('EventsModel'); + final cachedJson = box.get('EventsModel') as String?; + + if (cachedJson == null || cachedJson.isEmpty) return; + + final cachedModels = eventModelFromJson(cachedJson); + + /// A fetch may have applied newer data while the box was opening; + /// never let stale cache overwrite it. + if (_modelInitialized) return; + + _applyModels(cachedModels); + notifyListeners(); + } catch (e) { + /// A cache miss or unreadable cache is not an error; + /// the network fetch remains the source of truth. + print('Failed to load events from cache: $e'); + } + } + + Future fetchEvents() async { + if (_isLoading) return; + _isLoading = true; - _error = null; + + /// Only clear a visible error when nothing is displayed behind it. + if (!_modelInitialized) _error = null; notifyListeners(); - if (await _eventsService.fetchData()) { - _eventsModels = _eventsService.eventsModels!; - _lastUpdated = DateTime.now(); - - /// check to see if the events feed returns nothing back - if (_eventsModels.isEmpty) _error = 'No events found.'; - } else { - _error = _eventsService.error; + + String? cacheJson; + try { + if (await _eventsService.fetchData()) { + final fetchedModels = _eventsService.eventsModels!; + final newJson = eventModelToJson(fetchedModels); + + /// Skip the redundant apply and cache write if the fresh data + /// matches what is already displayed. + if (_modelInitialized && newJson == eventModelToJson(_eventsModels)) { + return; + } + + /// Show fresh data immediately; persist to cache afterwards. + /// An empty fetch must not clobber cached events or block the + /// cache from applying afterwards. + if (fetchedModels.isNotEmpty) { + _applyModels(fetchedModels); + _lastUpdated = DateTime.now(); + cacheJson = newJson; + } else if (!_modelInitialized) { + _error = 'No events found.'; + } + } else { + /// Keep whatever is displayed; only surface an error when the card + /// has nothing to show. + if (!_modelInitialized) _error = _eventsService.error; + } + } catch (e) { + /// Never let an unexpected failure wedge the card in a loading state. + if (!_modelInitialized) _error = e.toString(); + } finally { + _isLoading = false; + notifyListeners(); + } + + /// A failed cache write must not discard the fresh UI update. + if (cacheJson != null) { + try { + final box = await Hive.openBox('EventsModel'); + await box.put('EventsModel', cacheJson); + } catch (_) {} + } + } + + Future reload(String cardId) async { + if (_isLoading || _refreshingCardId != null) return; + + _refreshingCardId = cardId; + try { + await fetchEvents(); + } finally { + _refreshingCardId = null; + notifyListeners(); } - _isLoading = false; - notifyListeners(); } ///SIMPLE GETTERS get isLoading => _isLoading; + bool isRefreshing(String cardId) => _refreshingCardId == cardId; + bool get hasData => _modelInitialized; get error => _error; get lastUpdated => _lastUpdated; List get eventsModels => _eventsModels; diff --git a/lib/core/services/events.dart b/lib/core/services/events.dart index 4c51e6320..55e47c3e8 100644 --- a/lib/core/services/events.dart +++ b/lib/core/services/events.dart @@ -4,10 +4,6 @@ import 'package:campus_mobile_experimental/core/models/events.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; class EventsService { - EventsService() { - fetchData(); - } - /// STATES bool _isLoading = false; DateTime? _lastUpdated; diff --git a/lib/ui/events/event_tile.dart b/lib/ui/events/event_tile.dart index d42fcfd95..e64d602a6 100644 --- a/lib/ui/events/event_tile.dart +++ b/lib/ui/events/event_tile.dart @@ -21,7 +21,7 @@ class EventTile extends StatelessWidget { @override Widget build(BuildContext context) { // Show loading indicator while data is loading - if (Provider.of(context).isLoading) { + if (Provider.of(context).isLoading && !Provider.of(context).hasData) { return Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.secondary)); } return _buildEventTile(context); diff --git a/lib/ui/events/events_card.dart b/lib/ui/events/events_card.dart index 3497e1da2..1de0dd953 100644 --- a/lib/ui/events/events_card.dart +++ b/lib/ui/events/events_card.dart @@ -12,15 +12,31 @@ import 'package:provider/provider.dart'; const cardId = 'events'; // edit these files -class EventsCard extends StatelessWidget { +class EventsCard extends StatefulWidget { + @override + State createState() => _EventsCardState(); +} + +class _EventsCardState extends State { + @override + void initState() { + super.initState(); + + /// Render path: hydrate from the local cache immediately. + /// The silent refresh is owned by the provider's create-time fetch. + context.read().loadFromCache(); + } + @override Widget build(BuildContext context) { return CardContainer( cardId: cardId, active: context.select((CardsDataProvider p) => p.cardStates[cardId] ?? false), hide: () => Provider.of(context, listen: false).toggleCard(cardId), - reload: () => Provider.of(context, listen: false).fetchEvents(), - isLoading: Provider.of(context).isLoading, + reload: () => Provider.of(context, listen: false).reload(cardId), + isLoading: + Provider.of(context).isRefreshing(cardId) || + (Provider.of(context).isLoading && !Provider.of(context).hasData), titleText: CardTitleConstants.TITLE_MAP[cardId]!, errorText: Provider.of(context).error, child: () => buildEventsCardList(Provider.of(context).eventsModels), diff --git a/lib/ui/events/events_card_list.dart b/lib/ui/events/events_card_list.dart index 5aa81e9f0..e36817e1d 100644 --- a/lib/ui/events/events_card_list.dart +++ b/lib/ui/events/events_card_list.dart @@ -12,9 +12,10 @@ class EventsCardList extends StatelessWidget { @override Widget build(BuildContext context) { - return Provider.of(context).isLoading + final provider = Provider.of(context); + return provider.isLoading && !provider.hasData ? Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.secondary)) - : buildEventsList(Provider.of(context).eventsModels, context); + : buildEventsList(provider.eventsModels, context); } Widget buildEventsList(List listOfEvents, BuildContext context) { diff --git a/lib/ui/events/events_view_all.dart b/lib/ui/events/events_view_all.dart index aff7d1876..269c8acba 100644 --- a/lib/ui/events/events_view_all.dart +++ b/lib/ui/events/events_view_all.dart @@ -10,12 +10,10 @@ class EventsAll extends StatelessWidget { @override Widget build(BuildContext context) { - return Provider.of(context).isLoading + final provider = Provider.of(context); + return provider.isLoading && !provider.hasData ? Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.secondary)) - : Padding( - padding: const EdgeInsets.only(top: 16.0), - child: buildEventsList(Provider.of(context).eventsModels, context), - ); + : Padding(padding: const EdgeInsets.only(top: 16.0), child: buildEventsList(provider.eventsModels, context)); } Widget buildEventsList(List listOfEvents, BuildContext context) { @@ -32,8 +30,8 @@ class EventsAll extends StatelessWidget { crossAxisCount: 2, crossAxisSpacing: 1, mainAxisSpacing: 8, + mainAxisExtent: 300, children: eventTiles, - childAspectRatio: MediaQuery.of(context).size.width / (MediaQuery.of(context).size.height / 1.4), ); } else { return ContainerView(child: Center(child: Text('No events found.')));