Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add back sponsor banner #6

Merged
merged 2 commits into from
Oct 8, 2024
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
6 changes: 2 additions & 4 deletions lib/app.dart
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import 'package:flutter/material.dart';
import 'package:method_conf_app/providers/conference_provider.dart';
import 'package:method_conf_app/providers/sponsor_provider_v2.dart';
import 'package:method_conf_app/providers/sponsor_provider.dart';
import 'package:provider/provider.dart';

import 'package:method_conf_app/providers/session_provider.dart';
import 'package:method_conf_app/providers/speaker_provider.dart';
import 'package:method_conf_app/providers/sponsor_provider.dart';
import 'package:method_conf_app/theme.dart';
import 'package:method_conf_app/widgets/app_navigation.dart';

Expand All @@ -22,10 +21,9 @@ class App extends StatelessWidget {
var s = Provider.of<SpeakerProvider>(context, listen: false);
return SessionProvider(speakerProvider: s);
}),
ChangeNotifierProvider(create: (context) => SponsorProvider()),
ChangeNotifierProvider(create: (context) {
var c = Provider.of<ConferenceProvider>(context, listen: false);
return SponsorProviderV2(conferenceProvider: c);
return SponsorProvider(conferenceProvider: c);
})
],
child: MaterialApp(
Expand Down
61 changes: 61 additions & 0 deletions lib/data/umbraco/models/api_link_model.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:method_conf_app/data/umbraco/models/api_content_response_model_base.dart';
import 'package:method_conf_app/data/umbraco/utils.dart';
import 'package:method_conf_app/env.dart';

part 'api_link_model.g.dart';

@JsonSerializable()
class ApiLinkModel {
String? url;
String? queryString;
String? title;
String? target;
String? destinationId;
String? destinationType;
ApiContentRouteModel? route;
@JsonKey(readValue: readLowerCase)
LinkType linkType;

ApiLinkModel({
this.url,
this.queryString,
this.title,
this.target,
this.destinationId,
this.destinationType,
this.route,
required this.linkType,
});

String? get fullUrl {
final path = route?.path;
final u = url;
return switch (linkType) {
LinkType.content when path != null => _getWithQs(_withSitePrefix(path)),
LinkType.external when u != null => _getWithQs(u),
LinkType.media when u != null => _getWithQs(_withSitePrefix(u)),
_ => null,
};
}

String _withSitePrefix(String urlStr) {
return Env.umbracoBaseUrl + urlStr;
}

String _getWithQs(String urlStr) {
final qs = queryString;
return qs != null ? urlStr + qs : urlStr;
}

factory ApiLinkModel.fromJson(Map<String, dynamic> json) =>
_$ApiLinkModelFromJson(json);

Map<String, dynamic> toJson() => _$ApiLinkModelToJson(this);
}

enum LinkType {
content,
external,
media,
}
7 changes: 1 addition & 6 deletions lib/data/umbraco/models/sponsor_tier.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:method_conf_app/data/umbraco/models/api_block_list_model.dart';
import 'package:method_conf_app/data/umbraco/models/sponsor.dart';
import 'package:method_conf_app/data/umbraco/utils.dart';

part 'sponsor_tier.g.dart';

Expand All @@ -21,10 +22,6 @@ class SponsorTier extends ApiElementModel {
Map<String, dynamic> toJson() => _$SponsorTierToJson(this);
}

String readLowerCase(Map<dynamic, dynamic> json, String key) {
return json[key].toString().toLowerCase();
}

@JsonSerializable()
class SponsorTierProperties {
String? title;
Expand All @@ -33,15 +30,13 @@ class SponsorTierProperties {
@JsonKey(name: 'sponsors')
ApiBlockListModel? sponsorsBlockList;

@JsonKey(includeToJson: false)
List<Sponsor> get sponsors =>
sponsorsBlockList?.items
.map((item) => item.content)
.whereType<Sponsor>()
.toList() ??
[];

@JsonKey(includeToJson: false)
List<Sponsor> get mobileAppSponsors => sponsors
.where((sponsor) => sponsor.properties?.mobileAppSponsor ?? false)
.toList();
Expand Down
9 changes: 8 additions & 1 deletion lib/data/umbraco/models/sponsors.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:method_conf_app/data/umbraco/models/api_block_list_model.dart';
import 'package:method_conf_app/data/umbraco/models/api_content_response_model_base.dart';
import 'package:method_conf_app/data/umbraco/models/api_link_model.dart';
import 'package:method_conf_app/data/umbraco/models/sponsor_tier.dart';

part 'sponsors.g.dart';
Expand Down Expand Up @@ -31,6 +32,8 @@ class Sponsors extends ApiContentResponseModelBase {
class SponsorsProperties {
@JsonKey(name: 'tiers')
ApiBlockListModel? tiersBlockList;
@JsonKey(name: 'opportunitiesUrl')
List<ApiLinkModel> opportunitiesUrlList;

@JsonKey(includeToJson: false)
List<SponsorTier> get tiers =>
Expand All @@ -40,7 +43,11 @@ class SponsorsProperties {
.toList() ??
[];

SponsorsProperties({this.tiersBlockList});
@JsonKey(includeToJson: false)
ApiLinkModel? get opportunitiesUrl => opportunitiesUrlList.firstOrNull;

SponsorsProperties(
{this.tiersBlockList, this.opportunitiesUrlList = const []});

factory SponsorsProperties.fromJson(Map<String, dynamic> json) =>
_$SponsorsPropertiesFromJson(json);
Expand Down
3 changes: 3 additions & 0 deletions lib/data/umbraco/utils.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
String readLowerCase(Map<dynamic, dynamic> json, String key) {
return json[key].toString().toLowerCase();
}
25 changes: 0 additions & 25 deletions lib/models/sponsor.dart

This file was deleted.

100 changes: 60 additions & 40 deletions lib/providers/sponsor_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,69 +2,89 @@ import 'dart:convert';

import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:http/http.dart' as http;
import 'package:method_conf_app/data/umbraco/get_child_nodes_of_type.dart';
import 'package:method_conf_app/data/umbraco/models/sponsor_tier.dart';
import 'package:method_conf_app/data/umbraco/models/sponsors.dart';
import 'package:method_conf_app/providers/conference_provider.dart';

import 'package:method_conf_app/env.dart';
import 'package:method_conf_app/models/sponsor.dart';

const sponsorKey = 'app-sponsrs';
const _sponsorsStorageKey = 'app-sponsors-v2';

class SponsorProvider extends ChangeNotifier {
bool _initialFetched = false;
ConferenceProvider conferenceProvider;

List<Sponsor> _sponsors = [];
Sponsors? _sponsors;

List<Sponsor> get sponsors {
return _sponsors;
}
Sponsors? get sponsors => _sponsors;

set sponsors(List<Sponsor> newSponsors) {
_sponsors = newSponsors;
set sponsors(Sponsors? value) {
_sponsors = value;
notifyListeners();
}

List<Sponsor> get largeSponsors {
return sponsors.where((s) => s.mobileSponsor!).toList();
List<SponsorTier> get sponsorTiers =>
sponsors?.properties?.tiers
.where(
(tier) => tier.properties?.mobileAppSponsors.isNotEmpty ?? false)
.toList() ??
[];

SponsorProvider({required this.conferenceProvider});

Future<void> init() async {
await conferenceProvider.init(enableBackgroundRefresh: false);

sponsors ??= await load();

if (sponsors == null) {
await refresh();
} else {
refresh();
}
}

List<Sponsor> get normalSponsors {
return sponsors.where((s) => !s.mobileSponsor!).toList();
Future<Sponsors?> load() async {
var prefs = await SharedPreferences.getInstance();

final jsonString = prefs.getString(_sponsorsStorageKey);
return jsonString != null
? Sponsors.fromJson(json.decode(jsonString))
: null;
}

Future<void> fetchInitialSponsors() async {
if (_initialFetched) {
Future<void> store(Sponsors? newSponsors) async {
var prefs = await SharedPreferences.getInstance();

if (newSponsors == null) {
await prefs.remove(_sponsorsStorageKey);
return;
}

var prefs = await SharedPreferences.getInstance();
await prefs.setString(
_sponsorsStorageKey, json.encode(newSponsors.toJson()));
}

sponsors = prefs
.getStringList(sponsorKey)
?.map((s) => Sponsor.fromJson(json.decode(s)))
.toList() ??
[];
Future<Sponsors?> fetch() async {
var conference = conferenceProvider.conference;

if (sponsors.isNotEmpty) {
// refresh in background if we found some in storage
fetchSponsors();
} else {
await fetchSponsors();
if (conference == null) {
return null;
}

_initialFetched = true;
}
var item =
await getFirstChildNodeOfType(nodeId: conference.id, type: 'sponsors');

Future<void> fetchSponsors() async {
var url = Uri.parse('${Env.methodBaseUrl}/sponsors.json');
var res = await http.get(url);
if (item is! Sponsors) {
return null;
}

sponsors = (json.decode(res.body)['data'] as List<dynamic>)
.map((s) => Sponsor.fromJson(s))
.toList();
return item;
}

var prefs = await SharedPreferences.getInstance();
Future<void> refresh() async {
final newSponsors = await fetch();

sponsors = newSponsors;

var sponsorsJson = sponsors.map((s) => json.encode(s.toJson())).toList();
await prefs.setStringList(sponsorKey, sponsorsJson);
await store(newSponsors);
}
}
Loading