Debugging and more hotkeys

Author: GetGet99

ContextSwitch/ContextSwitch.csproj

@@ -12,10 +12,12 @@
 		<UseWinUI>true</UseWinUI>
 		<EnableMsixTooling>true</EnableMsixTooling>
 		<WindowsSDKPackageVersion>10.0.26100.38</WindowsSDKPackageVersion>
+		<Configurations>Debug;Release;DebugUnpackaged</Configurations>
 	</PropertyGroup>
-	<PropertyGroup>
-		<!--<WindowsPackageType>None</WindowsPackageType>-->
-	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)'=='DebugUnpackaged'">
+        <WindowsPackageType>None</WindowsPackageType>
+	<DefineConstants>$(DefineConstants);UNPKG</DefineConstants>
+    </PropertyGroup>
 	<ItemGroup>
 	  <None Remove="Assets\ContextSwitchIcon.png" />
 	</ItemGroup>

ContextSwitch/FloatingTimer.cs

@@ -15,6 +15,7 @@
 using System.Numerics;
 using Microsoft.UI.Composition;
 using static ContextSwitch.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace ContextSwitch;
 
@@ -93,24 +94,84 @@ private void FloatingTimer_Loaded(object sender, RoutedEventArgs e)
         animation.Target = nameof(contentVisual.Opacity);
         contentVisual.ImplicitAnimations[nameof(contentVisual.Opacity)] = animation;
     }
-
+    bool isCtrlDown = false;
+#if UNPKG
+    public const string HOTKEY_MAIN = "R-ALT";
+#else
+    public const string HOTKEY_MAIN = "R-CTRL";
+#endif
     private void LowLevelKeyboard_KeyPressed(KeyboardHookInfo eventDetails, KeyboardState state, ref bool Handled)
     {
+        bool isDown = state is KeyboardState.KeyDown or KeyboardState.SystemKeyDown;
+#if UNPKG
+        // Use RSHIFT for debugging
+        if (eventDetails.KeyCode == WinWrapper.Input.VirtualKey.RMENU)
+#else
         if (eventDetails.KeyCode == WinWrapper.Input.VirtualKey.RCONTROL)
+#endif
         {
-            bool isDown = state is KeyboardState.KeyDown or KeyboardState.SystemKeyDown;
-            if (keyReset)
-            {
-                if (isDown) Start(resetTimerDuration);
-            }
-            else
+            Handled = true;
+            isCtrlDown = isDown;
+            if (!keyReset)
             {
-                if (isDown)
+                if (isCtrlDown)
+                {
                     Content.Opacity = 1;
+                    ToHide = null;
+                }
                 else
                     ToHide = DateTime.Now + TimeSpan.FromSeconds(3);
             }
         }
+        if (isCtrlDown && eventDetails.KeyCode == WinWrapper.Input.VirtualKey.UP)
+        {
+            Handled = true;
+            if (isDown)
+            {
+                if (IsTimerRunning)
+                {
+                    endtime += TimeSpan.FromMinutes(1);
+                    TimerCallback();
+                }
+                else
+                    Start(TimeSpan.FromMinutes(1));
+            }
+        }
+        if (isCtrlDown && eventDetails.KeyCode == WinWrapper.Input.VirtualKey.DOWN)
+        {
+            Handled = true;
+            if (isDown && IsTimerRunning)
+            {
+                endtime -= TimeSpan.FromMinutes(1);
+                TimerCallback();
+            }
+        }
+        if (isCtrlDown && eventDetails.KeyCode == WinWrapper.Input.VirtualKey.RETURN)
+        {
+            Handled = true;
+            if (isDown && keyReset)
+            {
+                Start(resetTimerDuration);
+            }
+        }
+        if (isCtrlDown && eventDetails.KeyCode == WinWrapper.Input.VirtualKey.LEFT)
+        {
+            Handled = true;
+            if (isDown)
+            {
+                Flyout flyout = null!;
+                flyout = new Flyout
+                {
+                    SystemBackdrop = new MicaBackdrop(),
+                    Content = VStack(center: true,
+                        Text("Quick Actions Page Coming Soon!"),
+                        new Button { Content = "Cool!" }.WithCustomCode(x => x.Click += (_, _) => flyout.Hide())
+                    ),
+                    ShouldConstrainToRootBounds = false
+                };
+                flyout.ShowAt(Content, new() { Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft});
+            }
+        }
     }
 
     void UpdateSize()
@@ -181,7 +242,7 @@ void TimerCallback()
             Content.Opacity = 1;
             keyReset = true;
             ((StackPanel)Content).Children.Add(
-                HStack(center: true, Key("R-CTRL", new(0, 0, right: 5, 0)), Text("Reset Timer", TextLineBounds.Tight)));
+                HStack(center: true, Key($"{HOTKEY_MAIN} + Enter", new(0, 0, right: 5, 0)), Text("Reset Timer", TextLineBounds.Tight)));
             UpdateSize();
         }
     }

ContextSwitch/MainWindow.cs

@@ -11,6 +11,9 @@
 using WinUIEx;
 using WindowApi = WinWrapper.Windowing.Window;
 using static ContextSwitch.Controls;
+using Windows.Storage;
+using System.Reflection;
+using System.IO;
 namespace ContextSwitch;
 
 class MainWindow : Window
@@ -23,6 +26,14 @@ public MainWindow()
         w.Size = new(550, 450);
         var d = w.CurrentDisplay.WorkingAreaBounds;
         w.Location = new((d.Width - w.Size.Width) / 2 + d.Left, (d.Height - w.Size.Height) / 2 + d.Top);
+#if UNPKG
+        string path = AppContext.BaseDirectory;
+#else
+        string path = Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
+#endif
+        w.LargeIcon = WinWrapper.Icon.FromHandle(
+            new System.Drawing.Bitmap(Path.Join(path, "Assets", "ContextSwitchIcon.png")).GetHicon()
+        );
     }
     void InitMain()
     {
@@ -55,7 +66,7 @@ void InitMain()
                         SelectedTime = TimeSpan.FromMinutes(25),
                     },
                     btn = new Button() { Content = "Start Timer" },
-                    HStack(center: true, Text("Tip: Hold"), Key("R-CTRL"), Text("to show timer"))
+                    HStack(center: true, Text("Tip: Hold"), Key(FloatingTimer.HOTKEY_MAIN), Text("to show timer"))
                 )
                 .WithCustomCode(x =>
                 {