Skip to content

Commit 762c536

Browse files
committed
chore: replace TranslateModule with TranslatePipe in multiple components
1 parent 00e7883 commit 762c536

18 files changed

+69
-70
lines changed

src/app/home/file-upload/file-upload.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { Component, EventEmitter, inject, Output } from '@angular/core';
22
import { MatIconModule } from '@angular/material/icon';
33
import { Store } from '@ngrx/store';
4-
import { TranslateModule } from '@ngx-translate/core';
4+
import { TranslatePipe } from '@ngx-translate/core';
55
import { isTauri } from '@tauri-apps/api/core';
66
import { open } from '@tauri-apps/plugin-dialog';
77
import { readTextFile } from '@tauri-apps/plugin-fs';
88
import { parsePlaylist } from '../../state/actions';
99
import { DragDropFileUploadDirective } from './drag-drop-file-upload.directive';
1010

1111
@Component({
12-
imports: [DragDropFileUploadDirective, MatIconModule, TranslateModule],
12+
imports: [DragDropFileUploadDirective, MatIconModule, TranslatePipe],
1313
selector: 'app-file-upload',
1414
templateUrl: './file-upload.component.html',
15-
styleUrls: ['./file-upload.component.scss']
15+
styleUrls: ['./file-upload.component.scss'],
1616
})
1717
export class FileUploadComponent {
1818
@Output() fileSelected = new EventEmitter<{

src/app/home/home.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component, NgZone } from '@angular/core';
33
import { MatProgressBarModule } from '@angular/material/progress-bar';
44
import { MatSnackBar } from '@angular/material/snack-bar';
55
import { Store } from '@ngrx/store';
6-
import { TranslateModule } from '@ngx-translate/core';
6+
import { TranslatePipe } from '@ngx-translate/core';
77
import { ERROR, PLAYLIST_PARSE_RESPONSE } from '../../../shared/ipc-commands';
88
import { Playlist } from '../../../shared/playlist.interface';
99
import { DataService } from '../services/data.service';
@@ -20,8 +20,8 @@ import { RecentPlaylistsComponent } from './recent-playlists/recent-playlists.co
2020
MatProgressBarModule,
2121
NgIf,
2222
RecentPlaylistsComponent,
23-
TranslateModule,
24-
]
23+
TranslatePipe,
24+
],
2525
})
2626
export class HomeComponent {
2727
/** Loading spinner state */

src/app/home/recent-playlists/playlist-info/playlist-info.component.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { MatIconModule } from '@angular/material/icon';
1515
import { MatInputModule } from '@angular/material/input';
1616
import { MatSnackBar } from '@angular/material/snack-bar';
1717
import { Store } from '@ngrx/store';
18-
import { TranslateModule } from '@ngx-translate/core';
18+
import { TranslatePipe } from '@ngx-translate/core';
1919
import { isTauri } from '@tauri-apps/api/core';
2020
import { firstValueFrom } from 'rxjs';
2121
import { Playlist } from '../../../../../shared/playlist.interface';
@@ -37,15 +37,15 @@ import { XtreamStore } from '../../../xtream-tauri/xtream.store';
3737
],
3838
providers: [DatePipe, XtreamStore],
3939
imports: [
40-
TranslateModule,
40+
CommonModule,
4141
MatButtonModule,
42+
MatCheckboxModule,
43+
MatDialogModule,
4244
MatIconModule,
4345
MatInputModule,
44-
MatCheckboxModule,
45-
CommonModule,
4646
ReactiveFormsModule,
47-
MatDialogModule,
48-
]
47+
TranslatePipe,
48+
],
4949
})
5050
export class PlaylistInfoComponent {
5151
isTauri = isTauri();

src/app/home/recent-playlists/playlist-item/playlist-item.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { MatButtonModule } from '@angular/material/button';
1111
import { MatIconModule } from '@angular/material/icon';
1212
import { MatListModule } from '@angular/material/list';
1313
import { MatTooltipModule } from '@angular/material/tooltip';
14-
import { TranslateModule } from '@ngx-translate/core';
14+
import { TranslatePipe } from '@ngx-translate/core';
1515
import {
1616
PortalStatus,
1717
PortalStatusService,
@@ -29,7 +29,7 @@ import { PlaylistMeta } from '../../../shared/playlist-meta.type';
2929
MatListModule,
3030
MatTooltipModule,
3131
NgIf,
32-
TranslateModule,
32+
TranslatePipe,
3333
],
3434
})
3535
export class PlaylistItemComponent implements OnInit {

src/app/home/recent-playlists/recent-playlists.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { MatListModule } from '@angular/material/list';
2020
import { MatSnackBar } from '@angular/material/snack-bar';
2121
import { Router } from '@angular/router';
2222
import { Store } from '@ngrx/store';
23-
import { TranslateModule, TranslateService } from '@ngx-translate/core';
23+
import { TranslatePipe, TranslateService } from '@ngx-translate/core';
2424
import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader';
2525
import { BehaviorSubject, combineLatest, map } from 'rxjs';
2626
import { GLOBAL_FAVORITES_PLAYLIST_ID } from '../../../../shared/constants';
@@ -62,7 +62,7 @@ import { PlaylistItemComponent } from './playlist-item/playlist-item.component';
6262
NgIf,
6363
NgxSkeletonLoaderComponent,
6464
PlaylistItemComponent,
65-
TranslateModule,
65+
TranslatePipe,
6666
],
6767
})
6868
export class RecentPlaylistsComponent implements OnDestroy {

src/app/home/stalker-portal-import/stalker-portal-import.component.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { MatButtonModule } from '@angular/material/button';
1010
import { MatFormFieldModule } from '@angular/material/form-field';
1111
import { MatInputModule } from '@angular/material/input';
1212
import { Store } from '@ngrx/store';
13-
import { TranslateModule } from '@ngx-translate/core';
13+
import { TranslatePipe } from '@ngx-translate/core';
1414
import { v4 as uuid } from 'uuid';
1515
import { Playlist } from '../../../../shared/playlist.interface';
1616
import { DataService } from '../../services/data.service';
@@ -19,11 +19,11 @@ import { addPlaylist } from '../../state/actions';
1919
@Component({
2020
imports: [
2121
FormsModule,
22-
ReactiveFormsModule,
22+
MatButtonModule,
2323
MatFormFieldModule,
2424
MatInputModule,
25-
MatButtonModule,
26-
TranslateModule,
25+
ReactiveFormsModule,
26+
TranslatePipe,
2727
],
2828
selector: 'app-stalker-portal-import',
2929
templateUrl: './stalker-portal-import.component.html',
@@ -39,7 +39,7 @@ import { addPlaylist } from '../../state/actions';
3939
width: 100%;
4040
}
4141
`,
42-
]
42+
],
4343
})
4444
export class StalkerPortalImportComponent {
4545
@Output() addClicked = new EventEmitter<void>();

src/app/home/text-import/text-import.component.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,15 @@ import {
55
ReactiveFormsModule,
66
Validators,
77
} from '@angular/forms';
8-
import { MatButtonModule } from '@angular/material/button';
8+
import { MatButton } from '@angular/material/button';
99
import { MatInputModule } from '@angular/material/input';
10-
import { TranslateModule } from '@ngx-translate/core';
10+
import { TranslatePipe } from '@ngx-translate/core';
1111

1212
@Component({
1313
selector: 'app-text-import',
1414
templateUrl: './text-import.component.html',
1515
styleUrls: ['./text-import.component.scss'],
16-
imports: [
17-
MatButtonModule,
18-
MatInputModule,
19-
ReactiveFormsModule,
20-
TranslateModule,
21-
]
16+
imports: [MatButton, MatInputModule, ReactiveFormsModule, TranslatePipe],
2217
})
2318
export class TextImportComponent {
2419
@Output() textAdded = new EventEmitter<string>();

src/app/home/url-upload/url-upload.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { MatButtonModule } from '@angular/material/button';
1010
import { MatCardModule } from '@angular/material/card';
1111
import { MatInputModule } from '@angular/material/input';
12-
import { TranslateModule } from '@ngx-translate/core';
12+
import { TranslatePipe } from '@ngx-translate/core';
1313
import { DataService } from '../../services/data.service';
1414

1515
@Component({
@@ -21,8 +21,8 @@ import { DataService } from '../../services/data.service';
2121
MatInputModule,
2222
NgIf,
2323
ReactiveFormsModule,
24-
TranslateModule,
25-
]
24+
TranslatePipe,
25+
],
2626
})
2727
export class UrlUploadComponent implements OnInit {
2828
/** Emits url string to the parent component on form submit */

src/app/home/xtream-code-import/xtream-code-import.component.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
1111
import { MatIcon } from '@angular/material/icon';
1212
import { MatInputModule } from '@angular/material/input';
1313
import { Store } from '@ngrx/store';
14-
import { TranslateModule } from '@ngx-translate/core';
14+
import { TranslatePipe } from '@ngx-translate/core';
1515
import { v4 as uuid } from 'uuid';
1616
import { Playlist } from '../../../../shared/playlist.interface';
1717
import {
@@ -23,12 +23,12 @@ import { addPlaylist } from '../../state/actions';
2323
@Component({
2424
imports: [
2525
FormsModule,
26-
ReactiveFormsModule,
26+
MatButton,
2727
MatFormFieldModule,
2828
MatIcon,
2929
MatInputModule,
30-
MatButton,
31-
TranslateModule,
30+
ReactiveFormsModule,
31+
TranslatePipe,
3232
],
3333
selector: 'app-xtream-code-import',
3434
templateUrl: './xtream-code-import.component.html',
@@ -72,7 +72,7 @@ import { addPlaylist } from '../../state/actions';
7272
justify-content: space-between;
7373
}
7474
`,
75-
]
75+
],
7676
})
7777
export class XtreamCodeImportComponent {
7878
@Output() addClicked = new EventEmitter<void>();

src/app/player/components/channel-list-container/channel-list-container.component.scss

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
.search-bar {
1818
@include mat.form-field-density(-5);
19-
width: 96%;
19+
20+
& {
21+
width: 96%;
22+
}
2023
}
2124

2225
mat-nav-list {

src/app/player/components/channel-list-container/channel-list-container.component.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { MatListModule } from '@angular/material/list';
2222
import { MatSnackBar } from '@angular/material/snack-bar';
2323
import { MatTabsModule } from '@angular/material/tabs';
2424
import { Store } from '@ngrx/store';
25-
import { TranslateModule, TranslateService } from '@ngx-translate/core';
25+
import { TranslatePipe, TranslateService } from '@ngx-translate/core';
2626
import * as _ from 'lodash';
2727
import { map, skipWhile } from 'rxjs';
2828
import { Channel } from '../../../../../shared/channel.interface';
@@ -54,8 +54,8 @@ import { ChannelListItemComponent } from './channel-list-item/channel-list-item.
5454
MatTabsModule,
5555
ScrollingModule,
5656
TitleCasePipe,
57-
TranslateModule,
58-
]
57+
TranslatePipe,
58+
],
5959
})
6060
export class ChannelListContainerComponent {
6161
/**
@@ -119,10 +119,10 @@ export class ChannelListContainerComponent {
119119
);
120120

121121
constructor(
122+
private readonly epgService: EpgService,
123+
private readonly snackBar: MatSnackBar,
122124
private readonly store: Store,
123-
private snackBar: MatSnackBar,
124-
private translateService: TranslateService,
125-
private epgService: EpgService
125+
private readonly translateService: TranslateService
126126
) {}
127127

128128
/**

src/app/player/components/channel-list-container/channel-list-item/channel-list-item.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
66
import { MatIconModule } from '@angular/material/icon';
77
import { MatListModule } from '@angular/material/list';
88
import { MatTooltipModule } from '@angular/material/tooltip';
9-
import { TranslateModule } from '@ngx-translate/core';
9+
import { TranslatePipe } from '@ngx-translate/core';
1010

1111
@Component({
1212
selector: 'app-channel-list-item',
@@ -56,8 +56,8 @@ import { TranslateModule } from '@ngx-translate/core';
5656
MatIconModule,
5757
MatListModule,
5858
MatTooltipModule,
59-
TranslateModule,
60-
]
59+
TranslatePipe,
60+
],
6161
})
6262
export class ChannelListItemComponent {
6363
@Input() isDraggable = false;

src/app/player/components/epg-list/epg-item-description/epg-item-description.component.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ import { NgIf } from '@angular/common';
22
import { Component, Inject } from '@angular/core';
33
import { MatButtonModule } from '@angular/material/button';
44
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
5-
import { TranslateModule } from '@ngx-translate/core';
5+
import { TranslatePipe } from '@ngx-translate/core';
66
import { EpgProgram } from './../../../models/epg-program.model';
77

88
@Component({
99
selector: 'app-epg-item-description',
1010
templateUrl: './epg-item-description.component.html',
1111
styleUrls: ['./epg-item-description.component.scss'],
12-
imports: [MatButtonModule, MatDialogModule, NgIf, TranslateModule]
12+
imports: [MatButtonModule, MatDialogModule, NgIf, TranslatePipe],
1313
})
1414
export class EpgItemDescriptionComponent {
1515
/** EPG program object */
1616
epgProgram: EpgProgram;
17+
1718
/**
1819
* Creates an instance of the component and injects the program of the clicked epg program
1920
* @param epgProgram epg program

src/app/player/components/epg-list/epg-list-item/epg-list-item.component.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { Component, Input } from '@angular/core';
22
import { MatDialog } from '@angular/material/dialog';
3-
import { MatIconModule } from '@angular/material/icon';
4-
import { MatTooltipModule } from '@angular/material/tooltip';
5-
import { TranslateModule } from '@ngx-translate/core';
3+
import { MatIcon } from '@angular/material/icon';
4+
import { MatTooltip } from '@angular/material/tooltip';
5+
import { TranslatePipe } from '@ngx-translate/core';
66
import { MomentDatePipe } from '../../../../shared/pipes/moment-date.pipe';
77
import { EpgProgram } from '../../../models/epg-program.model';
88
import { EpgItemDescriptionComponent } from './../epg-item-description/epg-item-description.component';
99

1010
@Component({
11-
imports: [MomentDatePipe, MatIconModule, MatTooltipModule, TranslateModule],
11+
imports: [MomentDatePipe, MatIcon, MatTooltip, TranslatePipe],
1212
selector: 'app-epg-list-item',
1313
templateUrl: './epg-list-item.component.html',
14-
styleUrls: ['./epg-list-item.component.scss']
14+
styleUrls: ['./epg-list-item.component.scss'],
1515
})
1616
export class EpgListItemComponent {
1717
/** EPG Program to render */

src/app/player/components/epg-list/epg-list.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { MatIconModule } from '@angular/material/icon';
77
import { MatListModule } from '@angular/material/list';
88
import { MatTooltipModule } from '@angular/material/tooltip';
99
import { Store } from '@ngrx/store';
10-
import { TranslateModule } from '@ngx-translate/core';
10+
import { TranslatePipe } from '@ngx-translate/core';
1111
import moment from 'moment';
1212
import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
1313
import { map } from 'rxjs/operators';
@@ -43,11 +43,11 @@ const DATE_FORMAT = 'YYYY-MM-DD';
4343
MatListModule,
4444
MatTooltipModule,
4545
MomentDatePipe,
46-
TranslateModule,
46+
TranslatePipe,
4747
],
4848
selector: 'app-epg-list',
4949
templateUrl: './epg-list.component.html',
50-
styleUrls: ['./epg-list.component.scss']
50+
styleUrls: ['./epg-list.component.scss'],
5151
})
5252
export class EpgListComponent {
5353
/** Channel info in EPG format */

src/app/player/components/multi-epg/multi-epg-container.component.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import {
1414
} from '@angular/core';
1515
import { MatButtonModule } from '@angular/material/button';
1616
import { MatDialog } from '@angular/material/dialog';
17-
import { MatIconModule } from '@angular/material/icon';
18-
import { MatTooltipModule } from '@angular/material/tooltip';
19-
import { TranslateModule } from '@ngx-translate/core';
17+
import { MatIcon } from '@angular/material/icon';
18+
import { MatTooltip } from '@angular/material/tooltip';
19+
import { TranslatePipe } from '@ngx-translate/core';
2020
import { invoke } from '@tauri-apps/api/core';
2121
import { addDays, differenceInMinutes, format, parse, subDays } from 'date-fns';
2222
import { BehaviorSubject, Observable } from 'rxjs';
@@ -42,15 +42,15 @@ interface EnrichedChannel extends EpgChannel {
4242
imports: [
4343
CommonModule,
4444
MatButtonModule,
45-
MatIconModule,
46-
MatTooltipModule,
45+
MatIcon,
46+
MatTooltip,
4747
MomentDatePipe,
48-
TranslateModule,
48+
TranslatePipe,
4949
],
5050
selector: 'app-multi-epg-container',
5151
templateUrl: './multi-epg-container.component.html',
5252
styleUrls: ['./multi-epg-container.component.scss'],
53-
changeDetection: ChangeDetectionStrategy.OnPush
53+
changeDetection: ChangeDetectionStrategy.OnPush,
5454
})
5555
export class MultiEpgContainerComponent
5656
implements OnInit, AfterViewInit, OnDestroy

0 commit comments

Comments
 (0)