Decouple manifest from push notifications

Signed-off-by: Matt Friedman <maf675@gmail.com>

Author: iMattPro

event/listener.php

@@ -87,7 +87,7 @@ public static function getSubscribedEvents()
 		return [
 			'core.ucp_display_module_before'	=> 'load_language',
 			'core.acp_main_notice'				=> 'compatibility_notice',
-			'core.page_header_after'			=> 'load_template_data',
+			'core.page_header_after'			=> [['load_template_data'], ['pwa_manifest']],
 			'core.acp_board_config_edit_add'		=> 'acp_pwa_options',
 			'core.validate_config_variable'		=> 'validate_pwa_options',
 		];
@@ -136,6 +136,19 @@ public function compatibility_notice()
 		$this->template->assign_var('S_WPN_COMPATIBILITY_NOTICE', phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='));
 	}
 
+	/**
+	 * Assign template data for web manifest support
+	 *
+	 * @return void
+	 */
+	public function pwa_manifest()
+	{
+		$this->template->assign_vars([
+			'U_MANIFEST_URL'	=> $this->controller_helper->route('phpbb_webpushnotifications_manifest_controller'),
+			'U_TOUCH_ICON'		=> $this->config['pwa_icon_small'],
+		]);
+	}
+
 	/**
 	 * Progressive web app options for the ACP
 	 *

notification/method/webpush.php

@@ -385,8 +385,6 @@ public function get_ucp_template_data(helper $controller_helper, form_helper $fo
 			'U_WEBPUSH_WORKER_URL'			=> $controller_helper->route('phpbb_webpushnotifications_ucp_push_worker_controller'),
 			'SUBSCRIPTIONS'					=> $subscriptions,
 			'WEBPUSH_FORM_TOKENS'			=> $form_helper->get_form_tokens(\phpbb\webpushnotifications\ucp\controller\webpush::FORM_TOKEN_UCP),
-			'U_MANIFEST_URL'				=> $controller_helper->route('phpbb_webpushnotifications_manifest_controller'),
-			'U_TOUCH_ICON'					=> $this->config['pwa_icon_small'],
 		];
 	}
 

styles/all/template/event/overall_header_head_append.html

@@ -1,3 +1,9 @@
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+<meta name="apple-mobile-web-app-title" content="{{ SITENAME }}">
+<link rel="manifest" href="{{ U_MANIFEST_URL }}">
+{% if U_TOUCH_ICON %}<link rel="apple-touch-icon" href="{{ T_ICONS_PATH ~ U_TOUCH_ICON }}">{% endif %}
+
 {% if NOTIFICATIONS_WEBPUSH_ENABLE %}
 	{% include '@phpbb_webpushnotifications/ucp_notifications_webpush.html' %}
 {% endif %}

styles/all/template/ucp_notifications_webpush.html

@@ -1,9 +1,3 @@
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-<meta name="apple-mobile-web-app-title" content="{{ SITENAME }}">
-<link rel="manifest" href="{{ U_MANIFEST_URL }}">
-{% if U_TOUCH_ICON %}<link rel="apple-touch-icon" href="{{ T_ICONS_PATH ~ U_TOUCH_ICON }}">{% endif %}
-
 <script>
 	phpbbWebpushOptions = {
 		serviceWorkerUrl: '{{ U_WEBPUSH_WORKER_URL }}',

tests/event/listener_test.php

@@ -243,8 +243,6 @@ public function test_get_ucp_template_data($user_id, $method_data, $subscription
 				'U_WEBPUSH_WORKER_URL'			=> $this->controller_helper->route('phpbb_webpushnotifications_ucp_push_worker_controller'),
 				'SUBSCRIPTIONS'					=> $subscriptions,
 				'WEBPUSH_FORM_TOKENS'			=> $this->form_helper->get_form_tokens(\phpbb\webpushnotifications\ucp\controller\webpush::FORM_TOKEN_UCP),
-				'U_MANIFEST_URL'				=> $this->controller_helper->route('phpbb_webpushnotifications_manifest_controller'),
-				'U_TOUCH_ICON'					=> '',
 			]
 		);
 
@@ -261,6 +259,24 @@ public function test_get_ucp_template_data($user_id, $method_data, $subscription
 		$dispatcher->trigger_event('core.page_header_after');
 	}
 
+	public function test_pwa_manifest()
+	{
+		$this->config['pwa_icon_small'] = 'icon-192x192.png';
+
+		$this->set_listener();
+
+		$this->template->expects(self::once())
+			->method('assign_vars')
+			->with([
+				'U_MANIFEST_URL'	=> $this->controller_helper->route('phpbb_webpushnotifications_manifest_controller'),
+				'U_TOUCH_ICON'		=> 'icon-192x192.png',
+			]);
+
+		$dispatcher = new \phpbb\event\dispatcher();
+		$dispatcher->addListener('core.acp_main_notice', [$this->listener, 'pwa_manifest']);
+		$dispatcher->trigger_event('core.acp_main_notice');
+	}
+
 	public function acp_pwa_options_data()
 	{
 		return [