Merge menu service & layout service

src/service/layout/layout.service.ts

@@ -17,6 +17,11 @@ interface LayoutState {
     menuHoverActive?: boolean;
 }
 
+interface MenuChangeEvent {
+    key: string;
+    routeEvent?: boolean;
+}
+
 @Injectable({
     providedIn: 'root',
 })
@@ -45,6 +50,14 @@ export class LayoutService {
 
     private overlayOpen = new Subject<any>();
 
+    private menuSource = new Subject<MenuChangeEvent>();
+
+    private resetSource = new Subject();
+
+    menuSource$ = this.menuSource.asObservable();
+
+    resetSource$ = this.resetSource.asObservable();
+
     configUpdate$ = this.configUpdate.asObservable();
 
     overlayOpen$ = this.overlayOpen.asObservable();
@@ -151,4 +164,12 @@ export class LayoutService {
         this._config = { ...this.layoutConfig() };
         this.configUpdate.next(this.layoutConfig());
     }
+
+    onMenuStateChange(event: MenuChangeEvent) {
+        this.menuSource.next(event);
+    }
+
+    reset() {
+        this.resetSource.next(true);
+    }
 }

src/service/layout/menu.service.ts

@@ -1,27 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
-
-interface MenuChangeEvent {
-    key: string;
-    routeEvent?: boolean;
-}
-
-@Injectable({
-    providedIn: 'root'
-})
-export class MenuService {
-
-    private menuSource = new Subject<MenuChangeEvent>();
-    private resetSource = new Subject();
-
-    menuSource$ = this.menuSource.asObservable();
-    resetSource$ = this.resetSource.asObservable();
-
-    onMenuStateChange(event: MenuChangeEvent) {
-        this.menuSource.next(event);
-    }
-
-    reset() {
-        this.resetSource.next(true);
-    }
-}