Move navigation registration to info.xml

Signed-off-by: Joas Schilling <coding@schilljs.com>

2 files changed, 18 insertions, 14 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index e724af02..72523834 100755
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,28 +1,23 @@
 <?php
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Frank Karlitschek <frank@karlitschek.de>
  * @author Joas Schilling <coding@schilljs.com>
  *
- * @license AGPL-3.0
+ * @license GNU AGPL version 3 or any later version
  *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
+ * 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
+ * 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * 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/>.
  *
  */
 
 $app = new \OCA\Activity\AppInfo\Application();
-$app->registerNavigationEntry();
-$app->registerActivityConsumer();
-$app->registerHooksAndEvents();
-$app->registerPersonalPage();
+$app->register();
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 8a068d55..c6ff2956 100755
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -32,6 +32,15 @@
 		<nextcloud min-version="12" max-version="12" />
 	</dependencies>
 
+	<navigations>
+		<navigation>
+			<name>Activity</name>
+			<route>activity.Activities.showList</route>
+			<order>1</order>
+			<icon>activity.svg</icon>
+		</navigation>
+	</navigations>
+
 	<activity>
 		<filters>
 			<filter>OCA\Activity\Filter\AllFilter</filter>