Add accessibility entry in user menu

apps/settings/lib/Controller/CommonSettingsTrait.php

@@ -135,7 +135,11 @@ private function formatSettings(array $settings): array {
 
 	private function getIndexResponse(string $type, string $section): TemplateResponse {
 		if ($type === 'personal') {
-			$this->navigationManager->setActiveEntry('settings');
+			if ($section === 'theming') {
+				$this->navigationManager->setActiveEntry('accessibility_settings');
+			} else {
+				$this->navigationManager->setActiveEntry('settings');
+			}
 		} elseif ($type === 'admin') {
 			$this->navigationManager->setActiveEntry('admin_settings');
 		}

lib/private/NavigationManager.php

@@ -201,12 +201,23 @@ private function init() {
 		}
 
 		if ($this->userSession->isLoggedIn()) {
+			// Accessibility settings
+			if ($this->appManager->isEnabledForUser('theming', $this->userSession->getUser())) {
+				$this->add([
+					'type' => 'settings',
+					'id' => 'accessibility_settings',
+					'order' => 2,
+					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'theming']),
+					'name' => $l->t('Appearance and accessibility'),
+					'icon' => $this->urlGenerator->imagePath('theming', 'accessibility-dark.svg'),
+				]);
+			}
 			if ($this->isAdmin()) {
 				// App management
 				$this->add([
 					'type' => 'settings',
 					'id' => 'core_apps',
-					'order' => 4,
+					'order' => 5,
 					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
 					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
 					'name' => $l->t('Apps'),
@@ -216,7 +227,7 @@ private function init() {
 				$this->add([
 					'type' => 'settings',
 					'id' => 'settings',
-					'order' => 2,
+					'order' => 3,
 					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
 					'name' => $l->t('Personal settings'),
 					'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
@@ -226,7 +237,7 @@ private function init() {
 				$this->add([
 					'type' => 'settings',
 					'id' => 'admin_settings',
-					'order' => 3,
+					'order' => 4,
 					'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
 					'name' => $l->t('Administration settings'),
 					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
@@ -236,7 +247,7 @@ private function init() {
 				$this->add([
 					'type' => 'settings',
 					'id' => 'settings',
-					'order' => 2,
+					'order' => 3,
 					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
 					'name' => $l->t('Settings'),
 					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
@@ -261,7 +272,7 @@ private function init() {
 				$this->add([
 					'type' => 'settings',
 					'id' => 'core_users',
-					'order' => 5,
+					'order' => 6,
 					'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
 					'name' => $l->t('Users'),
 					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),

tests/acceptance/features/header.feature

@@ -5,8 +5,9 @@ Feature: header
     Given I am logged in as the admin
     When I open the Settings menu
     Then I see that the Settings menu is shown
-    And I see that the Settings menu has only 8 items
+    And I see that the Settings menu has only 9 items
     And I see that the "Set status" item in the Settings menu is shown
+    And I see that the "Appearance and accessibility" item in the Settings menu is shown
     And I see that the "Personal settings" item in the Settings menu is shown
     And I see that the "Administration settings" item in the Settings menu is shown
     And I see that the "Apps" item in the Settings menu is shown
@@ -18,8 +19,9 @@ Feature: header
     Given I am logged in
     When I open the Settings menu
     Then I see that the Settings menu is shown
-    And I see that the Settings menu has only 5 items
+    And I see that the Settings menu has only 6 items
     And I see that the "Set status" item in the Settings menu is shown
+    And I see that the "Appearance and accessibility" item in the Settings menu is shown
     And I see that the "Settings" item in the Settings menu is shown
     And I see that the "Help" item in the Settings menu is shown
     And I see that the "Log out" item in the Settings menu is shown

tests/lib/NavigationManagerTest.php

@@ -215,7 +215,19 @@ public function testWithAppManager($expected, $navigation, $isAdmin = false) {
 			return vsprintf($text, $parameters);
 		});
 
+		$this->appManager->expects($this->any())
+		   ->method('isEnabledForUser')
+		   ->with('theming')
+		   ->willReturn(true);
 		$this->appManager->expects($this->once())->method('getAppInfo')->with('test')->willReturn($navigation);
+		/*
+		$this->appManager->expects($this->any())
+				   ->method('getAppInfo')
+				   ->will($this->returnValueMap([
+					   ['test', null, null, $navigation],
+					   ['theming', null, null, null],
+					]));
+		 */
 		$this->l10nFac->expects($this->any())->method('get')->willReturn($l);
 		$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) {
 			return "/apps/$appName/img/$file";
@@ -230,7 +242,7 @@ public function testWithAppManager($expected, $navigation, $isAdmin = false) {
 		$user->expects($this->any())->method('getUID')->willReturn('user001');
 		$this->userSession->expects($this->any())->method('getUser')->willReturn($user);
 		$this->userSession->expects($this->any())->method('isLoggedIn')->willReturn(true);
-		$this->appManager->expects($this->once())
+		$this->appManager->expects($this->any())
 			 ->method('getEnabledAppsForUser')
 			 ->with($user)
 			 ->willReturn(['test']);
@@ -248,7 +260,7 @@ public function providesNavigationConfig() {
 		$apps = [
 			'core_apps' => [
 				'id' => 'core_apps',
-				'order' => 4,
+				'order' => 5,
 				'href' => '/apps/test/',
 				'icon' => '/apps/settings/img/apps.svg',
 				'name' => 'Apps',
@@ -259,9 +271,20 @@ public function providesNavigationConfig() {
 			]
 		];
 		$defaults = [
+			'accessibility_settings' => [
+				'type' => 'settings',
+				'id' => 'accessibility_settings',
+				'order' => 2,
+				'href' => '/apps/test/',
+				'name' => 'Appearance and accessibility',
+				'icon' => '/apps/theming/img/accessibility-dark.svg',
+				'active' => false,
+				'classes' => '',
+				'unread' => 0,
+			],
 			'settings' => [
 				'id' => 'settings',
-				'order' => 2,
+				'order' => 3,
 				'href' => '/apps/test/',
 				'icon' => '/apps/settings/img/admin.svg',
 				'name' => 'Settings',
@@ -283,9 +306,10 @@ public function providesNavigationConfig() {
 			]
 		];
 		$adminSettings = [
+			'accessibility_settings' => $defaults['accessibility_settings'],
 			'settings' => [
 				'id' => 'settings',
-				'order' => 2,
+				'order' => 3,
 				'href' => '/apps/test/',
 				'icon' => '/apps/settings/img/personal.svg',
 				'name' => 'Personal settings',
@@ -296,7 +320,7 @@ public function providesNavigationConfig() {
 			],
 			'admin_settings' => [
 				'id' => 'admin_settings',
-				'order' => 3,
+				'order' => 4,
 				'href' => '/apps/test/',
 				'icon' => '/apps/settings/img/admin.svg',
 				'name' => 'Administration settings',
@@ -310,6 +334,7 @@ public function providesNavigationConfig() {
 		return [
 			'minimalistic' => [
 				array_merge(
+					['accessibility_settings' => $defaults['accessibility_settings']],
 					['settings' => $defaults['settings']],
 					['test' => [
 						'id' => 'test',
@@ -332,6 +357,7 @@ public function providesNavigationConfig() {
 			],
 			'minimalistic-settings' => [
 				array_merge(
+					['accessibility_settings' => $defaults['accessibility_settings']],
 					['settings' => $defaults['settings']],
 					['test' => [
 						'id' => 'test',