Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/core/models/events.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class EventModel {
Map<String, dynamic> toJson() => {
"title": title,
"description": description,
"startDate": startDate,
"endDate": endDate,
"startDate": startDate.toIso8601String(),
"endDate": endDate.toIso8601String(),
"imageHQ": imageHQ,
"imageThumb": imageThumb,
"link": link,
Expand Down
112 changes: 100 additions & 12 deletions lib/core/providers/events.dart
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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<EventModel> 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<void> 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<void> 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<void> 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<EventModel> get eventsModels => _eventsModels;
Expand Down
4 changes: 0 additions & 4 deletions lib/core/services/events.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/events/event_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class EventTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
// Show loading indicator while data is loading
if (Provider.of<EventsDataProvider>(context).isLoading) {
if (Provider.of<EventsDataProvider>(context).isLoading && !Provider.of<EventsDataProvider>(context).hasData) {
return Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.secondary));
}
return _buildEventTile(context);
Expand Down
22 changes: 19 additions & 3 deletions lib/ui/events/events_card.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<EventsCard> createState() => _EventsCardState();
}

class _EventsCardState extends State<EventsCard> {
@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<EventsDataProvider>().loadFromCache();
}

@override
Widget build(BuildContext context) {
return CardContainer(
cardId: cardId,
active: context.select((CardsDataProvider p) => p.cardStates[cardId] ?? false),
hide: () => Provider.of<CardsDataProvider>(context, listen: false).toggleCard(cardId),
reload: () => Provider.of<EventsDataProvider>(context, listen: false).fetchEvents(),
isLoading: Provider.of<EventsDataProvider>(context).isLoading,
reload: () => Provider.of<EventsDataProvider>(context, listen: false).reload(cardId),
isLoading:
Provider.of<EventsDataProvider>(context).isRefreshing(cardId) ||
(Provider.of<EventsDataProvider>(context).isLoading && !Provider.of<EventsDataProvider>(context).hasData),
titleText: CardTitleConstants.TITLE_MAP[cardId]!,
errorText: Provider.of<EventsDataProvider>(context).error,
child: () => buildEventsCardList(Provider.of<EventsDataProvider>(context).eventsModels),
Expand Down
5 changes: 3 additions & 2 deletions lib/ui/events/events_card_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ class EventsCardList extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Provider.of<EventsDataProvider>(context).isLoading
final provider = Provider.of<EventsDataProvider>(context);
return provider.isLoading && !provider.hasData
? Center(child: CircularProgressIndicator(color: Theme.of(context).colorScheme.secondary))
: buildEventsList(Provider.of<EventsDataProvider>(context).eventsModels, context);
: buildEventsList(provider.eventsModels, context);
}

Widget buildEventsList(List<EventModel> listOfEvents, BuildContext context) {
Expand Down
10 changes: 4 additions & 6 deletions lib/ui/events/events_view_all.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ class EventsAll extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Provider.of<EventsDataProvider>(context).isLoading
final provider = Provider.of<EventsDataProvider>(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<EventsDataProvider>(context).eventsModels, context),
);
: Padding(padding: const EdgeInsets.only(top: 16.0), child: buildEventsList(provider.eventsModels, context));
}

Widget buildEventsList(List<EventModel> listOfEvents, BuildContext context) {
Expand All @@ -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.')));
Expand Down
Loading