From aadf0f6f87499c59e22a7a5fda161a263954bb2c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 25 Aug 2020 19:11:28 +0200 Subject: [PATCH 1/2] move calendar settings into their own group Signed-off-by: Robin Appelman --- .../composer/composer/autoload_classmap.php | 1 + .../dav/composer/composer/autoload_static.php | 1 + .../CalDAV/Activity/Setting/CalDAVSetting.php | 47 +++++++++++++++++++ .../lib/CalDAV/Activity/Setting/Calendar.php | 16 +------ .../dav/lib/CalDAV/Activity/Setting/Event.php | 16 +------ apps/dav/lib/CalDAV/Activity/Setting/Todo.php | 15 +----- 6 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php diff --git a/apps/dav/composer/composer/autoload_classmap.php b/apps/dav/composer/composer/autoload_classmap.php index 0e465971a5..aaa5e82da0 100644 --- a/apps/dav/composer/composer/autoload_classmap.php +++ b/apps/dav/composer/composer/autoload_classmap.php @@ -27,6 +27,7 @@ return array( 'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Provider/Calendar.php', 'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => $baseDir . '/../lib/CalDAV/Activity/Provider/Event.php', 'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Provider/Todo.php', + 'OCA\\DAV\\CalDAV\\Activity\\Setting\\CalDAVSetting' => $baseDir . '/../lib/CalDAV/Activity/Setting/CalDAVSetting.php', 'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => $baseDir . '/../lib/CalDAV/Activity/Setting/Calendar.php', 'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => $baseDir . '/../lib/CalDAV/Activity/Setting/Event.php', 'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => $baseDir . '/../lib/CalDAV/Activity/Setting/Todo.php', diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php index 4788a41ef0..0dc34f5a31 100644 --- a/apps/dav/composer/composer/autoload_static.php +++ b/apps/dav/composer/composer/autoload_static.php @@ -42,6 +42,7 @@ class ComposerStaticInitDAV 'OCA\\DAV\\CalDAV\\Activity\\Provider\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Calendar.php', 'OCA\\DAV\\CalDAV\\Activity\\Provider\\Event' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Event.php', 'OCA\\DAV\\CalDAV\\Activity\\Provider\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Provider/Todo.php', + 'OCA\\DAV\\CalDAV\\Activity\\Setting\\CalDAVSetting' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/CalDAVSetting.php', 'OCA\\DAV\\CalDAV\\Activity\\Setting\\Calendar' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Calendar.php', 'OCA\\DAV\\CalDAV\\Activity\\Setting\\Event' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Event.php', 'OCA\\DAV\\CalDAV\\Activity\\Setting\\Todo' => __DIR__ . '/..' . '/../lib/CalDAV/Activity/Setting/Todo.php', diff --git a/apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php b/apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php new file mode 100644 index 0000000000..b20c27375a --- /dev/null +++ b/apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php @@ -0,0 +1,47 @@ + + * + * @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 . + * + */ + +namespace OCA\DAV\CalDAV\Activity\Setting; + +use OCP\Activity\ActivitySettings; +use OCP\IL10N; + +abstract class CalDAVSetting extends ActivitySettings { + /** @var IL10N */ + protected $l; + + /** + * @param IL10N $l + */ + public function __construct(IL10N $l) { + $this->l = $l; + } + + public function getGroupIdentifier() { + return 'calendar'; + } + + public function getGroupName() { + return $this->l->t("Calendar and tasks"); + } +} diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php b/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php index b9475535e4..06cbe33946 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php @@ -23,21 +23,7 @@ namespace OCA\DAV\CalDAV\Activity\Setting; -use OCP\Activity\ISetting; -use OCP\IL10N; - -class Calendar implements ISetting { - - /** @var IL10N */ - protected $l; - - /** - * @param IL10N $l - */ - public function __construct(IL10N $l) { - $this->l = $l; - } - +class Calendar extends CalDAVSetting { /** * @return string Lowercase a-z and underscore only identifier * @since 11.0.0 diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Event.php b/apps/dav/lib/CalDAV/Activity/Setting/Event.php index 1cd3fc3a05..d0c1676773 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/Event.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/Event.php @@ -23,21 +23,7 @@ namespace OCA\DAV\CalDAV\Activity\Setting; -use OCP\Activity\ISetting; -use OCP\IL10N; - -class Event implements ISetting { - - /** @var IL10N */ - protected $l; - - /** - * @param IL10N $l - */ - public function __construct(IL10N $l) { - $this->l = $l; - } - +class Event extends CalDAVSetting { /** * @return string Lowercase a-z and underscore only identifier * @since 11.0.0 diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php index 2dfc85957c..5ebc4ec240 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php @@ -23,20 +23,7 @@ namespace OCA\DAV\CalDAV\Activity\Setting; -use OCP\Activity\ISetting; -use OCP\IL10N; - -class Todo implements ISetting { - - /** @var IL10N */ - protected $l; - - /** - * @param IL10N $l - */ - public function __construct(IL10N $l) { - $this->l = $l; - } +class Todo extends CalDAVSetting { /** * @return string Lowercase a-z and underscore only identifier From 460db942a04690860059cf1604c6a0999526ca51 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 26 Aug 2020 12:20:46 +0000 Subject: [PATCH 2/2] Update apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> --- apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php b/apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php index b20c27375a..1d3dd1df67 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php @@ -42,6 +42,6 @@ abstract class CalDAVSetting extends ActivitySettings { } public function getGroupName() { - return $this->l->t("Calendar and tasks"); + return $this->l->t('Calendar and tasks'); } }