Small theme changing improvement + fixed test issue

src/app/app.module.ts

@@ -3,7 +3,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { NgModule } from '@angular/core';
 
-import { MatCardModule, MatDialogModule, MatSnackBarModule, MatButtonToggleModule } from '@angular/material';
+import { MatCardModule, MatDialogModule, MatSnackBarModule } from '@angular/material';
 import { MatListModule } from '@angular/material/list';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatIconModule } from '@angular/material/icon';
@@ -11,7 +11,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatGridListModule } from '@angular/material/grid-list';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
-import { MatButtonModule } from '@angular/material/button';
+import { MatButtonModule, MatButtonToggleModule } from '@angular/material';
 import { MatInputModule } from '@angular/material';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';

src/app/components/themes/themes.component.html

@@ -1,8 +1,8 @@
 <p *ngIf="themeLevelSwitching">
   <b>Theme level:</b>
-  <mat-button-toggle-group name="theme_toggle" [value]="theme_level">
-    <mat-button-toggle (click)="onGlobal()" value="global">Global</mat-button-toggle>
-    <mat-button-toggle (click)="onService()" value="service">Service</mat-button-toggle>
+  <mat-button-toggle-group [value]="theme_level" (change)="onThemeLevelSelected(themeLevelToggle.value)" #themeLevelToggle="matButtonToggleGroup">
+    <mat-button-toggle value="global">Global</mat-button-toggle>
+    <mat-button-toggle value="service">Service</mat-button-toggle>
   </mat-button-toggle-group>
 </p>
 <ng-container *ngIf="!unsupportedLevel; else unsupportedLevelWarning">
@@ -15,5 +15,4 @@
   <p style="text-align: center;">Song level theme changing not yet supported.<br>
     To continue, change your theme level.
   </p>
-</ng-template>
-
+</ng-template>

src/app/components/themes/themes.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ThemesComponent } from './themes.component';
-
-describe('ThemesComponent', () => {
-  let component: ThemesComponent;
-  let fixture: ComponentFixture<ThemesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ThemesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ThemesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/themes/themes.component.ts

@@ -10,6 +10,7 @@ import { PageTitleService } from '../../page-title.service';
   styleUrls: ['./themes.component.scss'],
   providers: [OpenLPService]
 })
+
 export class ThemesComponent implements OnInit {
   theme_list = null;
   theme_level = null;
@@ -17,7 +18,6 @@ export class ThemesComponent implements OnInit {
   themeLevelSwitching = false;
   unsupportedLevel = false;
 
-  test = false;
 
   constructor(private pageTitleService: PageTitleService, private openlpService: OpenLPService) {
     pageTitleService.changePageTitle('Themes');
@@ -47,14 +47,6 @@ export class ThemesComponent implements OnInit {
     this.openlpService.setTheme(theme).subscribe(res => this.getThemes());
   }
 
-  onGlobal() {
-    this.onThemeLevelSelected('global');
-  }
-
-  onService() {
-    this.onThemeLevelSelected('service');
-  }
-
   levelSliderChanged(event: MatSlideToggleChange) {
     this.themeLevelSwitching = event.checked;
   }

src/app/openlp.service.ts

@@ -14,7 +14,6 @@ import {
   AuthToken
 } from './responses';
 import { environment } from '../environments/environment';
-import { MatSlideToggle, MatSlideToggleChange } from '@angular/material';
 
 
 const deserialize = (json, cls) => {