diff options
author | greta <gretadoci@gmail.com> | 2022-08-29 16:11:41 +0300 |
---|---|---|
committer | Christopher Ng <chrng8@gmail.com> | 2022-09-14 23:17:01 +0300 |
commit | 02cc42d40ae7334609a3270ee1d16eec75098aa6 (patch) | |
tree | d6668a5a9834f70d300d0e3384ed7293dbd9b0c7 /apps/theming | |
parent | bd03c7978537334822f1fc05049045d89cc56533 (diff) |
Move background settings from dashboard app to Appearance and accessibility settings
Signed-off-by: greta <gretadoci@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Diffstat (limited to 'apps/theming')
42 files changed, 727 insertions, 63 deletions
diff --git a/apps/theming/appinfo/routes.php b/apps/theming/appinfo/routes.php index fa8dde90786..0b51b22dbb7 100644 --- a/apps/theming/appinfo/routes.php +++ b/apps/theming/appinfo/routes.php @@ -78,6 +78,16 @@ return [ 'verb' => 'GET', 'requirements' => ['image' => '.+'] ], + [ + 'name' => 'userTheme#getBackground', + 'url' => '/background', + 'verb' => 'GET', + ], + [ + 'name' => 'userTheme#setBackground', + 'url' => '/background/{type}', + 'verb' => 'POST', + ], ], 'ocs' => [ [ diff --git a/apps/theming/img/background/anatoly-mikhaltsov-butterfly-wing-scale.jpg b/apps/theming/img/background/anatoly-mikhaltsov-butterfly-wing-scale.jpg Binary files differnew file mode 100644 index 00000000000..36b0a0675de --- /dev/null +++ b/apps/theming/img/background/anatoly-mikhaltsov-butterfly-wing-scale.jpg diff --git a/apps/theming/img/background/bernard-spragg-new-zealand-fern.jpg b/apps/theming/img/background/bernard-spragg-new-zealand-fern.jpg Binary files differnew file mode 100644 index 00000000000..c4df0d673b0 --- /dev/null +++ b/apps/theming/img/background/bernard-spragg-new-zealand-fern.jpg diff --git a/apps/theming/img/background/bernie-cetonia-aurata-take-off-composition.jpg b/apps/theming/img/background/bernie-cetonia-aurata-take-off-composition.jpg Binary files differnew file mode 100644 index 00000000000..a299a44ff8c --- /dev/null +++ b/apps/theming/img/background/bernie-cetonia-aurata-take-off-composition.jpg diff --git a/apps/theming/img/background/dejan-krsmanovic-ribbed-red-metal.jpg b/apps/theming/img/background/dejan-krsmanovic-ribbed-red-metal.jpg Binary files differnew file mode 100644 index 00000000000..586f6c13149 --- /dev/null +++ b/apps/theming/img/background/dejan-krsmanovic-ribbed-red-metal.jpg diff --git a/apps/theming/img/background/eduardo-neves-pedra-azul.jpg b/apps/theming/img/background/eduardo-neves-pedra-azul.jpg Binary files differnew file mode 100644 index 00000000000..937da4e2c5e --- /dev/null +++ b/apps/theming/img/background/eduardo-neves-pedra-azul.jpg diff --git a/apps/theming/img/background/european-space-agency-barents-bloom.jpg b/apps/theming/img/background/european-space-agency-barents-bloom.jpg Binary files differnew file mode 100644 index 00000000000..700fa236052 --- /dev/null +++ b/apps/theming/img/background/european-space-agency-barents-bloom.jpg diff --git a/apps/theming/img/background/hannes-fritz-flippity-floppity.jpg b/apps/theming/img/background/hannes-fritz-flippity-floppity.jpg Binary files differnew file mode 100644 index 00000000000..73302a4ccc3 --- /dev/null +++ b/apps/theming/img/background/hannes-fritz-flippity-floppity.jpg diff --git a/apps/theming/img/background/hannes-fritz-roulette.jpg b/apps/theming/img/background/hannes-fritz-roulette.jpg Binary files differnew file mode 100644 index 00000000000..b2406d21cb6 --- /dev/null +++ b/apps/theming/img/background/hannes-fritz-roulette.jpg diff --git a/apps/theming/img/background/hannes-fritz-sea-spray.jpg b/apps/theming/img/background/hannes-fritz-sea-spray.jpg Binary files differnew file mode 100644 index 00000000000..adab409139e --- /dev/null +++ b/apps/theming/img/background/hannes-fritz-sea-spray.jpg diff --git a/apps/theming/img/background/kamil-porembinski-clouds.jpg b/apps/theming/img/background/kamil-porembinski-clouds.jpg Binary files differnew file mode 100644 index 00000000000..b9cc2cc5cd1 --- /dev/null +++ b/apps/theming/img/background/kamil-porembinski-clouds.jpg diff --git a/apps/theming/img/background/lali-masriera-yellow-bricks.jpg b/apps/theming/img/background/lali-masriera-yellow-bricks.jpg Binary files differnew file mode 100644 index 00000000000..b32c3e56168 --- /dev/null +++ b/apps/theming/img/background/lali-masriera-yellow-bricks.jpg diff --git a/apps/theming/img/background/nasa-waxing-crescent-moon.jpg b/apps/theming/img/background/nasa-waxing-crescent-moon.jpg Binary files differnew file mode 100644 index 00000000000..281f1dc53f7 --- /dev/null +++ b/apps/theming/img/background/nasa-waxing-crescent-moon.jpg diff --git a/apps/theming/img/background/preview/anatoly-mikhaltsov-butterfly-wing-scale.jpg b/apps/theming/img/background/preview/anatoly-mikhaltsov-butterfly-wing-scale.jpg Binary files differnew file mode 100644 index 00000000000..a749442979f --- /dev/null +++ b/apps/theming/img/background/preview/anatoly-mikhaltsov-butterfly-wing-scale.jpg diff --git a/apps/theming/img/background/preview/bernard-spragg-new-zealand-fern.jpg b/apps/theming/img/background/preview/bernard-spragg-new-zealand-fern.jpg Binary files differnew file mode 100644 index 00000000000..49844a6e243 --- /dev/null +++ b/apps/theming/img/background/preview/bernard-spragg-new-zealand-fern.jpg diff --git a/apps/theming/img/background/preview/bernie-cetonia-aurata-take-off-composition.jpg b/apps/theming/img/background/preview/bernie-cetonia-aurata-take-off-composition.jpg Binary files differnew file mode 100644 index 00000000000..08fd5cf1c21 --- /dev/null +++ b/apps/theming/img/background/preview/bernie-cetonia-aurata-take-off-composition.jpg diff --git a/apps/theming/img/background/preview/dejan-krsmanovic-ribbed-red-metal.jpg b/apps/theming/img/background/preview/dejan-krsmanovic-ribbed-red-metal.jpg Binary files differnew file mode 100644 index 00000000000..b4430b2485c --- /dev/null +++ b/apps/theming/img/background/preview/dejan-krsmanovic-ribbed-red-metal.jpg diff --git a/apps/theming/img/background/preview/eduardo-neves-pedra-azul.jpg b/apps/theming/img/background/preview/eduardo-neves-pedra-azul.jpg Binary files differnew file mode 100644 index 00000000000..e62eb04f954 --- /dev/null +++ b/apps/theming/img/background/preview/eduardo-neves-pedra-azul.jpg diff --git a/apps/theming/img/background/preview/european-space-agency-barents-bloom.jpg b/apps/theming/img/background/preview/european-space-agency-barents-bloom.jpg Binary files differnew file mode 100644 index 00000000000..d23a07e5364 --- /dev/null +++ b/apps/theming/img/background/preview/european-space-agency-barents-bloom.jpg diff --git a/apps/theming/img/background/preview/hannes-fritz-flippity-floppity.jpg b/apps/theming/img/background/preview/hannes-fritz-flippity-floppity.jpg Binary files differnew file mode 100644 index 00000000000..2c6a91f1b2e --- /dev/null +++ b/apps/theming/img/background/preview/hannes-fritz-flippity-floppity.jpg diff --git a/apps/theming/img/background/preview/hannes-fritz-roulette.jpg b/apps/theming/img/background/preview/hannes-fritz-roulette.jpg Binary files differnew file mode 100644 index 00000000000..4d69e579210 --- /dev/null +++ b/apps/theming/img/background/preview/hannes-fritz-roulette.jpg diff --git a/apps/theming/img/background/preview/hannes-fritz-sea-spray.jpg b/apps/theming/img/background/preview/hannes-fritz-sea-spray.jpg Binary files differnew file mode 100644 index 00000000000..08b24f5be91 --- /dev/null +++ b/apps/theming/img/background/preview/hannes-fritz-sea-spray.jpg diff --git a/apps/theming/img/background/preview/kamil-porembinski-clouds.jpg b/apps/theming/img/background/preview/kamil-porembinski-clouds.jpg Binary files differnew file mode 100644 index 00000000000..8103148ba49 --- /dev/null +++ b/apps/theming/img/background/preview/kamil-porembinski-clouds.jpg diff --git a/apps/theming/img/background/preview/lali-masriera-yellow-bricks.jpg b/apps/theming/img/background/preview/lali-masriera-yellow-bricks.jpg Binary files differnew file mode 100644 index 00000000000..01861cf001a --- /dev/null +++ b/apps/theming/img/background/preview/lali-masriera-yellow-bricks.jpg diff --git a/apps/theming/img/background/preview/nasa-waxing-crescent-moon.jpg b/apps/theming/img/background/preview/nasa-waxing-crescent-moon.jpg Binary files differnew file mode 100644 index 00000000000..8c46e372ad0 --- /dev/null +++ b/apps/theming/img/background/preview/nasa-waxing-crescent-moon.jpg diff --git a/apps/theming/img/background/preview/rawpixel-pink-tapioca-bubbles.jpg b/apps/theming/img/background/preview/rawpixel-pink-tapioca-bubbles.jpg Binary files differnew file mode 100644 index 00000000000..483c710c1ed --- /dev/null +++ b/apps/theming/img/background/preview/rawpixel-pink-tapioca-bubbles.jpg diff --git a/apps/theming/img/background/preview/tommy-chau-already.jpg b/apps/theming/img/background/preview/tommy-chau-already.jpg Binary files differnew file mode 100644 index 00000000000..46976b0292d --- /dev/null +++ b/apps/theming/img/background/preview/tommy-chau-already.jpg diff --git a/apps/theming/img/background/preview/tommy-chau-lion-rock-hill.jpg b/apps/theming/img/background/preview/tommy-chau-lion-rock-hill.jpg Binary files differnew file mode 100644 index 00000000000..59a3e131871 --- /dev/null +++ b/apps/theming/img/background/preview/tommy-chau-lion-rock-hill.jpg diff --git a/apps/theming/img/background/rawpixel-pink-tapioca-bubbles.jpg b/apps/theming/img/background/rawpixel-pink-tapioca-bubbles.jpg Binary files differnew file mode 100644 index 00000000000..3b96469ee2c --- /dev/null +++ b/apps/theming/img/background/rawpixel-pink-tapioca-bubbles.jpg diff --git a/apps/theming/img/background/tommy-chau-already.jpg b/apps/theming/img/background/tommy-chau-already.jpg Binary files differnew file mode 100644 index 00000000000..8d9cc45101f --- /dev/null +++ b/apps/theming/img/background/tommy-chau-already.jpg diff --git a/apps/theming/img/background/tommy-chau-lion-rock-hill.jpg b/apps/theming/img/background/tommy-chau-lion-rock-hill.jpg Binary files differnew file mode 100644 index 00000000000..f1247dd9c62 --- /dev/null +++ b/apps/theming/img/background/tommy-chau-lion-rock-hill.jpg diff --git a/apps/theming/lib/Controller/UserThemeController.php b/apps/theming/lib/Controller/UserThemeController.php index 71d78db4b3d..327029b26cd 100644 --- a/apps/theming/lib/Controller/UserThemeController.php +++ b/apps/theming/lib/Controller/UserThemeController.php @@ -30,9 +30,15 @@ declare(strict_types=1); */ namespace OCA\Theming\Controller; +use OCA\Theming\AppInfo\Application; use OCA\Theming\ITheme; +use OCA\Theming\Service\BackgroundService; use OCA\Theming\Service\ThemesService; +use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\FileDisplayResponse; +use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\OCS\OCSBadRequestException; use OCP\AppFramework\OCS\OCSForbiddenException; use OCP\AppFramework\OCSController; @@ -47,6 +53,7 @@ class UserThemeController extends OCSController { private IConfig $config; private IUserSession $userSession; private ThemesService $themesService; + private BackgroundService $backgroundService; /** * Config constructor. @@ -55,11 +62,13 @@ class UserThemeController extends OCSController { IRequest $request, IConfig $config, IUserSession $userSession, - ThemesService $themesService) { + ThemesService $themesService, + BackgroundService $backgroundService) { parent::__construct($appName, $request); $this->config = $config; $this->userSession = $userSession; $this->themesService = $themesService; + $this->backgroundService = $backgroundService; $this->userId = $userSession->getUser()->getUID(); } @@ -91,7 +100,7 @@ class UserThemeController extends OCSController { */ public function disableTheme(string $themeId): DataResponse { $theme = $this->validateTheme($themeId); - + // Enable selected theme $this->themesService->disableTheme($theme); return new DataResponse(); @@ -124,4 +133,54 @@ class UserThemeController extends OCSController { return $themes[$themeId]; } + + /** + * @NoAdminRequired + * @NoCSRFRequired + */ + public function getBackground(): Http\Response { + $file = $this->backgroundService->getBackground(); + if ($file !== null) { + $response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => $file->getMimeType()]); + $response->cacheFor(24 * 60 * 60, false, true); + return $response; + } + return new NotFoundResponse(); + } + + /** + * @NoAdminRequired + */ + public function setBackground(string $type = 'default', string $value = ''): JSONResponse { + $currentVersion = (int)$this->config->getUserValue($this->userId, Application::APP_ID, 'backgroundVersion', '0'); + try { + switch ($type) { + case 'shipped': + $this->backgroundService->setShippedBackground($value); + break; + case 'custom': + $this->backgroundService->setFileBackground($value); + break; + case 'color': + $this->backgroundService->setColorBackground($value); + break; + case 'default': + $this->backgroundService->setDefaultBackground(); + break; + default: + return new JSONResponse(['error' => 'Invalid type provided'], Http::STATUS_BAD_REQUEST); + } + } catch (\InvalidArgumentException $e) { + return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_BAD_REQUEST); + } catch (\Throwable $e) { + return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR); + } + $currentVersion++; + $this->config->setUserValue($this->userId, Application::APP_ID, 'backgroundVersion', (string)$currentVersion); + return new JSONResponse([ + 'type' => $type, + 'value' => $value, + 'version' => $this->config->getUserValue($this->userId, Application::APP_ID, 'backgroundVersion', $currentVersion) + ]); + } } diff --git a/apps/theming/lib/Listener/BeforeTemplateRenderedListener.php b/apps/theming/lib/Listener/BeforeTemplateRenderedListener.php index 185289f6ff8..d6e00b927ae 100644 --- a/apps/theming/lib/Listener/BeforeTemplateRenderedListener.php +++ b/apps/theming/lib/Listener/BeforeTemplateRenderedListener.php @@ -26,40 +26,72 @@ declare(strict_types=1); namespace OCA\Theming\Listener; use OCA\Theming\AppInfo\Application; +use OCA\Theming\Service\BackgroundService; use OCA\Theming\Service\JSDataService; use OCA\Theming\Service\ThemeInjectionService; -use OCA\Theming\Service\ThemesService; +use OCP\AppFramework\Services\IInitialState; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; use OCP\IConfig; -use OCP\IInitialStateService; -use OCP\IServerContainer; -use OCP\IURLGenerator; +use OCP\IUserSession; +use Psr\Container\ContainerInterface; class BeforeTemplateRenderedListener implements IEventListener { - private IInitialStateService $initialStateService; - private IServerContainer $serverContainer; + private IInitialState $initialState; + private ContainerInterface $container; private ThemeInjectionService $themeInjectionService; + private IUserSession $userSession; + private IConfig $config; public function __construct( - IInitialStateService $initialStateService, - IServerContainer $serverContainer, - ThemeInjectionService $themeInjectionService + IInitialState $initialState, + ContainerInterface $container, + ThemeInjectionService $themeInjectionService, + IUserSession $userSession, + IConfig $config ) { - $this->initialStateService = $initialStateService; - $this->serverContainer = $serverContainer; + $this->initialState = $initialState; + $this->container = $container; $this->themeInjectionService = $themeInjectionService; + $this->userSession = $userSession; + $this->config = $config; } public function handle(Event $event): void { - $serverContainer = $this->serverContainer; - $this->initialStateService->provideLazyInitialState(Application::APP_ID, 'data', function () use ($serverContainer) { - return $serverContainer->query(JSDataService::class); - }); + $this->initialState->provideLazyInitialState( + 'data', + fn () => $this->container->get(JSDataService::class), + ); $this->themeInjectionService->injectHeaders(); + $user = $this->userSession->getUser(); + + if (!empty($user)) { + $userId = $user->getUID(); + + $this->initialState->provideInitialState( + 'background', + $this->config->getUserValue($userId, Application::APP_ID, 'background', 'default'), + ); + + $this->initialState->provideInitialState( + 'backgroundVersion', + $this->config->getUserValue($userId, Application::APP_ID, 'backgroundVersion', 0), + ); + + $this->initialState->provideInitialState( + 'themingDefaultBackground', + $this->config->getAppValue('theming', 'backgroundMime', ''), + ); + + $this->initialState->provideInitialState( + 'shippedBackgrounds', + BackgroundService::SHIPPED_BACKGROUNDS, + ); + } + // Making sure to inject just after core \OCP\Util::addScript('theming', 'theming', 'core'); } diff --git a/apps/theming/lib/Service/BackgroundService.php b/apps/theming/lib/Service/BackgroundService.php new file mode 100644 index 00000000000..2223c1d2d0a --- /dev/null +++ b/apps/theming/lib/Service/BackgroundService.php @@ -0,0 +1,195 @@ +<?php + +declare(strict_types=1); + +/** + * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net> + * + * @author Jan C. Borchardt <hey@jancborchardt.net> + * @author Julius Härtl <jus@bitgrid.net> + * @author Christopher Ng <chrng8@gmail.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OCA\Theming\Service; + +use InvalidArgumentException; +use OC\User\NoUserException; +use OCA\Theming\AppInfo\Application; +use OCP\Files\File; +use OCP\Files\IAppData; +use OCP\Files\IRootFolder; +use OCP\Files\NotFoundException; +use OCP\Files\NotPermittedException; +use OCP\Files\SimpleFS\ISimpleFile; +use OCP\Files\SimpleFS\ISimpleFolder; +use OCP\IConfig; +use OCP\Lock\LockedException; +use OCP\PreConditionNotMetException; + +class BackgroundService { + // true when the background is bright and need dark icons + public const THEMING_MODE_DARK = 'dark'; + + public const SHIPPED_BACKGROUNDS = [ + 'anatoly-mikhaltsov-butterfly-wing-scale.jpg' => [ + 'attribution' => 'Butterfly wing scale (Anatoly Mikhaltsov, CC BY-SA)', + 'attribution_url' => 'https://commons.wikimedia.org/wiki/File:%D0%A7%D0%B5%D1%88%D1%83%D0%B9%D0%BA%D0%B8_%D0%BA%D1%80%D1%8B%D0%BB%D0%B0_%D0%B1%D0%B0%D0%B1%D0%BE%D1%87%D0%BA%D0%B8.jpg', + ], + 'bernie-cetonia-aurata-take-off-composition.jpg' => [ + 'attribution' => 'Cetonia aurata take off composition (Bernie, Public Domain)', + 'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Cetonia_aurata_take_off_composition_05172009.jpg', + 'theming' => self::THEMING_MODE_DARK, + ], + 'dejan-krsmanovic-ribbed-red-metal.jpg' => [ + 'attribution' => 'Ribbed red metal (Dejan Krsmanovic, CC BY)', + 'attribution_url' => 'https://www.flickr.com/photos/dejankrsmanovic/42971456774/', + ], + 'eduardo-neves-pedra-azul.jpg' => [ + 'attribution' => 'Pedra azul milky way (Eduardo Neves, CC BY-SA)', + 'attribution_url' => 'https://commons.wikimedia.org/wiki/File:Pedra_Azul_Milky_Way.jpg', + ], + 'european-space-agency-barents-bloom.jpg' => [ + 'attribution' => 'Barents bloom (European Space Agency, CC BY-SA)', + 'attribution_url' => 'https://www.esa.int/ESA_Multimedia/Images/2016/08/Barents_bloom', + ], + 'hannes-fritz-flippity-floppity.jpg' => [ + 'attribution' => 'Flippity floppity (Hannes Fritz, CC BY-SA)', + 'attribution_url' => 'http://hannes.photos/flippity-floppity', + ], + 'hannes-fritz-roulette.jpg' => [ + 'attribution' => 'Roulette (Hannes Fritz, CC BY-SA)', + 'attribution_url' => 'http://hannes.photos/roulette', + ], + 'hannes-fritz-sea-spray.jpg' => [ + 'attribution' => 'Sea spray (Hannes Fritz, CC BY-SA)', + 'attribution_url' => 'http://hannes.photos/sea-spray', + ], + 'kamil-porembinski-clouds.jpg' => [ + 'attribution' => 'Clouds (Kamil Porembiński, CC BY-SA)', + 'attribution_url' => 'https://www.flickr.com/photos/paszczak000/8715851521/', + ], + 'bernard-spragg-new-zealand-fern.jpg' => [ + 'attribution' => 'New zealand fern (Bernard Spragg, CC0)', + 'attribution_url' => 'https://commons.wikimedia.org/wiki/File:NZ_Fern.(Blechnum_chambersii)_(11263534936).jpg', + ], + 'rawpixel-pink-tapioca-bubbles.jpg' => [ + 'attribution' => 'Pink tapioca bubbles (Rawpixel, CC BY)', + 'attribution_url' => 'https://www.flickr.com/photos/byrawpixel/27665140298/in/photostream/', + 'theming' => self::THEMING_MODE_DARK, + ], + 'nasa-waxing-crescent-moon.jpg' => [ + 'attribution' => 'Waxing crescent moon (NASA, Public Domain)', + 'attribution_url' => 'https://www.nasa.gov/image-feature/a-waxing-crescent-moon', + ], + 'tommy-chau-already.jpg' => [ + 'attribution' => 'Cityscape (Tommy Chau, CC BY)', + 'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/16910999368', + ], + 'tommy-chau-lion-rock-hill.jpg' => [ + 'attribution' => 'Lion rock hill (Tommy Chau, CC BY)', + 'attribution_url' => 'https://www.flickr.com/photos/90975693@N05/17136440246', + 'theming' => self::THEMING_MODE_DARK, + ], + 'lali-masriera-yellow-bricks.jpg' => [ + 'attribution' => 'Yellow bricks (Lali Masriera, CC BY)', + 'attribution_url' => 'https://www.flickr.com/photos/visualpanic/3982464447', + 'theming' => self::THEMING_MODE_DARK, + ] + ]; + + private IRootFolder $rootFolder; + private IAppData $appData; + private IConfig $config; + private string $userId; + + public function __construct( + IRootFolder $rootFolder, + IAppData $appData, + IConfig $config, + ?string $userId + ) { + if ($userId === null) { + return; + } + $this->rootFolder = $rootFolder; + $this->appData = $appData; + $this->config = $config; + $this->userId = $userId; + } + + public function setDefaultBackground(): void { + $this->config->deleteUserValue($this->userId, Application::APP_ID, 'background'); + } + + /** + * @param $path + * @throws NotFoundException + * @throws NotPermittedException + * @throws LockedException + * @throws PreConditionNotMetException + * @throws NoUserException + */ + public function setFileBackground($path): void { + $this->config->setUserValue($this->userId, Application::APP_ID, 'background', 'custom'); + $userFolder = $this->rootFolder->getUserFolder($this->userId); + /** @var File $file */ + $file = $userFolder->get($path); + $image = new \OCP\Image(); + if ($image->loadFromFileHandle($file->fopen('r')) === false) { + throw new InvalidArgumentException('Invalid image file'); + } + $this->getAppDataFolder()->newFile('background.jpg', $file->fopen('r')); + } + + public function setShippedBackground($fileName): void { + if (!array_key_exists($fileName, self::SHIPPED_BACKGROUNDS)) { + throw new InvalidArgumentException('The given file name is invalid'); + } + $this->config->setUserValue($this->userId, Application::APP_ID, 'background', $fileName); + } + + public function setColorBackground(string $color): void { + if (!preg_match('/^#([0-9a-f]{3}|[0-9a-f]{6})$/i', $color)) { + throw new InvalidArgumentException('The given color is invalid'); + } + $this->config->setUserValue($this->userId, Application::APP_ID, 'background', $color); + } + + public function getBackground(): ?ISimpleFile { + $background = $this->config->getUserValue($this->userId, Application::APP_ID, 'background', 'default'); + if ($background === 'custom') { + try { + return $this->getAppDataFolder()->getFile('background.jpg'); + } catch (NotFoundException | NotPermittedException $e) { + } + } + return null; + } + + /** + * @return ISimpleFolder + * @throws NotPermittedException + */ + private function getAppDataFolder(): ISimpleFolder { + try { + return $this->appData->getFolder($this->userId); + } catch (NotFoundException $e) { + return $this->appData->newFolder($this->userId); + } + } +} diff --git a/apps/theming/lib/Settings/Personal.php b/apps/theming/lib/Settings/Personal.php index 790c0fd7f39..5da72bf0158 100644 --- a/apps/theming/lib/Settings/Personal.php +++ b/apps/theming/lib/Settings/Personal.php @@ -30,7 +30,6 @@ use OCA\Theming\Service\ThemesService; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Services\IInitialState; use OCP\IConfig; -use OCP\IUserSession; use OCP\Settings\ISettings; use OCP\Util; @@ -38,18 +37,15 @@ class Personal implements ISettings { protected string $appName; private IConfig $config; - private IUserSession $userSession; private ThemesService $themesService; private IInitialState $initialStateService; public function __construct(string $appName, IConfig $config, - IUserSession $userSession, ThemesService $themesService, IInitialState $initialStateService) { $this->appName = $appName; $this->config = $config; - $this->userSession = $userSession; $this->themesService = $themesService; $this->initialStateService = $initialStateService; } diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 986892a6b6c..0fe1e8ff691 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -24,10 +24,11 @@ declare(strict_types=1); */ namespace OCA\Theming\Themes; +use OCA\Theming\AppInfo\Application; use OCA\Theming\ImageManager; +use OCA\Theming\ITheme; use OCA\Theming\ThemingDefaults; use OCA\Theming\Util; -use OCA\Theming\ITheme; use OCP\App\IAppManager; use OCP\IConfig; use OCP\IL10N; @@ -98,7 +99,7 @@ class DefaultTheme implements ITheme { $colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80); $hasCustomLogoHeader = $this->imageManager->hasImage('logo') || $this->imageManager->hasImage('logoheader'); - $hasCustomPrimaryColour = !empty($this->config->getAppValue('theming', 'color')); + $hasCustomPrimaryColour = !empty($this->config->getAppValue(Application::APP_ID, 'color')); $variables = [ '--color-main-background' => $colorMainBackground, @@ -210,7 +211,7 @@ class DefaultTheme implements ITheme { '--image-main-background' => "url('" . $this->urlGenerator->imagePath('core', 'app-background.jpg') . "')", ]; - $backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor'; + $backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor'; // If primary as background has been request or if we have a custom primary colour // let's not define the background image if ($backgroundDeleted || $hasCustomPrimaryColour) { @@ -240,13 +241,13 @@ class DefaultTheme implements ITheme { $appManager = Server::get(IAppManager::class); $userSession = Server::get(IUserSession::class); $user = $userSession->getUser(); - if ($appManager->isEnabledForUser('dashboard') && $user !== null) { - $dashboardBackground = $this->config->getUserValue($user->getUID(), 'dashboard', 'background', 'default'); + if ($appManager->isEnabledForUser(Application::APP_ID) && $user !== null) { + $themingBackground = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background', 'default'); - if ($dashboardBackground === 'custom') { - $variables['--image-main-background'] = "url('" . $this->urlGenerator->linkToRouteAbsolute('dashboard.dashboard.getBackground') . "')"; - } elseif ($dashboardBackground !== 'default' && substr($dashboardBackground, 0, 1) !== '#') { - $variables['--image-main-background'] = "url('/apps/dashboard/img/" . $dashboardBackground . "')"; + if ($themingBackground === 'custom') { + $variables['--image-main-background'] = "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.theming.getBackground') . "')"; + } elseif ($themingBackground !== 'default' && substr($themingBackground, 0, 1) !== '#') { + $variables['--image-main-background'] = "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "/img/background/$themingBackground") . "')"; } } diff --git a/apps/theming/src/UserThemes.vue b/apps/theming/src/UserThemes.vue index 8e7f1d54e37..c886394136a 100644 --- a/apps/theming/src/UserThemes.vue +++ b/apps/theming/src/UserThemes.vue @@ -1,42 +1,83 @@ +<!-- + - @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net> + - @copyright Copyright (c) 2022 Greta Doci <gretadoci@gmail.com> + - + - @author Christopher Ng <chrng8@gmail.com> + - + - @license AGPL-3.0-or-later + - + - This program is free software: you can redistribute it and/or modify + - it under the terms of the GNU Affero General Public License as + - published by the Free Software Foundation, either version 3 of the + - License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU Affero General Public License for more details. + - + - You should have received a copy of the GNU Affero General Public License + - along with this program. If not, see <http://www.gnu.org/licenses/>. + - +--> + <template> - <NcSettingsSection class="theming" :title="t('themes', 'Appearance and accessibility')"> - <p v-html="description" /> - <p v-html="descriptionDetail" /> - - <div class="theming__preview-list"> - <ItemPreview v-for="theme in themes" - :key="theme.id" - :enforced="theme.id === enforceTheme" - :selected="selectedTheme.id === theme.id" - :theme="theme" - :unique="themes.length === 1" - type="theme" - @change="changeTheme" /> - </div> - - <div class="theming__preview-list"> - <ItemPreview v-for="theme in fonts" - :key="theme.id" - :selected="theme.enabled" - :theme="theme" - :unique="fonts.length === 1" - type="font" - @change="changeFont" /> - </div> - </NcSettingsSection> + <section> + <NcSettingsSection class="theming" :title="t('theming', 'Appearance and accessibility')"> + <p v-html="description" /> + <p v-html="descriptionDetail" /> + + <div class="theming__preview-list"> + <ItemPreview v-for="theme in themes" + :key="theme.id" + :enforced="theme.id === enforceTheme" + :selected="selectedTheme.id === theme.id" + :theme="theme" + :unique="themes.length === 1" + type="theme" + @change="changeTheme" /> + </div> + + <div class="theming__preview-list"> + <ItemPreview v-for="theme in fonts" + :key="theme.id" + :selected="theme.enabled" + :theme="theme" + :unique="fonts.length === 1" + type="font" + @change="changeFont" /> + </div> + </NcSettingsSection> + <NcSettingsSection :title="t('theming', 'Background')" + class="background"> + <p>{{ t('theming', 'Set a custom background') }}</p> + <BackgroundSettings class="background__grid" + :background="background" + :theming-default-background="themingDefaultBackground" + @update:background="updateBackground" /> + </NcSettingsSection> + </section> </template> <script> -import { generateOcsUrl } from '@nextcloud/router' +import { generateOcsUrl, imagePath } from '@nextcloud/router' import { loadState } from '@nextcloud/initial-state' import axios from '@nextcloud/axios' import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection' -import ItemPreview from './components/ItemPreview' +import BackgroundSettings from './components/BackgroundSettings.vue' +import ItemPreview from './components/ItemPreview.vue' + +import { getBackgroundUrl } from '../src/helpers/getBackgroundUrl.js' const availableThemes = loadState('theming', 'themes', []) const enforceTheme = loadState('theming', 'enforceTheme', '') +const background = loadState('theming', 'background') +const backgroundVersion = loadState('theming', 'backgroundVersion') +const themingDefaultBackground = loadState('theming', 'themingDefaultBackground') +const shippedBackgroundList = loadState('theming', 'shippedBackgrounds') + console.debug('Available themes', availableThemes) export default { @@ -44,16 +85,32 @@ export default { components: { ItemPreview, NcSettingsSection, + BackgroundSettings, }, data() { return { availableThemes, enforceTheme, + background, + themingDefaultBackground, } }, computed: { + backgroundImage() { + return getBackgroundUrl(this.background, backgroundVersion, this.themingDefaultBackground) + }, + backgroundStyle() { + if ((this.background === 'default' && this.themingDefaultBackground === 'backgroundColor') + || this.background.match(/#[0-9A-Fa-f]{6}/g)) { + return null + } + + return { + backgroundImage: this.background === 'default' ? 'var(--image-main-background)' : `url('${this.backgroundImage}')`, + } + }, themes() { return this.availableThemes.filter(theme => theme.type === 1) }, @@ -94,7 +151,40 @@ export default { return '<a target="_blank" href="https://nextcloud.com/design" rel="noreferrer nofollow">' }, }, + mounted() { + this.updateGlobalStyles() + }, methods: { + updateBackground(data) { + this.background = (data.type === 'custom' || data.type === 'default') ? data.type : data.value + this.updateGlobalStyles() + }, + updateGlobalStyles() { + // Override primary-invert-if-bright and color-primary-text if background is set + const isBackgroundBright = shippedBackgroundList[this.background]?.theming === 'dark' + if (isBackgroundBright) { + document.querySelector('#header').style.setProperty('--primary-invert-if-bright', 'invert(100%)') + document.querySelector('#header').style.setProperty('--color-primary-text', '#000000') + // document.body.removeAttribute('data-theme-dark') + // document.body.setAttribute('data-theme-light', 'true') + } else { + document.querySelector('#header').style.setProperty('--primary-invert-if-bright', 'no') + document.querySelector('#header').style.setProperty('--color-primary-text', '#ffffff') + // document.body.removeAttribute('data-theme-light') + // document.body.setAttribute('data-theme-dark', 'true') + } + + const themeElements = [document.documentElement, document.querySelector('#header'), document.querySelector('body')] + for (const element of themeElements) { + if (this.background === 'default') { + element.style.setProperty('--image-main-background', `url('${imagePath('core', 'app-background.jpg')}')`) + } else if (this.background.match(/#[0-9A-Fa-f]{6}/g)) { + element.style.setProperty('--image-main-background', undefined) + } else { + element.style.setProperty('--image-main-background', this.backgroundStyle.backgroundImage) + } + } + }, changeTheme({ enabled, id }) { // Reset selected and select new one this.themes.forEach(theme => { @@ -194,11 +284,16 @@ export default { } } +.background { + &__grid { + margin-top: 30px; + } +} + @media (max-width: 1440px) { .theming__preview-list { display: flex; flex-direction: column; } } - </style> diff --git a/apps/theming/src/components/BackgroundSettings.vue b/apps/theming/src/components/BackgroundSettings.vue new file mode 100644 index 00000000000..3de68d5abed --- /dev/null +++ b/apps/theming/src/components/BackgroundSettings.vue @@ -0,0 +1,195 @@ +<!-- + - @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net> + - @copyright Copyright (c) 2022 Greta Doci <gretadoci@gmail.com> + - + - @author Julius Härtl <jus@bitgrid.net> + - @author Greta Doci <gretadoci@gmail.com> + - @author Christopher Ng <chrng8@gmail.com> + - + - @license GNU AGPL version 3 or any later version + - + - This program is free software: you can redistribute it and/or modify + - it under the terms of the GNU Affero General Public License as + - published by the Free Software Foundation, either version 3 of the + - License, or (at your option) any later version. + - + - This program is distributed in the hope that it will be useful, + - but WITHOUT ANY WARRANTY; without even the implied warranty of + - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + - GNU Affero General Public License for more details. + - + - You should have received a copy of the GNU Affero General Public License + - along with this program. If not, see <http://www.gnu.org/licenses/>. + - + --> + +<template> + <div class="background-selector"> + <button class="background filepicker" + :class="{ active: background === 'custom' }" + tabindex="0" + @click="pickFile"> + {{ t('theming', 'Pick from Files') }} + </button> + <button class="background default" + tabindex="0" + :class="{ 'icon-loading': loading === 'default', active: background === 'default' }" + @click="setDefault"> + {{ t('theming', 'Default image') }} + </button> + <button class="background color" + :class="{ active: background === 'custom' }" + tabindex="0" + @click="pickColor"> + {{ t('theming', 'Plain background') }} + </button> + <button v-for="shippedBackground in shippedBackgrounds" + :key="shippedBackground.name" + v-tooltip="shippedBackground.details.attribution" + :class="{ 'icon-loading': loading === shippedBackground.name, active: background === shippedBackground.name }" + tabindex="0" + class="background" + :style="{ 'background-image': 'url(' + shippedBackground.preview + ')' }" + @click="setShipped(shippedBackground.name)" /> + </div> +</template> + +<script> +import axios from '@nextcloud/axios' +import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip' +import { generateUrl } from '@nextcloud/router' +import { loadState } from '@nextcloud/initial-state' +import { getBackgroundUrl } from '../helpers/getBackgroundUrl.js' +import { prefixWithBaseUrl } from '../helpers/prefixWithBaseUrl.js' + +const shippedBackgroundList = loadState('theming', 'shippedBackgrounds') + +export default { + name: 'BackgroundSettings', + directives: { + Tooltip, + }, + props: { + background: { + type: String, + default: 'default', + }, + themingDefaultBackground: { + type: String, + default: '', + }, + }, + data() { + return { + backgroundImage: generateUrl('/apps/theming/background') + '?v=' + Date.now(), + loading: false, + } + }, + computed: { + shippedBackgrounds() { + return Object.keys(shippedBackgroundList).map(fileName => { + return { + name: fileName, + url: prefixWithBaseUrl(fileName), + preview: prefixWithBaseUrl('preview/' + fileName), + details: shippedBackgroundList[fileName], + } + }) + }, + }, + methods: { + async update(data) { + const background = data.type === 'custom' || data.type === 'default' ? data.type : data.value + this.backgroundImage = getBackgroundUrl(background, data.version, this.themingDefaultBackground) + if (data.type === 'color' || (data.type === 'default' && this.themingDefaultBackground === 'backgroundColor')) { + this.$emit('update:background', data) + this.loading = false + return + } + const image = new Image() + image.onload = () => { + this.$emit('update:background', data) + this.loading = false + } + image.src = this.backgroundImage + }, + async setDefault() { + this.loading = 'default' + const result = await axios.post(generateUrl('/apps/theming/background/default')) + this.update(result.data) + }, + async setShipped(shipped) { + this.loading = shipped + const result = await axios.post(generateUrl('/apps/theming/background/shipped'), { value: shipped }) + this.update(result.data) + }, + async setFile(path) { + this.loading = 'custom' + const result = await axios.post(generateUrl('/apps/theming/background/custom'), { value: path }) + this.update(result.data) + }, + async pickColor() { + this.loading = 'color' + const color = OCA && OCA.Theming ? OCA.Theming.color : '#0082c9' + const result = await axios.post(generateUrl('/apps/theming/background/color'), { value: color }) + this.update(result.data) + }, + pickFile() { + window.OC.dialogs.filepicker(t('theming', 'Insert from {productName}', { productName: OC.theme.name }), (path, type) => { + if (type === OC.dialogs.FILEPICKER_TYPE_CHOOSE) { + this.setFile(path) + } + }, false, ['image/png', 'image/gif', 'image/jpeg', 'image/svg'], true, OC.dialogs.FILEPICKER_TYPE_CHOOSE) + }, + }, +} +</script> + +<style scoped lang="scss"> +.background-selector { + display: flex; + flex-wrap: wrap; + justify-content: center; + + .background { + width: 176px; + height: 96px; + margin: 8px; + background-size: cover; + background-position: center center; + text-align: center; + border-radius: var(--border-radius-large); + border: 2px solid var(--color-main-background); + overflow: hidden; + + &.current { + background-image: var(--color-background-dark); + } + + &.filepicker, &.default, &.color { + border-color: var(--color-border); + } + + &.color { + background-color: var(--color-primary); + color: var(--color-primary-text); + } + + &.active, + &:hover, + &:focus { + border: 2px solid var(--color-primary); + } + + &.active:not(.icon-loading):after { + background-image: var(--icon-checkmark-white); + background-repeat: no-repeat; + background-position: center; + background-size: 44px; + content: ''; + display: block; + height: 100%; + } + } +} +</style> diff --git a/apps/theming/src/helpers/getBackgroundUrl.js b/apps/theming/src/helpers/getBackgroundUrl.js new file mode 100644 index 00000000000..2e0088f6d30 --- /dev/null +++ b/apps/theming/src/helpers/getBackgroundUrl.js @@ -0,0 +1,51 @@ +/** + * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net> + * + * @author Avior <florian.bouillon@delta-wings.net> + * @author Julien Veyssier <eneiluj@posteo.net> + * @author Julius Härtl <jus@bitgrid.net> + * + * @license AGPL-3.0-or-later + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +// FIXME hoist this into a package? The same logic is used in `apps/dashboard/src/helpers/getBackgroundUrl.js` + +import { generateUrl } from '@nextcloud/router' +import { prefixWithBaseUrl } from './prefixWithBaseUrl.js' + +export const getBackgroundUrl = (background, time = 0, themingDefaultBackground = '') => { + const enabledThemes = window.OCA?.Theming?.enabledThemes || [] + const isDarkTheme = (enabledThemes.length === 0 || enabledThemes[0] === 'default') + ? window.matchMedia('(prefers-color-scheme: dark)').matches + : enabledThemes.join('').indexOf('dark') !== -1 + + if (background === 'default') { + if (themingDefaultBackground && themingDefaultBackground !== 'backgroundColor') { + return generateUrl('/apps/theming/image/background') + '?v=' + window.OCA.Theming.cacheBuster + } + + if (isDarkTheme) { + return prefixWithBaseUrl('eduardo-neves-pedra-azul.jpg') + } + + return prefixWithBaseUrl('kamil-porembinski-clouds.jpg') + } else if (background === 'custom') { + return generateUrl('/apps/theming/background') + '?v=' + time + } + + return prefixWithBaseUrl(background) +} diff --git a/apps/theming/src/helpers/prefixWithBaseUrl.js b/apps/theming/src/helpers/prefixWithBaseUrl.js new file mode 100644 index 00000000000..07e4986593c --- /dev/null +++ b/apps/theming/src/helpers/prefixWithBaseUrl.js @@ -0,0 +1,27 @@ +/** + * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net> + * + * @author Julius Härtl <jus@bitgrid.net> + * + * @license AGPL-3.0-or-later + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +// FIXME hoist this into a package? The same logic is used in `apps/dashboard/src/helpers/prefixWithBaseUrl.js` + +import { generateFilePath } from '@nextcloud/router' + +export const prefixWithBaseUrl = (url) => generateFilePath('theming', '', 'img/background/') + url diff --git a/apps/theming/tests/Controller/UserThemeControllerTest.php b/apps/theming/tests/Controller/UserThemeControllerTest.php index 952cd012210..ffacf5108a5 100644 --- a/apps/theming/tests/Controller/UserThemeControllerTest.php +++ b/apps/theming/tests/Controller/UserThemeControllerTest.php @@ -22,8 +22,10 @@ */ namespace OCA\Theming\Tests\Controller; +use OCA\Theming\AppInfo\Application; use OCA\Theming\Controller\UserThemeController; use OCA\Theming\ITheme; +use OCA\Theming\Service\BackgroundService; use OCA\Theming\Themes\DarkHighContrastTheme; use OCA\Theming\Themes\DarkTheme; use OCA\Theming\Themes\DefaultTheme; @@ -52,6 +54,9 @@ class UserThemeControllerTest extends TestCase { private $userSession; /** @var ThemeService|MockObject */ private $themesService; + /** @var BackgroundService|MockObject */ + private $backgroundService; + /** @var ITheme[] */ private $themes; @@ -61,6 +66,7 @@ class UserThemeControllerTest extends TestCase { $this->config = $this->createMock(IConfig::class); $this->userSession = $this->createMock(IUserSession::class); $this->themesService = $this->createMock(ThemesService::class); + $this->backgroundService = $this->createMock(BackgroundService::class); $this->themes = [ 'default' => $this->createMock(DefaultTheme::class), @@ -80,11 +86,12 @@ class UserThemeControllerTest extends TestCase { ->willReturn('user'); $this->userThemeController = new UserThemeController( - 'theming', + Application::APP_ID, $this->request, $this->config, $this->userSession, $this->themesService, + $this->backgroundService, ); parent::setUp(); diff --git a/apps/theming/tests/Settings/PersonalTest.php b/apps/theming/tests/Settings/PersonalTest.php index a5409e5f57a..3051a210353 100644 --- a/apps/theming/tests/Settings/PersonalTest.php +++ b/apps/theming/tests/Settings/PersonalTest.php @@ -45,12 +45,10 @@ use OCP\AppFramework\Services\IInitialState; use OCP\IConfig; use OCP\IL10N; use OCP\IURLGenerator; -use OCP\IUserSession; use Test\TestCase; class PersonalTest extends TestCase { private IConfig $config; - private IUserSession $userSession; private ThemesService $themesService; private IInitialState $initialStateService; @@ -60,7 +58,6 @@ class PersonalTest extends TestCase { protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); - $this->userSession = $this->createMock(IUserSession::class); $this->themesService = $this->createMock(ThemesService::class); $this->initialStateService = $this->createMock(IInitialState::class); @@ -74,7 +71,6 @@ class PersonalTest extends TestCase { $this->admin = new Personal( Application::APP_ID, $this->config, - $this->userSession, $this->themesService, $this->initialStateService ); |