Merge pull request #812 from Kyusung4698/develop

1.0.10 (2020-08-02)
Kyusung4698 · Aug 2, 2020 · a9cefe1 · a9cefe1
2 parents b09fddf + 969768d
commit a9cefe1
Show file tree

Hide file tree

Showing 19 changed files with 110 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.10 (2020-08-02)
+
+- added whois button to the trade window
+- added skip button at the tutorial (#765)
+- fixed an issue on lower resolution having invisible market prices (#811)
+
 ## 1.0.9 (2020-07-29)
 
 - added stash navigation on ctrl + mousewheel

diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
     "meta": {
         "name": "PoE Overlay",
         "author": "Kyusung4698",
-        "version": "1.0.9",
+        "version": "1.0.10",
         "minimum-overwolf-version": "0.147.0",
         "description": "Search the market and send trade offers. Get current market values for your item. View insights for maps and items.",
         "dock_button_title": "PoE Overlay",

diff --git a/overlay.babel b/overlay.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -130,7 +130,7 @@
                         </children>
                     </folder_node>
                     <folder_node>
-                        <name>changelog-1-0-9</name>
+                        <name>changelog-1-0-10</name>
                         <children>
                             <concept_node>
                                 <name>message</name>
@@ -3068,6 +3068,59 @@
                             </concept_node>
                         </children>
                     </folder_node>
+                    <concept_node>
+                        <name>skip</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                     <folder_node>
                         <name>support</name>
                         <children>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay-overwolf",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "scripts": {
     "watch": "ng build --watch",
     "watch:prod": "ng build --watch --prod",

diff --git a/src/app/core/annotation/annotation.service.ts b/src/app/core/annotation/annotation.service.ts
@@ -95,7 +95,7 @@ const ANNOTATIONS: Annotation[] = [
         hotkey: Hotkey.SettingsToggle
     },
     { id: 'thanks' },
-    { id: 'changelog-1-0-9' },
+    { id: 'changelog-1-0-10' },
 ];
 
 @Injectable({
@@ -132,6 +132,21 @@ export class AnnotationService {
         );
     }
 
+    public skip(): Observable<void> {
+        return this.getAnnotations().pipe(
+            flatMap(annotations => {
+                for (const annotation of ANNOTATIONS) {
+                    if (annotation.id === 'thanks' || annotation.id.startsWith('changelog')) {
+                        continue;
+                    }
+                    annotations[annotation.id] = true;
+                }
+                this.updateMessage(annotations, false);
+                return this.updateAnnotations(annotations);
+            })
+        );
+    }
+
     public update(condition: AnnotationCondition, value: boolean): Observable<void> {
         return this.getAnnotations().pipe(
             flatMap(annotations => {

diff --git a/src/app/layout/window/annotation-window/annotation-window.component.html b/src/app/layout/window/annotation-window/annotation-window.component.html
@@ -1,6 +1,13 @@
 <div appResize>
-    <app-header name="PoE Overlay" [closeable]="false" [fixed]="true">
-        <ng-container *ngIf="message$ | async as message">
+    <ng-container *ngIf="message$ | async as message">
+        <app-header name="PoE Overlay" [closeable]="false" [fixed]="true">
+            <ng-container ngProjectAs="controlsRight">
+                <ng-container *ngIf="message.id !== 'thanks' && !message.id.startsWith('changelog')">
+                    <mat-icon (click)="onSkip()" [title]="'annotation.skip' | translate">
+                        fast_forward
+                    </mat-icon>
+                </ng-container>
+            </ng-container>
             <app-background>
                 <div class="content">
                     <div class="title">{{message.title | translate}}</div>
@@ -15,6 +22,6 @@
                     </div>
                 </div>
             </app-background>
-        </ng-container>
-    </app-header>
+        </app-header>
+    </ng-container>
 </div>
diff --git a/src/app/layout/window/annotation-window/annotation-window.component.ts b/src/app/layout/window/annotation-window/annotation-window.component.ts
@@ -28,6 +28,10 @@ export class AnnotationWindowComponent implements OnInit {
     this.annotation.continue().subscribe();
   }
 
+  public onSkip(): void {
+    this.annotation.skip().subscribe();
+  }
+
   private updateMessage(message: AnnotationMessage): void {
     if (!message) {
       this.window.close().subscribe(() => {

diff --git a/...dules/market/component/market-item-search-result/market-item-search-result.component.scss b/...dules/market/component/market-item-search-result/market-item-search-result.component.scss
@@ -10,7 +10,8 @@
         width: 100%;
         height: 100%;
 
-        .detail {
+        .inner,
+        .outer {
           white-space: inherit !important;
           min-width: auto !important;
         }

diff --git a/src/assets/i18n/english.json b/src/assets/i18n/english.json
@@ -4,9 +4,9 @@
 			"message": "Opens a webpage on hotkey press in the in-game browser.\n\nTry the hotkey below to open poe.ninja.",
 			"title": "Bookmarks"
 		},
-		"changelog-1-0-9": {
-			"message": "- added stash navigation on ctrl + mousewheel\n- added better support for the generate poe.ninja urls based on the league and name (#208)\n- added latest_whisper placeholder for commands\n- added item images at the search market\n- added different step sizes at the exchange market (CTRL 50, SHIFT 25, ALT 5) (#797)\n- added experimental horizontal layout (enableable at the settings) for the evaluate dialog (#769)\n- updated windows to be draggable by their content (#768)\n- fixed an issue at the market enabling sockets to be toggleable",
-			"title": "What's new in 1.0.9?"
+		"changelog-1-0-10": {
+			"message": "- added whois button to the trade window\n- added skip button at the tutorial (#765)\n- fixed an issue on lower resolution having invisible market prices (#811)",
+			"title": "What's new in 1.0.10?"
 		},
 		"commands": {
 			"message": "All game commands can be bound to hotkeys.\n\nThere are also placeholders like @char available which will be replaced before executing the command.\n\nTry the hotkey below to teleport into your hideout.",
@@ -109,6 +109,7 @@
 			"message": "Open the settings window by pressing following hotkey:",
 			"title": "Settings"
 		},
+		"skip": "Skip Tutorial",
 		"support": {
 			"message": "Do you have a question? Or do you want to request a new feature?\n\nCheck the support tab at the settings menu for further information.\n\nAlso if you love the app, consider supporting me by subscribing.",
 			"title": "Support"

diff --git a/src/assets/i18n/french.json b/src/assets/i18n/french.json
@@ -105,6 +105,7 @@
 			"message": "Ouvrez la fenêtre des paramètres en appuyant sur la touche de raccourci suivante:",
 			"title": "Réglages"
 		},
+		"skip": "Passer le tutoriel",
 		"support": {
 			"message": "As-tu une question? Ou souhaitez-vous demander une nouvelle fonctionnalité?\n\nVérifiez l'onglet d'assistance dans le menu des paramètres pour plus d'informations.\n\nAussi, si vous aimez l'application, pensez à me soutenir en vous abonnant.",
 			"title": "Soutien"

diff --git a/src/assets/i18n/german.json b/src/assets/i18n/german.json
@@ -105,6 +105,7 @@
 			"message": "Öffnen Sie das Einstellungsfenster, indem Sie den folgenden Hotkey drücken:",
 			"title": "Einstellungen"
 		},
+		"skip": "Lernprogramm überspringen",
 		"support": {
 			"message": "Hast du eine Frage? Oder möchten Sie eine neue Funktion anfordern?\n\nWeitere Informationen finden Sie auf der Registerkarte Support im Einstellungsmenü.\n\nWenn Sie die App lieben, können Sie mich durch ein Abonnement unterstützen.",
 			"title": "Unterstützung"

diff --git a/src/assets/i18n/korean.json b/src/assets/i18n/korean.json
@@ -105,6 +105,7 @@
 			"message": "다음 핫키를 눌러 설정 창을 엽니 다.",
 			"title": "설정"
 		},
+		"skip": "튜토리얼 건너 뛰기",
 		"support": {
 			"message": "질문 있습니까? 아니면 새로운 기능을 요청 하시겠습니까?\n\n자세한 내용은 설정 메뉴에서 지원 탭을 확인하십시오.\n\n또한 당신이 응용 프로그램을 사랑한다면, 가입하여 나를 지원하는 것을 고려하십시오.",
 			"title": "지원하다"

diff --git a/src/assets/i18n/polish.json b/src/assets/i18n/polish.json
@@ -105,6 +105,7 @@
 			"message": "Otwórz okno ustawień, naciskając następujący skrót:",
 			"title": "Ustawienia"
 		},
+		"skip": "Pomiń tutorial",
 		"support": {
 			"message": "Masz pytanie? A może chcesz poprosić o nową funkcję?\n\nSprawdź kartę pomocy w menu ustawień, aby uzyskać dodatkowe informacje.\n\nRównież jeśli podoba Ci się aplikacja, rozważ wsparcie, subskrybując ją.",
 			"title": "Wsparcie"

diff --git a/src/assets/i18n/portuguese.json b/src/assets/i18n/portuguese.json
@@ -105,6 +105,7 @@
 			"message": "Abra a janela de configurações pressionando a seguinte tecla de atalho:",
 			"title": "Definições"
 		},
+		"skip": "Pular tuturial",
 		"support": {
 			"message": "Você tem uma pergunta? Ou você deseja solicitar um novo recurso?\n\nVerifique a guia de suporte no menu de configurações para obter mais informações.\n\nAlém disso, se você ama o aplicativo, considere apoiar-me assinando.",
 			"title": "Apoio, suporte"

diff --git a/src/assets/i18n/russian.json b/src/assets/i18n/russian.json
@@ -105,6 +105,7 @@
 			"message": "Откройте окно настроек, нажав следующую горячую клавишу:",
 			"title": "настройки"
 		},
+		"skip": "Пропустить Учебник",
 		"support": {
 			"message": "У вас есть вопрос? Или вы хотите запросить новую функцию?\n\nПроверьте вкладку поддержки в меню настроек для получения дополнительной информации.\n\nТакже, если вы любите приложение, рассмотрите поддержку меня, подписавшись.",
 			"title": "служба поддержки"

diff --git a/src/assets/i18n/simplified-chinese.json b/src/assets/i18n/simplified-chinese.json
@@ -105,6 +105,7 @@
 			"message": "通过按以下热键打开设置窗口：",
 			"title": "设置"
 		},
+		"skip": "跳过教程",
 		"support": {
 			"message": "你有问题吗？还是要请求一项新功能？\n\n查看设置菜单上的支持标签以获取更多信息。\n\n另外，如果您喜欢该应用程序，请考虑通过订阅支持我。",
 			"title": "支持"

diff --git a/src/assets/i18n/spanish.json b/src/assets/i18n/spanish.json
@@ -105,6 +105,7 @@
 			"message": "Abra la ventana de configuración presionando la siguiente tecla de acceso rápido:",
 			"title": "Ajustes"
 		},
+		"skip": "Saltar tutorial",
 		"support": {
 			"message": "¿Tienes una pregunta? ¿O quieres solicitar una nueva función?\n\nConsulte la pestaña de soporte en el menú de configuración para obtener más información.\n\nAdemás, si te encanta la aplicación, considera apoyarme suscribiéndote.",
 			"title": "Apoyo"

diff --git a/src/assets/i18n/thai.json b/src/assets/i18n/thai.json
@@ -105,6 +105,7 @@
 			"message": "เปิดหน้าต่างการตั้งค่าโดยกดปุ่มลัดต่อไปนี้:",
 			"title": "การตั้งค่า"
 		},
+		"skip": "ข้ามบทช่วยสอน",
 		"support": {
 			"message": "คุณมีคำถาม? หรือคุณต้องการที่จะขอคุณสมบัติใหม่?\n\nตรวจสอบแท็บการสนับสนุนที่เมนูการตั้งค่าสำหรับข้อมูลเพิ่มเติม\n\nนอกจากนี้ถ้าคุณรักแอปให้พิจารณาสนับสนุนฉันด้วยการสมัครรับข้อมูล",
 			"title": "สนับสนุน"

diff --git a/src/assets/i18n/traditional-chinese.json b/src/assets/i18n/traditional-chinese.json
@@ -105,6 +105,7 @@
 			"message": "通過按以下熱鍵打開設置窗口：",
 			"title": "設置"
 		},
+		"skip": "跳過教程",
 		"support": {
 			"message": "你有問題嗎？還是要請求一項新功能？\n\n查看設置菜單上的支持標籤以獲取更多信息。\n\n另外，如果您喜歡該應用程序，請考慮通過訂閱支持我。",
 			"title": "支持"