Merge pull request #470 from Kyusung4698/develop

0.6.13 (2020-03-25)

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.6.13 (2020-03-25)
+
+- add loading animations
+- add keyboard support toggle as tray menu entry (#460)
+- add `CmdOrCtrl + F` as supported accelerator (#293, #454)
+- add display default values while holding right click (#335)
+- update disable keyboard support by defaut (#460)
+- update data to 3.10.0f
+- fix spacebar closes built in browser by disabling keyboard support (#461)
+- fix tooltips not visible by disabling keyboard support (#464)
+
 ## 0.6.12 (2020-03-24)
 
 - fix not covering the game correctly (#453, #456)

README.md

@@ -2,7 +2,7 @@
 ![GitHub Release Date](https://img.shields.io/github/release-date/Kyusung4698/PoE-Overlay)
 <a href="https://www.patreon.com/bePatron?u=30666721"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Become a Patron" width="85px" height="20px"></a>
 
-# PoE Overlay 0.6.12
+# PoE Overlay 0.6.13
 
 An Overlay for Path of Exile. The ***core aspect*** is to blend in with the game. Built with Electron and Angular. 
 
@@ -73,17 +73,24 @@ These instructions will set you up to run and enjoy the overlay.
 #### Installing
 
 1. Head over to [Releases](https://github.com/Kyusung4698/PoE-Overlay/releases) and download one of the following files
-    1. `poe-overlay-Setup-0.6.12.exe` to install locally. This supports auto update/ auto launch.
-    2. `poe-overlay-0.6.12.exe` portable version. This does not support auto update/ auto launch.
+    1. `poe-overlay-Setup-0.6.13.exe` to install locally. This supports auto update/ auto launch.
+    2. `poe-overlay-0.6.13.exe` portable version. This does not support auto update/ auto launch.
 2. Run either of your downloaded file
 3. Start Path of Exile
-4. Wait until you can see `PoE Overlay 0.6.12` in the bottom left corner
+4. Wait until you can see `PoE Overlay 0.6.13` in the bottom left corner
 5. Hit `f7` and set `Language` and `League` to meet your game settings
 
 #### Shortcuts
 
 You can change these shortcuts in the user settings menu.
 
+|Shortcut        |Description
+|---             |---	    
+| `ctrl+d`       | Displays the item in a frame and evaluates the price. You can open the offical trade site on click of the currency value
+| `f7`           | Opens the user settings menu
+
+Full list below. Click on `Details`.
+
 <details>
 
 |Shortcut        |Description

main.ts

@@ -31,15 +31,20 @@ Object.assign(console, log.functions);
 log.info('App starting...');
 
 let animationPath = path.join(app.getPath('userData'), 'animation.flag');
+let animationExists = fs.existsSync(animationPath);
 
-log.info(`App checking for animation flag: ${animationPath}.`);
+log.info(`App checking for animation flag: ${animationExists}.`);
 
-let animationExists = fs.existsSync(animationPath);
 if (animationExists) {
     app.disableHardwareAcceleration();
-    log.info('App disabled hardware acceleration');
+    log.info('App started with disabled hardware acceleration.');
 }
 
+let keyboardPath = path.join(app.getPath('userData'), 'keyboard.flag');
+let keyboardExists = fs.existsSync(keyboardPath);
+
+log.info(`App checking for keyboard flag: ${keyboardExists}.`);
+
 autoUpdater.logger = log;
 
 const args = process.argv.slice(1);
@@ -263,6 +268,7 @@ function createWindow(): BrowserWindow {
             allowRunningInsecureContent: serve,
             webSecurity: false
         },
+        focusable: keyboardExists,
         skipTaskbar: true,
         show: false
     });
@@ -370,6 +376,17 @@ function createTray(): Tray {
             label: 'Relaunch', type: 'normal',
             click: () => send('app-relaunch')
         },
+        {
+            label: 'Keyboard Support (experimental)', type: 'checkbox',
+            checked: keyboardExists, click: () => {
+                if (keyboardExists) {
+                    fs.unlinkSync(keyboardPath);
+                } else {
+                    fs.writeFileSync(keyboardPath, 'true');
+                }
+                send('app-relaunch');
+            }
+        },
         {
             label: 'Hardware Acceleration', type: 'checkbox',
             checked: !animationExists, click: () => {

overlay.babel

@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.6.1">
+<babeledit_project be_version="2.6.1" version="1.2">
     <!--
 
     BabelEdit project file

package.json

@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "private": true,
   "description": "A Overlay for Path of Exile. Built with Electron and Angular.",
   "main": "main.js",

src/app/core/service/input/shortcut.service.ts

@@ -50,6 +50,22 @@ export class ShortcutService {
         }
     }
 
+    public disable(accelerator: string): void {
+        const index = this.shortcuts.findIndex(x => x.accelerator === accelerator);
+        if (index !== -1) {
+            const shortcut = this.shortcuts[index];
+            this.unregisterShortcut(shortcut);
+        }
+    }
+
+    public enable(accelerator: string): void {
+        const index = this.shortcuts.findIndex(x => x.accelerator === accelerator);
+        if (index !== -1) {
+            const shortcut = this.shortcuts[index];
+            this.registerShortcut(shortcut);
+        }
+    }
+
     public check(flag: VisibleFlag): void {
         this.shortcuts.forEach(shortcut => {
             this.unregisterShortcut(shortcut);

src/app/layout/page/overlay/overlay.component.scss

@@ -9,4 +9,5 @@
   opacity: 0.5;
   text-shadow: $black;
   font-family: FontinSmallCaps;
+  user-select: none;
 }

src/app/layout/page/overlay/overlay.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, HostListener, Inject, OnDestroy, OnInit } from '@angular/core';
-import { AppService, AppTranslateService, RendererService, WindowService, GameService } from '@app/service';
+import { AppService, AppTranslateService, GameService, RendererService, WindowService } from '@app/service';
 import { DialogRefService } from '@app/service/dialog';
 import { ShortcutService } from '@app/service/input';
 import { FEATURE_MODULES } from '@app/token';
@@ -8,7 +8,7 @@ import { SnackBarService } from '@shared/module/material/service';
 import { ContextService } from '@shared/module/poe/service';
 import { Context } from '@shared/module/poe/type';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { distinctUntilChanged, flatMap, tap, debounceTime } from 'rxjs/operators';
+import { distinctUntilChanged, flatMap, tap } from 'rxjs/operators';
 import { UserSettingsService } from '../../service/user-settings.service';
 import { UserSettings } from '../../type';
 

src/app/modules/evaluate/component/evaluate-dialog/evaluate-dialog.component.html

@@ -16,6 +16,7 @@
         </ng-container>
         <ng-template #loading>
             <div> {{'evaluate.loading' | translate}} </div>
+            <mat-progress-bar mode="indeterminate"></mat-progress-bar>           
         </ng-template>
     </app-item-frame>
 </div>

src/app/modules/evaluate/component/evaluate-exchange-rate/evaluate-exchange-rate.component.html

@@ -68,4 +68,5 @@
 </ng-container>
 <ng-template #loading>
     <div> {{'evaluate.loading' | translate}} </div>
+    <mat-progress-bar mode="indeterminate"></mat-progress-bar>
 </ng-template>

src/app/modules/evaluate/component/evaluate-search/evaluate-search.component.html

@@ -1,7 +1,8 @@
 <ng-container *ngIf="(staleCounter$ | async) as counter; else search">
   <div class="clickable" (click)="onStaleCancelClick()">
-    {{'evaluate.stale' | translate:{counter: counter / 10 | number:'1.1-1'} }}
+    {{'evaluate.stale' | translate}}
   </div>
+  <mat-progress-bar mode="determinate" [value]="staleProgress$ | async"></mat-progress-bar>
 </ng-container>
 <ng-template #search>
   <ng-container *ngIf="(error$ | async) === false; else error">
@@ -50,6 +51,7 @@
             </ng-container>
             <ng-template #analyzing>
               <div>{{ 'evaluate.analyzing' | translate }}</div>
+              <mat-progress-bar mode="indeterminate"></mat-progress-bar>
             </ng-template>
           </ng-container>
           <ng-template #canceled>
@@ -63,6 +65,7 @@
             {{'evaluate.listings' | translate:{total: search.total | number} }}&nbsp;<span
               class="delayed">{{ 'evaluate.cancel' | translate }}</span>
           </div>
+          <mat-progress-bar mode="indeterminate"></mat-progress-bar>
         </ng-template>
       </ng-container>
       <ng-template #empty>
@@ -73,6 +76,7 @@
     </ng-container>
     <ng-template #searching>
       <div>{{ 'evaluate.searching' | translate }}</div>
+      <mat-progress-bar mode="indeterminate"></mat-progress-bar>
     </ng-template>
   </ng-container>
   <ng-template #error>

src/app/modules/evaluate/component/evaluate-search/evaluate-search.component.ts

@@ -26,6 +26,7 @@ export class EvaluateSearchComponent implements OnInit {
   public result$ = new BehaviorSubject<ItemSearchAnalyzeResult>(null);
   public error$ = new BehaviorSubject<boolean>(false);
   public staleCounter$ = new BehaviorSubject<number>(0);
+  public staleProgress$ = new BehaviorSubject<number>(0);
 
   @Input()
   public options: EvaluateOptions;
@@ -105,6 +106,7 @@ export class EvaluateSearchComponent implements OnInit {
     ).subscribe(item => {
       this.clear();
       this.staleCounter$.next(this.settings.evaluateQueryDebounceTime);
+      this.staleProgress$.next(100);
       subscription?.unsubscribe();
       subscription = timer(0, 100).pipe(
         takeUntil(this.queryItemChange),
@@ -115,6 +117,13 @@ export class EvaluateSearchComponent implements OnInit {
         } else {
           this.staleCounter$.next(this.staleCounter$.value - 1)
         }
+
+        const counter = this.staleCounter$.value - 2;
+        if (counter % 3 === 0) {
+          const maxCounter = this.settings.evaluateQueryDebounceTime;
+          const progress = counter / (maxCounter - 2) * 100;
+          this.staleProgress$.next(progress);
+        }
       });
     });
   }

src/app/shared/module/material/component/accelerator/accelerator.component.ts

@@ -7,7 +7,6 @@ const KEY_CODES = /^(F24|F23|F22|F21|F20|F19|F18|F17|F16|F15|F14|F13|F12|F11|F10
 const PRESERVERED_ACCELERATORS = [
   'CmdOrCtrl + C',
   'CmdOrCtrl + V',
-  'CmdOrCtrl + F',
   'Alt + F4',
 ];
 

src/app/shared/module/material/material.module.ts

@@ -9,16 +9,18 @@ import { MatExpansionModule } from '@angular/material/expansion';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatListModule } from '@angular/material/list';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { MatSliderModule } from '@angular/material/slider';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTabsModule } from '@angular/material/tabs';
+import { TranslateModule } from '@ngx-translate/core';
 import { AcceleratorComponent } from './component/accelerator/accelerator.component';
 import { SelectListComponent } from './component/select-list/select-list.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { DragDirective } from './directive/drag.directive';
 
+
 @NgModule({
   imports: [
     CommonModule,
@@ -36,6 +38,7 @@ import { DragDirective } from './directive/drag.directive';
     MatSliderModule,
     MatListModule,
     MatExpansionModule,
+    MatProgressBarModule,
 
     // third party
     TranslateModule,
@@ -56,6 +59,7 @@ import { DragDirective } from './directive/drag.directive';
     MatSliderModule,
     MatListModule,
     MatExpansionModule,
+    MatProgressBarModule,
     // custom
     AcceleratorComponent,
     SelectListComponent,

src/app/shared/module/poe/component/item-frame-value-group/item-frame-value-group.component.html

@@ -1,3 +1,3 @@
-<span (wheel)="onWheel($event)" (mouseup)="onMouseUp($event)">
+<span (wheel)="onWheel($event)" (mouseup)="onMouseUp($event)" (mousedown)="onMouseDown($event)">
     <ng-content></ng-content>
 </span>

src/app/shared/module/poe/component/item-frame-value-group/item-frame-value-group.component.ts

@@ -17,6 +17,10 @@ export class ItemFrameValueGroupComponent implements AfterViewInit {
     this.children = this.values.toArray();
   }
 
+  public onMouseDown(event: MouseEvent): void {
+    event.stopImmediatePropagation();
+  }
+
   public onMouseUp(event: MouseEvent): void {
     event.stopImmediatePropagation();
     /* tslint:disable */

src/app/shared/module/poe/component/item-frame-value/item-frame-value.component.html

@@ -1,16 +1,19 @@
-<span [class.value]="!disabled" [class.changed]="default.min !== value.min || default.max !== value.max"
-    (wheel)="onWheel($event)" (mouseup)="onMouseUp($event)">
-    <ng-container *ngIf="value.min === undefined && value.max === undefined">
-        <span>#</span>
-    </ng-container>
-    <span [class.hidden]="!(value.min !== undefined || value.max !== undefined)">
-        <input class="text" #min [class.hidden]="!(default.min !== value.min || default.max !== value.max)"
-            (blur)="onBlur(min.value, value.max)" (keyup)="onKeyup()" (wheel)="onWheelMin($event)"
-            (mouseup)="onMouseUpMin($event)">
-        <span *ngIf="default.min !== value.min || default.max !== value.max">~</span>
-        <span *ngIf="default.min === value.min && default.max === value.max">{{value.text}}</span>
-        <input class="text" #max [class.hidden]="!(default.min !== value.min || default.max !== value.max)"
-            (blur)="onBlur(value.min, max.value)" (keyup)="onKeyup()" (wheel)="onWheelMax($event)"
-            (mouseup)="onMouseUpMax($event)">
+<span [class.hidden]="(text$ | async) === false" [class.value]="!disabled">{{value.text}}</span>
+<span [class.hidden]="text$ | async">
+    <span [class.value]="!disabled" [class.changed]="default.min !== value.min || default.max !== value.max"
+        (wheel)="onWheel($event)" (mouseup)="onMouseUp($event)" (mousedown)="onMouseDown($event)">
+        <ng-container *ngIf="value.min === undefined && value.max === undefined">
+            <span>#</span>
+        </ng-container>
+        <span [class.hidden]="!(value.min !== undefined || value.max !== undefined)">
+            <input class="text" #min [class.hidden]="!(default.min !== value.min || default.max !== value.max)"
+                (blur)="onBlur(min.value, value.max)" (keyup)="onKeyup()" (wheel)="onWheelMin($event)"
+                (mouseup)="onMouseUpMin($event)" (mousedown)="onMouseDown($event)">
+            <span *ngIf="default.min !== value.min || default.max !== value.max">~</span>
+            <span *ngIf="default.min === value.min && default.max === value.max">{{value.text}}</span>
+            <input class="text" #max [class.hidden]="!(default.min !== value.min || default.max !== value.max)"
+                (blur)="onBlur(value.min, max.value)" (keyup)="onKeyup()" (wheel)="onWheelMax($event)"
+                (mouseup)="onMouseUpMax($event)" (mousedown)="onMouseDown($event)">
+        </span>
     </span>
 </span>

src/app/shared/module/poe/component/item-frame-value/item-frame-value.component.ts

@@ -1,5 +1,6 @@
 import { DecimalPipe } from '@angular/common';
 import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Inject, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Subject } from 'rxjs';
 import { ItemValue } from '../../type';
 import { ItemFrameComponent } from '../item-frame/item-frame.component';
 
@@ -34,10 +35,13 @@ export class ItemFrameValueComponent implements OnInit {
   @Output()
   public valueChange = new EventEmitter<ItemValue>();
 
+  public text$: Subject<boolean>;
+
   constructor(
     @Inject(ItemFrameComponent)
     private readonly itemFrame: ItemFrameComponent,
     private readonly decimal: DecimalPipe) {
+    this.text$ = this.itemFrame.text$;
   }
 
   public ngOnInit(): void {
@@ -47,6 +51,10 @@ export class ItemFrameValueComponent implements OnInit {
     this.init();
   }
 
+  public onMouseDown(event: MouseEvent): void {
+    event.stopImmediatePropagation();
+  }
+
   public onMouseUp(event: MouseEvent): void {
     event.stopImmediatePropagation();
     /* tslint:disable */

src/app/shared/module/poe/component/item-frame/item-frame.component.html

@@ -1,4 +1,4 @@
-<div class="frame">
+<div class="frame" (mousedown)="onMouseDown($event)" (mouseup)="onMouseUp($event)">
     <app-item-frame-header [item]="item" [queryItem]="queryItem"
         [queryable]="!item.nameId && (item.rarity === 'normal' || item.rarity === 'magic' || item.rarity === 'rare')" [language]="language">
     </app-item-frame-header>