Merge pull request #22117 from nextcloud/activity-settings-grouping

allow grouping of activity settings

Author: MorrisJobke

apps/files/composer/composer/autoload_classmap.php

@@ -12,6 +12,7 @@
     'OCA\\Files\\Activity\\Helper' => $baseDir . '/../lib/Activity/Helper.php',
     'OCA\\Files\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
     'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
+    'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
     'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
     'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
     'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',

apps/files/composer/composer/autoload_static.php

@@ -27,6 +27,7 @@ class ComposerStaticInitFiles
         'OCA\\Files\\Activity\\Helper' => __DIR__ . '/..' . '/../lib/Activity/Helper.php',
         'OCA\\Files\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
         'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
+        'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
         'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
         'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
         'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',

apps/files/lib/Activity/Settings/FavoriteAction.php

@@ -23,21 +23,7 @@
 
 namespace OCA\Files\Activity\Settings;
 
-use OCP\Activity\ISetting;
-use OCP\IL10N;
-
-class FavoriteAction implements ISetting {
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
-
+class FavoriteAction extends FileActivitySettings {
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0

apps/files/lib/Activity/Settings/FileActivitySettings.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2020 Robin Appelman <robin@icewind.nl>
+ *
+ * @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\Files\Activity\Settings;
+
+use OCP\Activity\ActivitySettings;
+use OCP\IL10N;
+
+abstract class FileActivitySettings extends ActivitySettings {
+	/** @var IL10N */
+	protected $l;
+
+	/**
+	 * @param IL10N $l
+	 */
+	public function __construct(IL10N $l) {
+		$this->l = $l;
+	}
+
+	public function getGroupIdentifier() {
+		return 'files';
+	}
+
+	public function getGroupName() {
+		return $this->l->t('Files');
+	}
+}

apps/files/lib/Activity/Settings/FileChanged.php

@@ -23,21 +23,7 @@
 
 namespace OCA\Files\Activity\Settings;
 
-use OCP\Activity\ISetting;
-use OCP\IL10N;
-
-class FileChanged implements ISetting {
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
-
+class FileChanged extends FileActivitySettings {
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0

apps/files/lib/Activity/Settings/FileCreated.php

@@ -23,21 +23,7 @@
 
 namespace OCA\Files\Activity\Settings;
 
-use OCP\Activity\ISetting;
-use OCP\IL10N;
-
-class FileCreated implements ISetting {
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
-
+class FileCreated extends FileActivitySettings {
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0

apps/files/lib/Activity/Settings/FileDeleted.php

@@ -23,21 +23,7 @@
 
 namespace OCA\Files\Activity\Settings;
 
-use OCP\Activity\ISetting;
-use OCP\IL10N;
-
-class FileDeleted implements ISetting {
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
-
+class FileDeleted extends FileActivitySettings {
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0

apps/files/lib/Activity/Settings/FileFavorite.php

@@ -23,21 +23,7 @@
 
 namespace OCA\Files\Activity\Settings;
 
-use OCP\Activity\ISetting;
-use OCP\IL10N;
-
-class FileFavorite implements ISetting {
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
-
+class FileFavorite extends FileActivitySettings {
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0

apps/files/lib/Activity/Settings/FileRestored.php

@@ -23,21 +23,7 @@
 
 namespace OCA\Files\Activity\Settings;
 
-use OCP\Activity\ISetting;
-use OCP\IL10N;
-
-class FileRestored implements ISetting {
-
-	/** @var IL10N */
-	protected $l;
-
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
-
+class FileRestored extends FileActivitySettings {
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0

lib/private/Activity/ActivitySettingsAdapter.php

@@ -25,16 +25,19 @@
 
 use OCP\Activity\ActivitySettings;
 use OCP\Activity\ISetting;
+use OCP\IL10N;
 
 /**
  * Adapt the old interface based settings into the new abstract
  * class based one
  */
 class ActivitySettingsAdapter extends ActivitySettings {
 	private $oldSettings;
+	private $l10n;
 
-	public function __construct(ISetting $oldSettings) {
+	public function __construct(ISetting $oldSettings, IL10N $l10n) {
 		$this->oldSettings = $oldSettings;
+		$this->l10n = $l10n;
 	}
 
 	public function getIdentifier() {
@@ -45,6 +48,14 @@ public function getName() {
 		return $this->oldSettings->getName();
 	}
 
+	public function getGroupIdentifier() {
+		return 'other';
+	}
+
+	public function getGroupName() {
+		return $this->l10n->t('Other activities');
+	}
+
 	public function getPriority() {
 		return $this->oldSettings->getPriority();
 	}