From 315d03ae697488cb14537be70f64a9dc056b0a9a Mon Sep 17 00:00:00 2001
From: Hachi-R <drive8hachi@gmail.com>
Date: Fri, 3 May 2024 14:58:45 -0300
Subject: [PATCH] refactor ternary to if statement in window-manager, update
 constant definitions for better clarity

---
 src/locales/en/translation.json              |  2 +-
 src/locales/pt/translation.json              |  2 +-
 src/main/entity/user-preferences.entity.ts   |  2 +-
 src/main/services/window-manager.ts          |  7 +++++--
 src/renderer/src/pages/settings/settings.tsx | 15 +++++++++------
 src/types/index.ts                           |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 40909c1a..cc51f5f3 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -136,7 +136,7 @@
     "telemetry": "Telemetry",
     "telemetry_description": "Enable anonymous usage statistics",
     "behavior": "Behavior",
-    "quit_app_instead_minimizing": "Close app instead of minimizing to tray"
+    "quit_app_instead_hiding": "Close app instead of minimizing to tray"
   },
   "notifications": {
     "download_complete": "Download complete",
diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
index cc61e75f..a86855d6 100644
--- a/src/locales/pt/translation.json
+++ b/src/locales/pt/translation.json
@@ -132,7 +132,7 @@
     "telemetry": "Telemetria",
     "telemetry_description": "Habilitar estatísticas de uso anônimas",
     "behavior": "Comportamento",
-    "quit_app_instead_minimizing": "Fechar o aplicativo em vez de minimizá-lo"
+    "quit_app_instead_hiding": "Fechar o aplicativo em vez de minimizá-lo"
   },
   "notifications": {
     "download_complete": "Download concluído",
diff --git a/src/main/entity/user-preferences.entity.ts b/src/main/entity/user-preferences.entity.ts
index d4c37104..501bd77d 100644
--- a/src/main/entity/user-preferences.entity.ts
+++ b/src/main/entity/user-preferences.entity.ts
@@ -27,7 +27,7 @@ export class UserPreferences {
   telemetryEnabled: boolean;
 
   @Column("boolean", { default: false })
-  quitInXButtonEnabled: boolean;
+  preferQuitInsteadOfHiding: boolean;
 
   @CreateDateColumn()
   createdAt: Date;
diff --git a/src/main/services/window-manager.ts b/src/main/services/window-manager.ts
index 0cf1c249..cc94c073 100644
--- a/src/main/services/window-manager.ts
+++ b/src/main/services/window-manager.ts
@@ -51,11 +51,14 @@ export class WindowManager {
     this.mainWindow.removeMenu();
 
     const userPreferences = await userPreferencesRepository.findOne({
-      where: {id: 1},
+      where: { id: 1 },
     });
 
     this.mainWindow.on("close", () => {
-      userPreferences?.quitInXButtonEnabled ? app.quit() : WindowManager.mainWindow?.setProgressBar(-1);
+      if (userPreferences?.preferQuitInsteadOfHiding) {
+        app.quit();
+      }
+      WindowManager.mainWindow?.setProgressBar(-1);
     });
   }
 
diff --git a/src/renderer/src/pages/settings/settings.tsx b/src/renderer/src/pages/settings/settings.tsx
index 398a1c01..53245565 100644
--- a/src/renderer/src/pages/settings/settings.tsx
+++ b/src/renderer/src/pages/settings/settings.tsx
@@ -11,7 +11,7 @@ export function Settings() {
     downloadNotificationsEnabled: false,
     repackUpdatesNotificationsEnabled: false,
     telemetryEnabled: false,
-    quitInXButtonEnabled: false,
+    preferQuitInsteadOfHiding: false,
   });
 
   const { t } = useTranslation("settings");
@@ -28,7 +28,8 @@ export function Settings() {
         repackUpdatesNotificationsEnabled:
           userPreferences?.repackUpdatesNotificationsEnabled ?? false,
         telemetryEnabled: userPreferences?.telemetryEnabled ?? false,
-        quitInXButtonEnabled: userPreferences?.quitInXButtonEnabled ?? false,
+        preferQuitInsteadOfHiding:
+          userPreferences?.preferQuitInsteadOfHiding ?? false,
       });
     });
   }, []);
@@ -113,13 +114,15 @@ export function Settings() {
         <h3>{t("behavior")}</h3>
 
         <CheckboxField
-          label={t("quit_app_instead_minimizing")}
-          checked={form.quitInXButtonEnabled}
+          label={t("quit_app_instead_hiding")}
+          checked={form.preferQuitInsteadOfHiding}
           onChange={() =>
-            updateUserPreferences("quitInXButtonEnabled", !form.quitInXButtonEnabled)
+            updateUserPreferences(
+              "preferQuitInsteadOfHiding",
+              !form.preferQuitInsteadOfHiding
+            )
           }
         />
-
       </div>
     </section>
   );
diff --git a/src/types/index.ts b/src/types/index.ts
index cf4ccb21..9cb3a163 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -105,7 +105,7 @@ export interface UserPreferences {
   downloadNotificationsEnabled: boolean;
   repackUpdatesNotificationsEnabled: boolean;
   telemetryEnabled: boolean;
-  quitInXButtonEnabled: boolean;
+  preferQuitInsteadOfHiding: boolean;
 }
 
 export interface HowLongToBeatCategory {