From ca461c8170bdaabd263aade2c32d136bf38a82f6 Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Fri, 5 Nov 2021 09:23:52 +0900
Subject: [PATCH 1/7] feat: Added entitlement files to receive app links
---
android/app/src/main/AndroidManifest.xml | 10 ++++++++++
ios/Runner/Runner.entitlements | 10 ++++++++++
pubspec.lock | 21 +++++++++++++++++++++
pubspec.yaml | 1 +
4 files changed, 42 insertions(+)
create mode 100644 ios/Runner/Runner.entitlements
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d9d4ab5..968087e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -34,6 +34,16 @@
+
+
+
+
+
+
+
+
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
new file mode 100644
index 0000000..50c4113
--- /dev/null
+++ b/ios/Runner/Runner.entitlements
@@ -0,0 +1,10 @@
+
+
+
+
+ com.apple.developer.associated-domains
+
+ applinks:spotvideo.app
+
+
+
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index bea221c..e012681 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -838,6 +838,27 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
+ uni_links:
+ dependency: "direct main"
+ description:
+ name: uni_links
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.5.1"
+ uni_links_platform_interface:
+ dependency: transitive
+ description:
+ name: uni_links_platform_interface
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "1.0.0"
+ uni_links_web:
+ dependency: transitive
+ description:
+ name: uni_links_web
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.1.0"
universal_io:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7c30409..b618612 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,6 +32,7 @@ dependencies:
flutter_video_info: ^1.2.0
shared_preferences: ^2.0.6
google_maps_cluster_manager: ^3.0.0+1
+ uni_links: ^0.5.1
dev_dependencies:
flutter_test:
From 0583557f247cfbe640903b09bdeb0db65b86ed69 Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Fri, 5 Nov 2021 13:53:09 +0900
Subject: [PATCH 2/7] feat: implemented logic to handle incoming app links
---
ios/Runner.xcodeproj/project.pbxproj | 11 +++++++++++
ios/Runner/Runner.entitlements | 10 +++++-----
lib/pages/tab_page.dart | 27 +++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index d29fcc9..72baf42 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -36,6 +36,7 @@
22230FEC84FAAF7E8AA781A7 /* Pods-Runner.release-development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-development.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-development.xcconfig"; sourceTree = ""; };
230C707E8D6A9E6A1DC18028 /* Pods-Runner.release-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-staging.xcconfig"; sourceTree = ""; };
2D785F1A266C2C4E00E43AE3 /* config */ = {isa = PBXFileReference; lastKnownFileType = folder; path = config; sourceTree = ""; };
+ 2DBBAF542734E8E30043162B /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; };
4019077285505CC6EADC6A13 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
451976F66DC4F31C5F96421B /* Pods-Runner.profile-development.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-development.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-development.xcconfig"; sourceTree = ""; };
@@ -103,6 +104,7 @@
97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup;
children = (
+ 2DBBAF542734E8E30043162B /* Runner.entitlements */,
97C146FA1CF9000F007C117D /* Main.storyboard */,
97C146FD1CF9000F007C117D /* Assets.xcassets */,
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -408,6 +410,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -545,6 +548,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -574,6 +578,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -658,6 +663,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -740,6 +746,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -819,6 +826,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -903,6 +911,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -985,6 +994,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -1064,6 +1074,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
+ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
index 50c4113..0d677e6 100644
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -2,9 +2,9 @@
- com.apple.developer.associated-domains
-
- applinks:spotvideo.app
-
+ com.apple.developer.associated-domains
+
+ applinks:spotvideo.app
+
-
\ No newline at end of file
+
diff --git a/lib/pages/tab_page.dart b/lib/pages/tab_page.dart
index 41166be..dae3fa1 100644
--- a/lib/pages/tab_page.dart
+++ b/lib/pages/tab_page.dart
@@ -12,9 +12,11 @@ import 'package:spot/pages/tabs/map_tab.dart';
import 'package:spot/pages/tabs/notifications_tab.dart';
import 'package:spot/pages/tabs/profile_tab.dart';
import 'package:spot/pages/tabs/search_tab.dart';
+import 'package:spot/pages/view_video_page.dart';
import 'package:spot/repositories/repository.dart';
import 'package:spot/utils/constants.dart';
import 'package:spot/utils/functions.dart';
+import 'package:uni_links/uni_links.dart';
import '../components/app_scaffold.dart';
import 'record_page.dart';
@@ -196,9 +198,34 @@ class TabPageState extends State {
@override
void initState() {
super.initState();
+ _setupAppLinks();
WidgetsBinding.instance
?.addObserver(LifecycleEventHandler(resumeCallBack: onResumed));
}
+
+ Future _setupAppLinks() async {
+ /// Quick and dirty way of
+ /// waiting until TabPage gets added to the widget tree.
+ await Future.delayed(const Duration(milliseconds: 300));
+
+ try {
+ final initialUri = await getInitialUri();
+ _handleAppLink(initialUri);
+ uriLinkStream.listen(_handleAppLink);
+ } catch (_) {
+ context.showErrorSnackbar('Error opening the video.');
+ }
+ }
+
+ void _handleAppLink(Uri? uri) {
+ if (uri != null) {
+ final path = uri.path;
+ if (path.split('/').first == 'post') {
+ final videoId = path.split('/').last;
+ Navigator.of(context).push(ViewVideoPage.route(videoId: videoId));
+ }
+ }
+ }
}
/// Class to listen to app lifecycle such as background and foreground.
From 5d06cd9af7fa6d5e96e6a53f0b2d91478d81c008 Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Fri, 5 Nov 2021 13:53:33 +0900
Subject: [PATCH 3/7] chore: bumped version
---
pubspec.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pubspec.yaml b/pubspec.yaml
index b618612..13199f7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
name: spot
description: Find local video posts
-version: 1.4.2+64
+version: 1.4.3+65
publish_to: none
environment:
From 3bf68e5ae841f273ce5c96d52dbe65b9e8a64e9c Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Fri, 5 Nov 2021 15:14:19 +0900
Subject: [PATCH 4/7] fix: failing tests around app link
---
lib/app/app.dart | 5 ++-
lib/data_profiders/app_link_provider.dart | 32 ++++++++++++++++
lib/pages/tab_page.dart | 44 ++++------------------
lib/pages/view_video_page.dart | 10 ++---
test/pages/tab_page_test.dart | 45 +++++++++++++++--------
5 files changed, 77 insertions(+), 59 deletions(-)
create mode 100644 lib/data_profiders/app_link_provider.dart
diff --git a/lib/app/app.dart b/lib/app/app.dart
index 69ea87f..402fc8d 100644
--- a/lib/app/app.dart
+++ b/lib/app/app.dart
@@ -7,6 +7,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:spot/cubits/notification/notification_cubit.dart';
+import 'package:spot/data_profiders/app_link_provider.dart';
import 'package:spot/data_profiders/location_provider.dart';
import 'package:spot/pages/tab_page.dart';
import 'package:spot/repositories/repository.dart';
@@ -86,7 +87,9 @@ class App extends StatelessWidget {
navigatorObservers: [
FirebaseAnalyticsObserver(analytics: _analytics),
],
- home: TabPage(),
+ home: TabPage(
+ appLinkProvider: AppLinkProvider(),
+ ),
),
),
);
diff --git a/lib/data_profiders/app_link_provider.dart b/lib/data_profiders/app_link_provider.dart
new file mode 100644
index 0000000..2f39978
--- /dev/null
+++ b/lib/data_profiders/app_link_provider.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:spot/pages/view_video_page.dart';
+import 'package:spot/utils/constants.dart';
+import 'package:uni_links/uni_links.dart';
+
+/// Takes care of app links
+class AppLinkProvider {
+ /// Sets up the receiver of app links
+ Future setupAppLinks(BuildContext context) async {
+ /// Quick and dirty way of
+ /// waiting until TabPage gets added to the widget tree.
+ await Future.delayed(const Duration(milliseconds: 300));
+
+ try {
+ final initialUri = await getInitialUri();
+ _handleAppLink(uri: initialUri, context: context);
+ uriLinkStream.listen((uri) => _handleAppLink(uri: uri, context: context));
+ } catch (_) {
+ context.showErrorSnackbar('Error opening the video.');
+ }
+ }
+
+ void _handleAppLink({required Uri? uri, required BuildContext context}) {
+ if (uri != null) {
+ final path = uri.path;
+ if (path.split('/').first == 'post') {
+ final videoId = path.split('/').last;
+ Navigator.of(context).push(ViewVideoPage.route(videoId: videoId));
+ }
+ }
+ }
+}
diff --git a/lib/pages/tab_page.dart b/lib/pages/tab_page.dart
index dae3fa1..1b310e5 100644
--- a/lib/pages/tab_page.dart
+++ b/lib/pages/tab_page.dart
@@ -7,16 +7,15 @@ import 'package:spot/components/gradient_border.dart';
import 'package:spot/components/gradient_button.dart';
import 'package:spot/components/notification_dot.dart';
import 'package:spot/cubits/notification/notification_cubit.dart';
+import 'package:spot/data_profiders/app_link_provider.dart';
import 'package:spot/pages/record_page.dart';
import 'package:spot/pages/tabs/map_tab.dart';
import 'package:spot/pages/tabs/notifications_tab.dart';
import 'package:spot/pages/tabs/profile_tab.dart';
import 'package:spot/pages/tabs/search_tab.dart';
-import 'package:spot/pages/view_video_page.dart';
import 'package:spot/repositories/repository.dart';
import 'package:spot/utils/constants.dart';
import 'package:spot/utils/functions.dart';
-import 'package:uni_links/uni_links.dart';
import '../components/app_scaffold.dart';
import 'record_page.dart';
@@ -24,16 +23,13 @@ import 'record_page.dart';
/// Page that holds tab navigation at the bottom.
/// This is the first page presented to the user.
class TabPage extends StatefulWidget {
- /// Name of this page within `RouteSettinngs`
- static const name = 'TabPage';
+ /// Page that holds tab navigation at the bottom.
+ /// This is the first page presented to the user.
+ const TabPage({Key? key, required AppLinkProvider appLinkProvider})
+ : _appLinkProvider = appLinkProvider,
+ super(key: key);
- /// Method ot create this page with necessary `BlocProvider`
- static Route route() {
- return MaterialPageRoute(
- settings: const RouteSettings(name: name),
- builder: (_) => TabPage(),
- );
- }
+ final AppLinkProvider _appLinkProvider;
@override
TabPageState createState() => TabPageState();
@@ -198,34 +194,10 @@ class TabPageState extends State {
@override
void initState() {
super.initState();
- _setupAppLinks();
+ widget._appLinkProvider.setupAppLinks(context);
WidgetsBinding.instance
?.addObserver(LifecycleEventHandler(resumeCallBack: onResumed));
}
-
- Future _setupAppLinks() async {
- /// Quick and dirty way of
- /// waiting until TabPage gets added to the widget tree.
- await Future.delayed(const Duration(milliseconds: 300));
-
- try {
- final initialUri = await getInitialUri();
- _handleAppLink(initialUri);
- uriLinkStream.listen(_handleAppLink);
- } catch (_) {
- context.showErrorSnackbar('Error opening the video.');
- }
- }
-
- void _handleAppLink(Uri? uri) {
- if (uri != null) {
- final path = uri.path;
- if (path.split('/').first == 'post') {
- final videoId = path.split('/').last;
- Navigator.of(context).push(ViewVideoPage.route(videoId: videoId));
- }
- }
- }
}
/// Class to listen to app lifecycle such as background and foreground.
diff --git a/lib/pages/view_video_page.dart b/lib/pages/view_video_page.dart
index d3f4e6c..7ad54a6 100644
--- a/lib/pages/view_video_page.dart
+++ b/lib/pages/view_video_page.dart
@@ -412,9 +412,8 @@ class __DeletingDialogContentState extends State<_DeletingDialogContent> {
_loading = true;
});
await widget._videoCubit.delete();
- Navigator.of(context).popUntil(
- (route) => route.settings.name == TabPage.name,
- );
+ Navigator.of(context)
+ .popUntil((route) => route.isFirst);
} catch (err) {
setState(() {
_loading = false;
@@ -482,9 +481,8 @@ class __BlockingDialogContentState extends State<_BlockingDialogContent> {
_loading = true;
});
await widget._videoCubit.block(widget._blockedUserId);
- Navigator.of(context).popUntil(
- (route) => route.settings.name == TabPage.name,
- );
+ Navigator.of(context)
+ .popUntil((route) => route.isFirst);
} catch (err) {
setState(() {
_loading = false;
diff --git a/test/pages/tab_page_test.dart b/test/pages/tab_page_test.dart
index ca6d768..9b671c8 100644
--- a/test/pages/tab_page_test.dart
+++ b/test/pages/tab_page_test.dart
@@ -9,6 +9,7 @@ import 'package:mocktail/mocktail.dart';
import 'package:spot/components/frosted_dialog.dart';
import 'package:spot/components/notification_dot.dart';
import 'package:spot/cubits/notification/notification_cubit.dart';
+import 'package:spot/data_profiders/app_link_provider.dart';
import 'package:spot/models/notification.dart';
import 'package:spot/pages/edit_profile_page.dart';
import 'package:spot/pages/login_page.dart';
@@ -25,9 +26,21 @@ import '../test_resources/constants.dart';
class MockNavigatorObserver extends Mock implements NavigatorObserver {}
+class MockAppLinkProvider extends Mock implements AppLinkProvider {}
+
+class BuildContextFake extends Fake implements BuildContext {}
+
void main() {
+ late final AppLinkProvider _appLinkProvider;
+
/// This will allow http request to be sent within test code
- setUpAll(() => HttpOverrides.global = null);
+ setUpAll(() {
+ HttpOverrides.global = null;
+ _appLinkProvider = MockAppLinkProvider();
+ registerFallbackValue(BuildContextFake());
+ when(() => _appLinkProvider.setupAppLinks(any()))
+ .thenAnswer((_) async => null);
+ });
group('TabPage', () {
group('signed in', () {
late final Repository repository;
@@ -40,7 +53,7 @@ void main() {
.thenReturn(Completer()..complete());
});
testWidgets('Every tab gets rendered', (tester) async {
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -59,7 +72,7 @@ void main() {
});
testWidgets('Initial index is 0', (tester) async {
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -75,7 +88,7 @@ void main() {
});
testWidgets('Tapping Home goes to tab index 0', (tester) async {
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -92,7 +105,7 @@ void main() {
expect(tabPage.createState().currentIndex, 0);
});
testWidgets('Tapping Search goes to tab index 1', (tester) async {
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -111,7 +124,7 @@ void main() {
});
testWidgets('Tapping Notifications goes to tab index 2 when signed in',
(tester) async {
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -132,7 +145,7 @@ void main() {
});
testWidgets('Tapping Profile goes to tab index 3 when signed in',
(tester) async {
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -169,7 +182,7 @@ void main() {
create: (context) => NotificationCubit(
repository: RepositoryProvider.of(context))),
],
- child: TabPage(),
+ child: TabPage(appLinkProvider: _appLinkProvider),
),
repository: repository,
);
@@ -191,7 +204,7 @@ void main() {
create: (context) => NotificationCubit(
repository: RepositoryProvider.of(context))),
],
- child: TabPage(),
+ child: TabPage(appLinkProvider: _appLinkProvider),
),
repository: repository,
);
@@ -214,7 +227,7 @@ void main() {
create: (context) => NotificationCubit(
repository: RepositoryProvider.of(context))),
],
- child: TabPage(),
+ child: TabPage(appLinkProvider: _appLinkProvider),
),
repository: repository,
);
@@ -249,7 +262,7 @@ void main() {
create: (context) => NotificationCubit(
repository: RepositoryProvider.of(context))),
],
- child: TabPage(),
+ child: TabPage(appLinkProvider: _appLinkProvider),
),
repository: repository,
);
@@ -338,7 +351,7 @@ void main() {
.thenAnswer(
(invocation) async => 'something random @Tyler yay @Sam');
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -400,7 +413,7 @@ void main() {
when(() => repository.getVideosFromUid('aaa'))
.thenAnswer((_) => Future.value([]));
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -460,7 +473,7 @@ void main() {
when(() => repository.getVideosFromUid('aaa'))
.thenAnswer((_) => Future.value([]));
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -524,7 +537,7 @@ void main() {
when(() => repository.getVideosFromUid('aaa'))
.thenAnswer((_) => Future.value([]));
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
@@ -581,7 +594,7 @@ void main() {
when(() => repository.getVideosFromUid('aaa'))
.thenAnswer((_) => Future.value([]));
- final tabPage = TabPage();
+ final tabPage = TabPage(appLinkProvider: _appLinkProvider);
await tester.pumpApp(
widget: MultiBlocProvider(
providers: [
From e0a1dc5b3dacd04f6f5883d02ea83617c5d52f8f Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Fri, 5 Nov 2021 15:18:34 +0900
Subject: [PATCH 5/7] fix: analysis error
---
lib/pages/view_video_page.dart | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/pages/view_video_page.dart b/lib/pages/view_video_page.dart
index 7ad54a6..55dfcb2 100644
--- a/lib/pages/view_video_page.dart
+++ b/lib/pages/view_video_page.dart
@@ -21,7 +21,6 @@ import 'package:spot/utils/functions.dart';
import 'package:video_player/video_player.dart';
import '../utils/constants.dart';
-import 'tab_page.dart';
@visibleForTesting
From ba6a4ef1e5273ccfbabf0ddbd870c0befa5d313d Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Tue, 9 Nov 2021 08:42:44 +0900
Subject: [PATCH 6/7] chore: updated release notes
---
ios/fastlane/metadata/en-US/release_notes.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ios/fastlane/metadata/en-US/release_notes.txt b/ios/fastlane/metadata/en-US/release_notes.txt
index a2de267..81f8952 100644
--- a/ios/fastlane/metadata/en-US/release_notes.txt
+++ b/ios/fastlane/metadata/en-US/release_notes.txt
@@ -1,2 +1,2 @@
-- Nearby videos will be clustered together
-- Sharing videos will now share spot web page
\ No newline at end of file
+- Fixed a bug where clicking on shared video link does not open the video page within the app
+- Updated the defualt user icon
\ No newline at end of file
From 5b4fd008f1dd7a3588beac5b675aa9ca4bbe42bf Mon Sep 17 00:00:00 2001
From: dshukertjr <18113850+dshukertjr@users.noreply.github.com>
Date: Tue, 9 Nov 2021 08:46:27 +0900
Subject: [PATCH 7/7] fix: updated default user icon
---
assets/images/user.png | Bin 115134 -> 145633 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/assets/images/user.png b/assets/images/user.png
index 50a8ec0b1bab6baa3427f0e9b3ae90d3b3adcab4..22dc0b0f85ce58a56cc6dd830783a2405dd35a76 100644
GIT binary patch
literal 145633
zcmV*UKwH0wP)F|^00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPBCCOMGRkDpu69{&?lK{r8!ayhK&{%G=dSzS|-D~ygPi@hwzsvju
zc0Q3nf=pOp2uX}PoupStW0@%g(zZwdg8`Q&%UH53$(m|<@9ulgo__n>`;;YXs6o$>
z-g=(r-gD1<_HY08+2>rQUD$`f+>5qp!IT+hg?*G^aKlmi=!Y=H>3kpoTunW7;
z!Y3w>+ux^?6X?8Kcmk|pxOD=glQIq`Cm=gM0oKVGuoR3M5Y3=8gBMTnWt?s_kelzb
zeg@dZcLhCZfT#DSKRICku0SX=C{7Qxbmp`@uI16yRg4=g=u`H162S|Gz$e*LQo`3Y@%r2*U6FAcE
zPQZE}jl&bqKg+-SOCNmC4kUNsH4}C~xC>Wp_>F&k=es8}<#*7*X8N2=nL;z*O)PI<
z2Z@<{jWaqK*eRF|?OHOwp|QUC_J!HTIekumM`N%vy)S0+lm=EDAQucyERN@az!&kH
zHE!lK;2sCFG!{yFe~5VNK-huel<)jN1*oxb{M2;+zNyIfO_lxhc;WErPyE$)
z{VwgoE?k9S2ZXzDRfNy{tH1jlXD{%3hRrauyi=12@YZQ~pBN47$UvbnD`jS)rp?B_
zjM0%GNJ=$jw)h8gTr-Q#Y_UD(z&V3VfT03kdsdc=Pk|`Sss~yIG4{p>lxv0)W1Z76
zpsMCpHIdHX=D^M6p4NYm07VBu0K^_Z=cLRmE3M*eX4koagzlZeab}R`&eMJW=C6O-
zeY6X^aD|5*5bnYi7e4!mJB}aF(NmkvaQgwxEN=ooqT|Z!5C9as?0N&aYWf5aU}she
zdd>iqk!=9HW>DMEY!%J*JY$73L-g+kXck}1rvWqyjBYk<0BvSfD;v)s*~&AQtC>bG
z0)(Uh+UnEFu$h68%!Dcw&vB+vfKVB%--GrMa)8zJ=6cUS@A2o~PmLn?F>UUPJ0RSJ%RbD&cWBuEz$Ad*J%QRClK?*1ZVU`2%;uRXCbT(#P#IBS
zVhRLl8Z~fHv*jf1(;>#4Uh=m)xDXHVoP&m_hbOx!bqqFXCQ@gR1~hICMbl>kWLsMl
zxPFj8EV@3Kz*Wtr)l@nL$SK1^=4j=a@eKf$T@fGvJI_lQVuET*molzcgWoqb%YAZi
z@X3i<-uM6fwg2jV+J#-XjKdBHcj2-NGw@BE>(nsp-9Aa`J0>&d$rQ+BK&0Pifz8fP
z!qgc+7|f3XXvoZu%J|YW%8j8>czePcqJmX`g*(!y@Sn|>#`YS^o4yaT$LI9mpe9p)
zX5_kdm(DVpE^#{Eq(e>Hjv-zrfi=hWTg*(GW?V_{(z;HlZMTtNj=%=Vm~%2hq5wES
z^C>BKw(^hxCFR$KJ=pFH>6(>unv3zuEk0pTuO7U92q;*L{$G~7Ok
z&S`ybI5l6Z!dJm;{yD0{N&q1_*qJF)8n6+$8E-UiO`&26t?Pgk>uECxhCpZaS5QW0je2eR`1I6A
z_c9On{_=nKmQT|z?7}4uJ0RSJOArE#@q)ulr_bJZXK~*3uhXxCQPz5LUc}P>xb%`G6J9-P_7Y<
z;Qi^>eJ#<`?AHNjAQ}T~*MJb~0^lCzSSr9T#7iJdXPQ_`RN(8B2qLOLNU_aCv;$fD
z#~C32p|$CZx@Ky9VEVk5$MKT~XK7-Kx9!;CF1+et2ZX!us)ZT+uD$-cJ0}tN0o}At
zHz*59QyPKUb1Ng9z>1rPrwls=7|+Ko|gL
zEUmZ=GlpkG)$e-O2l{bW&QY|<(u=V)QJKRHJ+Hs6W1AsSZ9p>H1=(c
z*5Z)m875X{-;Uv6Dz;ENBV-#C0gx@OOlH&J<8)>M#SiX4aTi{>umi$fc-cb(ziW?9
z%#S|61K%!+W@5~bZR-KEnLZm6Xv8C(Hs*8y1cO~rY$FKMTX=qYoc8>XYhJb@6yvG*>VZtP?k1vp!yRB##Ncs1V-X!(#i!T>NHked$&+l;>nP&+Ww=%_$J
zV|s=HVlP05m^~)WJ+R*C^v?HDNx8b;p4go};~|Xs|~$
zQ;wav)17d@GnB$PhIL=zC|sTqQ%=&s$j>iLGpIJMdX$Pe$RMk4pvfE#HU!UD|BJD|
z1Xu=>s&=df1X3MHZdIMbPmd%2(y#sXH+_)GdEZrn&o~1-hs0VRa3ED|LPQi06QJJ3i
zndT?S1hw-TF4x6kTmNjmpP*>{se^2Gw4r;?pF8(szqK=+?!rq5J0RSJ7adMdrcXM0
z_)gmJ2d1B=$i$Zdo5?o!_B0#l2tzHM3QYjE?E!Oe&>Mm=3NS=B&BX~axt2$H>WRDV
z58-h-rm(j4Jc47@!U3n4G2LVe8`Zh2(>d62?put#gtnyu*Y-x(;!s!~>mI>_@a~-c
z1~_#l%(X-85p4Sp)kG>$C)@Indla*--P)*`DEoUvehN*jtC~V0f~HWvhkcsnRP}su
z)2KL`)U`k&>DLv>H{qKnDFt9s^rKNqz3=8y9Umg2m>GTEjxn1~&+JU6yYQmJ4hVPQ
z1&7lU`PG}nCw5qW`r);J%P4=w|4zBoI0-ia>gn6}vqWc)FFN5((tl^^WEBX^Qu^RE!Y
zLuY}&{_;D85OZN?&KYFjVdooK?;J3
zf)azd&)MG!AjNasZ?G5NM`+%pxxVPmHo*j0*Ya#by_s4MdNZm5QF@8$!P>FkF}8!m
zx}Z7d2yW!30A_y<_XGm?7jyFbkLD-Zfy8iVHxU&OT$)hH!OzYoC65QDP66i|0%sfB
zM&X{L9OhItHIV+3o~HWYn-cBW`F)GbA3JyM>?e0DaTnIY4hVOlgwsFw{ge4~^MOf%
z+&K-78v?B65WqIewNTQ@O`5tSs4PRz{{*i;O7kXJ93>aFcBF|CnAupFqNT6*%@pff
zB8D)P`Bnz9*D2Xn0cVtH9#vCmdQIy7L%}seJ>QeXg}R*w%J@1X{S4<8P9U*$KL+!s
z1EDcK&BNbRp>f9OjFM>Z9oZcwUEWO2{hLRpfj%R0jS$p2=8#&wW0p8Y^k70LOrwFr!fQV4fbcaQ9-07f61sO!BjJ>gi#Zq;
zh56xl2`ibd3(o)Ap)X@IODPCSn#JnU5P%tRSvPc(XY3)AjuA4xeu*hq;>ZK%Iv6=9
zHs%@Yf4Q%)Y$!K}83Q}K7AMPy-^(>eU}Vaqa!Z8o7c|G2a@vfUILG#udrq%V>h})L
z4ctzdq1;R#X4Jw4M||B9u7k?34url3v3oC}d4e*UMuGWd+jc-ol%QyA+ZCG@xzR{%
z69J8eY<;+{1v(?71hU2mkpadSBJsir0~8uf<&2ZTK~*b$-}LM6@757t+hGTUuhDS&
zpZ>s|n}I$wiHh58y@gj4>jH!v0BPDiHEc1qe?=240vH!Gt=(bsEwOG*}iMwrwoYSf6eB*O&Mn
z#1@M7=6j0$hn!m^Y+DEQhkhqePI)w^7QA0rV%a>8AW3r`1LN9bfGIjJ;Sp=<8A`b)
zF<6&xwV+g70z6}FkZm8L0-JF5znaO(*C8bbU5*oTit)jbXvy|d;e+J)C#*a6{dEX)8nOeWB&=TCCTo1}20R;zk}2}#Eu
z-DH*z=Qa1jXBnL;5(1)LxAzR%b_rm9w*FO2r(D^|0jxJ7yAuP?^!f~wAR)jBRdZow
zfZ(9gnKX05J$iR4SmtY(+*Io3*nHuyuG8s@d3|kgqyj{mpT5hmb=?7{cWMA-m>;2T
zQh`wX7&Yq5qz2Uf@?o(>*9vge(-)YcKNDtfC1BP^l1h|=qJpv=sYXQT6yqaJ3TmZ;
z4S6O+Ig}x^$41xTjHT-4R?SCp#A@2Z>8a&^>{oyA%|A`M@R|ubAbgF406?OXpi5`}
zoAGKZ5Vqg5EX!+RiZ=n6=}(QUaXN5BhG^tX{A3Xon))t5&eKqQk02$eH363(nPBI_
z+MP;z*5?edd5{i%xVH&*?paj@x3c#x9c&D^$lh1Tc|4k*IV$+JdIVc_tT`ZOWScOb
z>fS^BY;lK8Fz@b76#>$MAWgn~1kNN4AT;0->X;_5U{MpW7>i3K1Kt4{f7Yi$g!>Zx
zwM=52WzYD*+d3{_ozVL*9AgZG&56oSnXz%Co9USuyjjZtT>p;SEQm;?ql#@SM@#Si
zDa#+*nM_|BVF!d)d3fk&zW>z0hVGuE^z8(Uj)xQx349`meroy*SM}ITP5$AGavKoZ
zr7_avWRaNwd)ySDmEDcxr;()jQ}a=CWjNxnnoHX=)f^foPdD2h#MX)2BWP=ZtszF(
zZgCLi*0v5w?o2}lVw6rR)%@vOB+UCV(uuQ4^*x1S@&0sR+DNYdE#EgdA_G)r8k^vC
z4bt`y`dXlyH}mZpf-ElqUs-1VW(rjThW_mll#JZ=3R*{IJt@qkB(cd}Y#ceO>#q}n
zTQE%>XSSZm4WV1pI)ijZX{XI3s6mkO)wfr4f#LcDh~s23{ou}IdNqd~5MHI>^aOyL
z&BOqOZV%~FfJ_9oK$ufOEV>kcQ_j|0N7bkl02k>do3#AvS)=6O7U-7)BMS}4(KQBpxM&ER@CVw_aD0AGb)g=qlj)x;_>BG6nK
zKY~TtSfzfQkW+yY5^$O6e+xeAUZ@o2QhkKuUOL)1Lmckhd6{0FVF!d)S$Ozo{>pcZ
zJbrANx~Iww2dfs~tFu5MaC{-k^+Q`-Q8@;5kdoc4F~at92yapZNXIMRvljQS)s*Lg5IsS|ycv!-zH#5TEl>#i5njgIPE@h)$}|T9JOcBk#~JW7Oy=0K
ziEA9#8hr)YQM&H_y_r)8wH;GDlkuUtg
zM)`4t5mJpGid3xS3Q@9rBJcJznK~$$qU5YH#to65P!l+(|Ce<^znu$+M5*5y==Q8I
zGiizyXloL*IO6cf&&%%kwyQ1dfbc2_^GPt9L;H76Q~55FBoccV5X1@~S}=AfpmjIJ
z*dEAuOd&T0#y0|(#7HpAEPPXZD@d41EjtFm=vh-Tz6OX+N=WYwA*U#|QG|Ie^5ZZ?
zCfLPMX+(BtcCx|-cCAq86$;NW$2$iV;2bPAbz1~5wdOS%rdK`b*#q;NM=*tL98oE@EvknH>3Ro*bZ@5t3a4B>_B1ZM%a%$Nnm%
zWPU`+4qG2dWqg$2XeQdkvh4r%rU_pt)Mpg87}BywL!VP1B%*$)&uk8qT2c;nG>3*2
zqyt9=(@D=B%?|tVgG0NG`BzKW0pS%MW&qsV-~aG9j(1J6sl5X*rf>tB5F8xBq3XE$
zbB;Sp<>o*VplKLq`xR!9sbqu5fHKXeWFCm7dE2wi`_sXYQ$PacOm=6*OopedG7onq
z3NJ(Eyl(4(?WMTRpoY3e80?VT+?mcdvHr$P<&6wn7#0a^cc=_4-#ibezz{OL2D0|1
z2``VCP4j!VR=8L1GkR@eSDgyCwpKkfgNsK60CH4Vp*D$
z(vV6F46k1IH9h_4z|o%-6N)a>^j_ert^X-oB{a8;i^?J{9FhryoyRCSZVeKwkCJKH1FAHQE2CX1?)e3GSf-Mf8ET1g9Z}L=VmYcq
z%@6M!YOd6<1HvmXOf2x^X7A8FQ}5j_l6~lFd=0d6S&np19wdOfCR|nt<&kL&f`UU2
zPT>G)g)n3MtoQD=OyrG@%!6#4$akq`*cgdVSk5|7Zz
z;S7)l%IypsK$s3OZp|>9BR@G!&@m_00*q<4>&qk7NP@1ed6(u4Aw(0zZcZ=i#+OiOpVe@rEKwX2
zJf;h)05#^NF70`DCqQ~G>`90ecnx+K!~pN0Has-EZJQ{tNFJ)VTSsp6fcxVy|A|NuFr+
zj5O1+svJnDVpj-dQ<>?JJWnpgW4AOfEsqi%2Ez^VVKZa;15h?eHLA3SWup8GsiM|H
zV$Dzox%H_&*v5x-a}ROsxXjsB0~^N2pE>k&-RMB>ZCckGKQQtA`~TZdeDQADg)1uT
z7~vHX9=hlIPmLSCXX>$&anXUId16YFM8z?t#px1K1z!z}jj>^D<_cFeeu7s1c2Fv&
zPqUN~m{Xm}k;QAb2RCU_9BkupeFJ^_8z`J&DBmhiapFw-htZ=HU(zeecHGe=j%7;^
z)0Wj>tk3o$GNo(^Ms3zG$wH9}ZJ#J5(o^GzkT
zN|3D^N~RMmGa2E`OhuoKEfU^NUYFKbo)4A#W?B`Aj?s0+WQUn1NqUfyAS3ia5@yqU
z#(&sztmA+L6$V7sggi^Tbrn;lm5&8Lv5!$=oCyU}V;powb=L11X&%O@IoJCL|BP%S;i
z+f)X*Db%B?YHxT2`Y!w)LkfWr%FUFXiW4+X7&FPhMdXl+Q;Mn~uN7aM3I;5tyabgH
zLVl_uRib_&px9F%!$e0VIV)Q14=C5IZE9ygTehZdR?`%u4b^p*iXRKcCQm6Wfz9L@
z+6Qw<)>F0`rM}W&6^h1LLO~Tti+Nr;{HlXMamwOVbc<0HI>f#+G4g
z2k#!Jr@1BD=!qIzehxvd_z}bCAv5DLr?onmBCZRDp1`ITX#=I%HUTi&A%>goK6DBi
zAUOBLU}f7f2d78xoRYuydp_~VhiMls+rYF7mt9a6xOdMqiB35%UEEpJ
zkTBG*BK19vdkER>Kz$sp+OucWmB&lyQq;@RG~@vfV@`&sEF~*4hq1{g@HFkei!;1r
zC}7HLA}&2Q<9_Z1bmrmDv^X2vH%HZR##k3IyrG^|blWxt(Y=Jk?iiD=S~7Ddg*Per
zTkHKLzsBy&Bh*ct{`QG_-S;2{Beb{FTRLW*r8rmAJxSARwAF|E`iaMHX%4{%^K90k
zd0!f1jz0BmBP8~=3ITRb$pQ(k8LHVB%J&wASE=ZCeHi>w+$o0YAQq{=^ICU3rcbWx
znJq-YFHE6Y4er=oNrR9vF4HA5&4xCatn=OrXU_k~Z~d*^X8g-7>=@x?78(m2CKgBr
zf^(3{L}=B>f*v1uE-I3m6{OQupAER%2y;Sq8_dI7^$bTk>UtjQWm`
zNWyfqe9H2~ExC$DvJQfo%ZmN>7lu(tK=3Wn;|Frof*nbr8Vc4wez
zTOx#H5f9c3ImJf2rJl2p60FW1gy&Tf5(N`9NottS$ZGJU8DM
z#4_Rwe3d1&<{x`D#j!?bE1k7o1JY=RB?+v=5#28+x0
z7OJHX^UOAiGPM3vSlbvYFAR8js5UtpWP8Wt&@p^Y7T7UEW0yv*9P7#Yeh76)VBi6x
zOtU4f`Nch{@I*a8uCPM#@nnS!#l%Vy>x;3@NKr9+HmEJrk|~P6MykuV#N+!9&Yk<-
z9Xq@{!j2JM2H~Nf{=N_I4V%wQy>a{e8x(e!^wcJuh+JHGiFGu%#1~PQaoff6(Jjy8
z`rwLj3V=8qY$TVa2rQ%NN8=Cc+8budtLi>;A&lHV%Ds$Iv2A#-O<5SHE$HRCU{oWj
zC|#SBBUTC7o$is6wl%RG?v@eeGzLgVsIn!-?FIl22L0ah>;2+YZO;xyCmHD*
zB~$lSggR)w3mYVWueA_8v9cYZKwe}zNU~bVHA^eJb|eXc7`Zu>Y%H|r2ju!Iq24NM
zd+|kja|Qq+t*46ZnTc0h4av!g9e(z`zxeQ7vR0kcsH
zO6EtBDn+&kfW1Fwey2ui!iBPU-G(9&Ler}y?hqMlzDwUl@JgYhOhkmfNU;`4N+gj5
za?(YE4->=^Yr0()pvTbC9fh|3<}4glOlXGW)B}em_5yTi;?2
zN30Q^{W;>gAnDsDDE1w~hJDgKhSKdN%sqjPx%rED#hGGZv9U%NI#S+iFzauhu-7$_
zV--=X6()wc#uEJ^3e`cHh}jPLj6l;H0yuZ#^_3=Lm%rQOdsnm<~C;DqGC8Et5p1kEam7?VhUXY^l&&@lvi|vy%-9Ww@^@?X(~1h#vtVWtfxs)79SlWoI~o*lN&cG
znQ!kp#DQdE)cV6gE59QU3V==zkVLo+DrL41jJ3k((rJdAp<;?c-4+VCPC0*^&*vQM
z@|-&~%(X4e;r@~7dv}}gU%jw1jlN3Zp?kjX!yDSn+agZt6)Eh>q&FqS5!1TK8DhwK
zUj*ql#ZzbW3==0Mfn44rDn>q+Xc$x6?LSmvp*R?X$QdDldDo$pfbohO6fF#$i4e*Q
z(vcZd04gS5Ql%jxTT3-Tjnsfcu^{`Bx1ge)Ij^Yf9Lc0GTdMfVMcc;s*jC_OHeYi;
zQ8vASjezJqZwDsOb=0Uz$UaQMrua8_vHaM3C9hFF5&8$m8lL+I<#!4YVE^-te9<26
z8VU|8cAvp|tXIeAB-<)t9Bt`9#6D02^J59LjXIO>FO|@BJYSnVd9MuT!v4y2*q9${
zgBst~(OIZELus7i*whW4*b3q%_T@brAW+EhwnV-Ypg;z8*Qz#90Pg5WV
zwF4Ra-m=zKLX*=bUiDw@ps(0HyXQm}jE>`}L`vzmLWHSSBL5KaD$n$uuzB_{rcEYH
z!0)k^i@YtI1i~i!PzN}YqIi2ftu`03YL6r39xobe{v6HYQ&w27*WLLt)>~N#rIV6q
z9ipF{2~3d&(&OB$G>qj@utC~l=|G3iZ9Ft*9(^7gKnca1`rtpxTOKl=wTB4T9h=5)
zu#JjvZm&FQwP*k|3iym*Q*luX?5djyjjzX%KkRB6KEP=j)qh30@^|H9$1EbQrhE#j
z*|mdp30Kl+?9UnCibB+bcYg+HfFogf3D_m^YSMUbY=t{Mef{YBe(~X3H_x2^v3q~y
zwkK&9Ua_!ags)&|rqIR$+j?LNoE9V#K!HEW&;lG#9#AkDH+gnK$R9-rDhw!`P8N>@
zz%D=_%{jeIRFb7?=}c*_dG~383SJ80hob?0IjAfu$sFR^L}jML0?Z9`|H|kD(V%@B
zicptqGi`%KJBP1IM9;jsvPKzwqrGp3;4r(@JUEMvRL0SeRTo(b>12M+#3WdkU0`Kr
z!TO@`R-ndikYP&CEY&Kl%*k!u)$ybIG?vGpA-R3lq7^`P_ABWGq+_5T2VPb$RAp=V
zeMM~oN8=Kl{n>K`)TB$7SJwWZWQ&RDWd&9V$K?gvWmLqpr|vp`-J#EZ_rG}LR@#ME
zEbM^r6$%gk)c1X;m_h-N$d)!tpe?{D_o7+69)hIMnojaAf2&nf9}I;YJx;shM3}dK
zXU3V&RREf>V~Qm`S<$Jfrd{YLtWCO+SOSnxOE)m&1++GRGBd8Y?Jiv_tv&#eU7H2j
zph7C=bOw&4%tA42jaRsUxSK~i0WRK-^X<`I-2`o-b+EK;B@gn0m{K1qHNxCL=%+vq
z1B4=d*saZsXACt58oRkQO|>O^?@GOZ!k#S8733+sklI9G4h4pz(KhmlZ4Tze$pqjE
zN#OgFK_Lvh+LX@a06
z6A-jyW|EusJX1FERnxG0k%q*6ZqDnzritP_0Br$<24!rO<6IHtAQ*l?n)r%R)J1Bs
zi)f9CGn#Qh+#4?H5>gmnJAvs1W_H;d@-XY{YDA=KOv`PjR3xHr-+w<>SEeya!3D-1Zy{!O7
zSdZd^fMbNz6m>M8>8kr^f2^PRZ4%yem^N~DCiODZDINpnl~hH5lyrT<-U%Z=k;bjj@yYR9FT@T!RVjB3TIw-N}rZb&v
zZ7Du2lE-yWiuiFu>Je*!GR&(zS+vsbR&QR7ts9b}r8kp0;Ck7yY#7fobSM;F&=)&|
zJMxndAEX?JR8(4f*!Bvhj5okDo#bRYZj2lbRNncU<;yk--#jk^yN9UInn&rJ@a&=4
z$`_tX