From 2daf066c2546eb889b300837033ae927a4e2361a Mon Sep 17 00:00:00 2001
From: Vadim Khitrin <me@vkhitrin.com>
Date: Sun, 29 Dec 2024 19:55:30 +0200
Subject: [PATCH] fix: Adapt Keybindings For Platform + Fix macOS Bundle

* Keybindings should not match the platform.
  Resolves #26.
* Fixing macOS bundle.
---
 res/macOS/cosmicding.app/Contents/Info.plist | 69 ++++++++++----------
 src/key_binds.rs                             | 28 ++++++--
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/res/macOS/cosmicding.app/Contents/Info.plist b/res/macOS/cosmicding.app/Contents/Info.plist
index 0bfc36d..ccafe30 100644
--- a/res/macOS/cosmicding.app/Contents/Info.plist
+++ b/res/macOS/cosmicding.app/Contents/Info.plist
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>cosmicding</string>
-  <key>CFBundleIdentifier</key>
-  <string>com.vkhitrin.cosmicding</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>cosmicding</string>
-  <key>CFBundlePackageType</key>
-  <string>APPL</string>
-  <key>CFBundleShortVersionString</key>
-  <string>{{ VERSION }}</string>
-  <key>CFBundleSupportedPlatforms</key>
-  <array>
-    <string>MacOSX</string>
-  </array>
-  <key>CFBundleVersion</key>
-  <string>{{ BUILD }}</string>
-  <key>CFBundleIconFile</key>
-  <string>cosmicding.icns</string>
-  <key>NSHighResolutionCapable</key>
-  <true/>
-  <key>NSMainNibFile</key>
-  <string></string>
-  <key>NSSupportsAutomaticGraphicsSwitching</key>
-  <true/>
-  <key>CFBundleDisplayName</key>
-  <string>cosmicding</string>
-  <key>NSRequiresAquaSystemAppearance</key>
-  <string>NO</string>
-  <key>CFBundleURLTypes</key>
-</dict>
+    <dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>en</string>
+        <key>CFBundleExecutable</key>
+        <string>cosmicding</string>
+        <key>CFBundleIdentifier</key>
+        <string>com.vkhitrin.cosmicding</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>cosmicding</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>__VERSION__</string>
+        <key>CFBundleSupportedPlatforms</key>
+        <array>
+            <string>MacOSX</string>
+        </array>
+        <key>CFBundleVersion</key>
+        <string>__BUILD__</string>
+        <key>CFBundleIconFile</key>
+        <string>AppIcon.icns</string>
+        <key>NSHighResolutionCapable</key>
+        <true />
+        <key>NSMainNibFile</key>
+        <string></string>
+        <key>NSSupportsAutomaticGraphicsSwitching</key>
+        <true />
+        <key>CFBundleDisplayName</key>
+        <string>cosmicding</string>
+        <key>NSRequiresAquaSystemAppearance</key>
+        <string>NO</string>
+    </dict>
 </plist>
diff --git a/src/key_binds.rs b/src/key_binds.rs
index ca6534e..4d94766 100644
--- a/src/key_binds.rs
+++ b/src/key_binds.rs
@@ -13,7 +13,7 @@ pub fn key_binds() -> HashMap<KeyBind, MenuAction> {
         ([$($modifier:ident),* $(,)?], $key:expr, $action:ident) => {{
             key_binds.insert(
                 KeyBind {
-                    modifiers: vec![$(Modifier::$modifier),*],
+                    modifiers: vec![$($modifier),*],
                     key: $key,
                 },
                 MenuAction::$action,
@@ -21,11 +21,27 @@ pub fn key_binds() -> HashMap<KeyBind, MenuAction> {
         }};
     }
 
-    bind!([Ctrl], Key::Character(",".into()), Settings);
-    bind!([Ctrl], Key::Character("i".into()), About);
-    bind!([Ctrl, Shift], Key::Character("n".into()), AddAccount);
-    bind!([Ctrl], Key::Character("n".into()), AddBookmark);
-    bind!([Ctrl], Key::Character("r".into()), RefreshBookmarks);
+    let primary_modifier = if cfg!(target_os = "macos") {
+        Modifier::Super // Use Cmd (Command) on macOS
+    } else {
+        Modifier::Ctrl // Default to Ctrl for other platforms (could be adjusted as needed)
+    };
+
+    let secondary_modifier = Modifier::Shift;
+
+    bind!([primary_modifier], Key::Character(",".into()), Settings);
+    bind!([primary_modifier], Key::Character("i".into()), About);
+    bind!(
+        [primary_modifier, secondary_modifier],
+        Key::Character("n".into()),
+        AddAccount
+    );
+    bind!([primary_modifier], Key::Character("n".into()), AddBookmark);
+    bind!(
+        [primary_modifier],
+        Key::Character("r".into()),
+        RefreshBookmarks
+    );
 
     key_binds
 }