feat: add icon, about dialog and menu

4gray · Aug 30, 2020 · bcf49b8 · bcf49b8
1 parent 78079aa
commit bcf49b8
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 15 deletions.
diff --git a/api.ts b/api.ts
@@ -5,6 +5,8 @@ import { guid } from '@datorama/akita';
 import { Playlist } from './src/app/playlist-uploader/playlist.interface';
 import Nedb from 'nedb-promises-ts';
 
+const join = require('path').join;
+const openAboutWindow = require('about-window').default;
 const db = new Nedb<Playlist>({ filename: 'data.db', autoload: true });
 
 export class Api {
@@ -56,6 +58,14 @@ export class Api {
                 });
             }
         });
+
+        ipcMain.on('show-about', () => {
+            openAboutWindow({
+                icon_path: join(__dirname, 'dist/assets/icons/icon.png'),
+                copyright: 'Copyright (c) 2020 4gray',
+                package_json_dir: __dirname,
+            });
+        });
     }
 
     /**

diff --git a/main.ts b/main.ts
@@ -1,30 +1,32 @@
-import { app, BrowserWindow, screen } from 'electron';
+import { app, BrowserWindow, Menu, MenuItem, shell } from 'electron';
 import * as path from 'path';
 import * as url from 'url';
 import { Api } from './api';
+const openAboutWindow = require('about-window').default;
 
 let win: BrowserWindow = null;
 const args = process.argv.slice(1),
     serve = args.some((val) => val === '--serve');
 
 function createWindow(): BrowserWindow {
-    const electronScreen = screen;
-    const size = electronScreen.getPrimaryDisplay().workAreaSize;
-
     // Create the browser window.
     win = new BrowserWindow({
-        x: 0,
-        y: 0,
-        width: size.width,
-        height: size.height,
+        width: 1000,
+        height: 800,
         webPreferences: {
             nodeIntegration: true,
             allowRunningInsecureContent: serve ? true : false,
         },
         resizable: true,
         darkTheme: true,
+        icon: path.join(__dirname, 'dist/assets/icons/icon.png'),
+        titleBarStyle: 'hidden',
+        frame: false,
+        minWidth: 900,
+        minHeight: 700,
     });
-    win.setMenu(null);
+    const menu = createMenu(win);
+    Menu.setApplicationMenu(menu);
 
     if (serve) {
         win.webContents.openDevTools();
@@ -54,6 +56,67 @@ function createWindow(): BrowserWindow {
     return win;
 }
 
+/**
+ * Creates context menu
+ * @param win browser window object
+ */
+function createMenu(win: BrowserWindow) {
+    const menu = new Menu();
+    menu.append(
+        new MenuItem({
+            label: 'File',
+            submenu: [
+                {
+                    label: 'Add playlist',
+                    click: () => win.webContents.send('add-playlist-view'),
+                },
+                {
+                    type: 'separator',
+                },
+                {
+                    label: 'Exit',
+                    click: () => app.quit(),
+                },
+            ],
+        })
+    );
+
+    menu.append(
+        new MenuItem({
+            label: 'Help',
+            submenu: [
+                {
+                    label: 'Report a bug',
+                    click: () =>
+                        shell.openExternal(
+                            'https://github.com/4gray/my-iptv-player-pwa'
+                        ),
+                },
+                {
+                    label: 'Open DevTools',
+                    click: () => win.webContents.openDevTools(),
+                },
+                {
+                    type: 'separator',
+                },
+                {
+                    label: 'About',
+                    click: () =>
+                        openAboutWindow({
+                            icon_path: path.join(
+                                __dirname,
+                                'dist/assets/icons/icon.png'
+                            ),
+                            copyright: 'Copyright (c) 2020 4gray',
+                            package_json_dir: __dirname,
+                        }),
+                },
+            ],
+        })
+    );
+    return menu;
+}
+
 try {
     app.allowRendererProcessReuse = true;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "iptvnator",
   "version": "0.0.1",
-  "description": "IPTV player applicaion.",
+  "description": "IPTV player application.",
   "homepage": "https://github.com/4gray/my-iptv-player-pwa",
   "author": {
     "name": "4gray",
@@ -102,6 +102,7 @@
     "@angular/material": "10.1.2",
     "@datorama/akita": "5.2.2",
     "@types/hls.js": "0.13.0",
+    "about-window": "1.13.4",
     "axios": "0.19.2",
     "custom-electron-titlebar": "3.2.3",
     "hls.js": "0.14.8",

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -4,9 +4,13 @@ import { AppConfig } from '../environments/environment';
 import { akitaDevtools } from '@datorama/akita';
 import { Titlebar, Color } from 'custom-electron-titlebar';
 import { ElectronService } from './services/electron.service';
+import { Router } from '@angular/router';
 
+// create custom title bar
 new Titlebar({
     backgroundColor: Color.fromHex('#000'),
+    itemBackgroundColor: Color.fromHex('#222'),
+    enableMnemonics: true,
 });
 
 @Component({
@@ -18,6 +22,7 @@ export class AppComponent {
     constructor(
         private electronService: ElectronService,
         private ngZone: NgZone,
+        private router: Router,
         private translate: TranslateService
     ) {
         if (!AppConfig.production) {
@@ -40,5 +45,10 @@ export class AppComponent {
         } else {
             console.log('Run in browser');
         }
+        this.electronService.ipcRenderer.on('add-playlist-view', () => {
+            this.ngZone.run(() => {
+                this.router.navigateByUrl('/', { skipLocationChange: true });
+            });
+        });
     }
 }
diff --git a/src/app/channel-list-container/channel-list-container.component.html b/src/app/channel-list-container/channel-list-container.component.html
@@ -12,8 +12,8 @@
             </mat-list-item>
         </mat-list>
         <mat-nav-list id="channels-list">
-            <mat-accordion multi>
-                <mat-list-item *ngFor="let channel of _channelList | filterBy: searchTerm; index as i"
+            <cdk-virtual-scroll-viewport itemSize="50" class="scroll-viewport">
+                <mat-list-item *cdkVirtualFor="let channel of _channelList | filterBy: searchTerm; index as i"
                     [class.active]="selected?.id === channel.id" (click)="selectChannel(channel)">
                     <p matLine>
                         {{ i+1 + '. ' + channel?.name || 'Unnamed Channel' }}
@@ -23,7 +23,7 @@
                     </button> -->
                     <mat-divider></mat-divider>
                 </mat-list-item>
-            </mat-accordion>
+            </cdk-virtual-scroll-viewport>
         </mat-nav-list>
     </mat-tab>
 
@@ -42,8 +42,8 @@
                                     {{ i+1 + '. ' + channel?.name || 'Unnamed Channel' }}
                                 </p>
                                 <!-- <button mat-icon-button color="primary" (click)="favChannel(channel, $event)">
-                                    <mat-icon>star{{ channel.fav ? '' : '_outline' }}</mat-icon>
-                                </button> -->
+                                        <mat-icon>star{{ channel.fav ? '' : '_outline' }}</mat-icon>
+                                    </button> -->
                                 <mat-divider></mat-divider>
                             </mat-list-item>
                         </ng-template>

diff --git a/src/app/channel-list-container/channel-list-container.component.scss b/src/app/channel-list-container/channel-list-container.component.scss
@@ -26,6 +26,9 @@
     margin: 3px 10px !important;
 }
 
+.scroll-viewport {
+    min-height: calc(100vh - 142px);
+}
 
 ::ng-deep {
     .mat-tab-group {

diff --git a/src/app/material.module.ts b/src/app/material.module.ts
@@ -10,6 +10,7 @@ import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { ScrollingModule } from '@angular/cdk/scrolling';
 
 @NgModule({
     exports: [
@@ -24,6 +25,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
         MatSnackBarModule,
         MatTabsModule,
         MatToolbarModule,
+        ScrollingModule,
     ],
 })
 export class MaterialModule {}
diff --git a/src/app/video-player/video-player.component.html b/src/app/video-player/video-player.component.html
@@ -28,6 +28,7 @@
             </button>
             {{ (activeChannel$ | async)?.name}}
             <div class="spacer"></div>
+            <button mat-icon-button (click)="openAbout()"><mat-icon>info</mat-icon></button>
             <!-- <mat-icon>star_outline</mat-icon> -->
         </mat-toolbar>
 

diff --git a/src/app/video-player/video-player.component.ts b/src/app/video-player/video-player.component.ts
@@ -11,6 +11,9 @@ import * as _ from 'lodash';
     styleUrls: ['./video-player.component.css'],
 })
 export class VideoPlayerComponent implements OnInit {
+    /** electrons ipc reference */
+    renderer = window.require('electron').ipcRenderer;
+
     /** Channels list */
     channels$: Observable<Channel[]>;
 
@@ -72,4 +75,11 @@ export class VideoPlayerComponent implements OnInit {
             });
         }
     }
+
+    /**
+     * Opens about application dialog
+     */
+    openAbout(): void {
+        this.renderer.send('show-about');
+    }
 }