Skip to content

Commit a7e0dd2

Browse files
committed
chore(): improvements theme mode toggle and others update
1 parent c9c77df commit a7e0dd2

File tree

7 files changed

+39
-41
lines changed

7 files changed

+39
-41
lines changed

src/app/common/social-wrapper/social-wrapper.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
rel="nofollow">
2828
<i class="fab fa-discord"></i>
2929
</a>
30-
<app-dark-mode-toggle></app-dark-mode-toggle>
30+
<app-theme-mode-toggle></app-theme-mode-toggle>
3131
</div>

src/app/shared/components/dark-mode-toggle/dark-mode-toggle.component.spec.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<button class="dark-mode-toggle" (click)="toggleDarkMode()">
1+
<button class="theme-mode-toggle" (click)="toggleThemeMode()">
22
<span class="material-icons" *ngIf="!isDarkMode"> light_mode </span>
33
<span class="material-icons" *ngIf="isDarkMode"> dark_mode </span>
44
</button>

src/app/shared/components/dark-mode-toggle/dark-mode-toggle.component.scss renamed to src/app/shared/components/theme-mode-toggle/theme-mode-toggle.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
justify-content: center;
66
}
77

8-
.dark-mode-toggle {
8+
.theme-mode-toggle {
99
// Button reset
1010
border: none;
1111
margin: 0;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { ThemeModeToggleComponent } from './theme-mode-toggle.component';
3+
4+
describe('ThemeModeToggleComponent', () => {
5+
let component: ThemeModeToggleComponent;
6+
let fixture: ComponentFixture<ThemeModeToggleComponent>;
7+
8+
beforeEach(async () => {
9+
await TestBed.configureTestingModule({
10+
declarations: [ThemeModeToggleComponent],
11+
}).compileComponents();
12+
});
13+
14+
beforeEach(() => {
15+
fixture = TestBed.createComponent(ThemeModeToggleComponent);
16+
component = fixture.componentInstance;
17+
fixture.detectChanges();
18+
});
19+
20+
it('should create', () => {
21+
expect(component).toBeTruthy();
22+
});
23+
});

src/app/shared/components/dark-mode-toggle/dark-mode-toggle.component.ts renamed to src/app/shared/components/theme-mode-toggle/theme-mode-toggle.component.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { MediaMatcher } from '@angular/cdk/layout';
44
import { StorageService } from '../../services/storage.service';
55

66
@Component({
7-
selector: 'app-dark-mode-toggle',
8-
templateUrl: './dark-mode-toggle.component.html',
9-
styleUrls: ['./dark-mode-toggle.component.scss'],
7+
selector: 'app-theme-mode-toggle',
8+
templateUrl: './theme-mode-toggle.component.html',
9+
styleUrls: ['./theme-mode-toggle.component.scss'],
1010
})
11-
export class DarkModeToggleComponent implements OnInit {
11+
export class ThemeModeToggleComponent implements OnInit {
1212
isDarkMode: boolean;
1313

1414
constructor(
@@ -19,25 +19,25 @@ export class DarkModeToggleComponent implements OnInit {
1919
) {}
2020

2121
ngOnInit() {
22-
const userPrefersDark =
22+
const userPrefersTheme =
2323
this.mediaMatcher.matchMedia &&
24-
this.mediaMatcher.matchMedia('(prefers-color-scheme: dark)').matches;
24+
this.mediaMatcher.matchMedia('(prefers-color-scheme: light)').matches;
2525
// In case the user has used the toggle button, we prioritize it over the
2626
// system settings
27-
this.setDarkMode(this.getUserSettingsIsDarkMode() || userPrefersDark);
27+
this.setThemeMode(this.getUserSettingsIsDarkMode() || userPrefersTheme);
2828
}
2929

30-
toggleDarkMode() {
30+
toggleThemeMode() {
3131
const isDarkMode = !this.isDarkMode;
3232
this.storageService.set('theme-mode', isDarkMode.toString());
33-
this.setDarkMode(isDarkMode);
33+
this.setThemeMode(isDarkMode);
3434
}
3535

3636
private getUserSettingsIsDarkMode(): boolean {
3737
return this.storageService.get('theme-mode') === 'true';
3838
}
3939

40-
private setDarkMode(isDarkMode: boolean) {
40+
private setThemeMode(isDarkMode: boolean) {
4141
this.isDarkMode = isDarkMode;
4242
this.document.documentElement.setAttribute(
4343
'mode',

src/app/shared/shared.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
33
import { StorageService } from './services/storage.service';
4-
import { DarkModeToggleComponent } from './components/dark-mode-toggle/dark-mode-toggle.component';
4+
import { ThemeModeToggleComponent } from './components/theme-mode-toggle/theme-mode-toggle.component';
55
import { BannerCoursesAuthComponent } from './components/banner-courses-auth/banner-courses-auth.component';
66
import { BannerCoursesGraphQLCodeFirstComponent } from './components/banner-courses-graphql-cf/banner-courses-graphql-cf.component';
77
import { BannerDevtoolsComponent } from './components/banner-devtools/banner-devtools.component';
@@ -26,7 +26,7 @@ import { ExtensionPipe } from './pipes/extension.pipe';
2626
BannerCoursesGraphQLCodeFirstComponent,
2727
BannerDevtoolsComponent,
2828
BannerCoursesAuthComponent,
29-
DarkModeToggleComponent,
29+
ThemeModeToggleComponent,
3030
],
3131
exports: [
3232
ExtensionPipe,
@@ -39,7 +39,7 @@ import { ExtensionPipe } from './pipes/extension.pipe';
3939
BannerCoursesGraphQLCodeFirstComponent,
4040
BannerDevtoolsComponent,
4141
BannerCoursesAuthComponent,
42-
DarkModeToggleComponent,
42+
ThemeModeToggleComponent,
4343
],
4444
providers: [StorageService],
4545
})

0 commit comments

Comments
 (0)