From 934e2ab3c28a30920c6325782b7a7dc8c2d21c92 Mon Sep 17 00:00:00 2001
From: Dai <dai@dai.me>
Date: Sat, 23 Jan 2021 01:06:53 -0800
Subject: [PATCH 1/6] Updating TogglDesktop.csproj to support multiple versions
 of the Windows 10 SDK.

---
 .../TogglDesktop/TogglDesktop.csproj          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj b/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj
index 63a7288c7b..a5e324eeb7 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj
@@ -156,16 +156,17 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="Windows">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
-    </Reference>
-    <Reference Include="Windows.Foundation.FoundationContract">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Windows.Foundation.UniversalApiContract">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
-      <Private>False</Private>
+    <Reference Include="Windows"> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd')">C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.19041.0\Windows.winmd')">C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.19041.0\Windows.winmd</HintPath> 
+    </Reference> 
+    <Reference Include="Windows.Foundation.FoundationContract"> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath> 
+    </Reference> 
+    <Reference Include="Windows.Foundation.UniversalApiContract"> 
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
+        <HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.UniversalApiContract\10.0.0.0\Windows.Foundation.UniversalApiContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.UniversalApiContract\10.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>

From 5e2e751f06d47ab23f4c425b004518156edbea62 Mon Sep 17 00:00:00 2001
From: Dai <dai@dai.me>
Date: Sat, 23 Jan 2021 01:54:31 -0800
Subject: [PATCH 2/6] Adding `endDatePicker` to EditView.xaml. Updating <Grid>
 layout.

---
 .../TogglDesktop/ui/views/EditView.xaml       | 93 +++++++++++++------
 1 file changed, 64 insertions(+), 29 deletions(-)

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
index 5c654eeb35..93ffcd2dcb 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
@@ -193,46 +193,81 @@
                 <!-- times, duration -->
                 <Grid Margin="0 22 0 0">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="42"/>
+                        <RowDefinition Height="42"/>
+                        <RowDefinition Height="42"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="21*" />
-                        <ColumnDefinition Width="17*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="17*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="80"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock Style="{DynamicResource Toggl.BodyText}" Margin="0 0 0 8" Text="Duration" />
-                    <toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="1" Grid.Column="0"
-                                           Margin="0 0 12 0"
-                                           Style="{StaticResource {x:Type TextBox}}"
-                                           LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
-                                           KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>
+
+                    <!-- Row 0: Start -->
+                    <TextBlock Style="{DynamicResource Toggl.BodyText}"
+							   Grid.Row="0" Grid.Column="0"
+							   VerticalAlignment="Center"
+							   Margin="0 0 10 8"
+							   Text="Start" />
+
+                    <DatePicker Name="startDatePicker" x:FieldModifier="private"
+								Style="{StaticResource EditViewDatePickerStyle}"
+								Grid.Row="0" Grid.Column="1"
+								Margin="0 0 0 8"
+								Height="32"
+                                LostKeyboardFocus="startDatePicker_LostKeyboardFocus">
+                        <i:Interaction.Behaviors>
+                            <behaviors:DatePickerKeyboardHandlingBehavior />
+                        </i:Interaction.Behaviors>
+                    </DatePicker>
+
                     <toggl:ExtendedTextBox x:Name="startTimeTextBox" x:FieldModifier="private"
-                                           Grid.Row="1" Grid.Column="1"
+                                           Grid.Row="0" Grid.Column="2"
+										   Margin="8 0 0 8"
+										   Height="32"
                                            Style="{StaticResource {x:Type TextBox}}"
                                            LostKeyboardFocus="startTimeTextBox_OnLostKeyboardFocus"
                                            KeyDown="startTimeTextBox_OnKeyDown">12:45</toggl:ExtendedTextBox>
-                    <ContentControl Focusable="False"
-                                    Margin="6 0"
-                                    Grid.Row="1" Grid.Column="2"
-                                    Content="{StaticResource Toggl.ArrowIcon}" />
-                    <toggl:ExtendedTextBox x:Name="endTimeTextBox" x:FieldModifier="private"
-                                           Grid.Row="1" Grid.Column="3"
-                                           Style="{StaticResource {x:Type TextBox}}"
-                                           LostKeyboardFocus="endTimeTextBox_OnLostKeyboardFocus"
-                                           KeyDown="endTimeTextBox_OnKeyDown">12:55</toggl:ExtendedTextBox>
-                    <DatePicker Name="startDatePicker" x:FieldModifier="private" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4"
-                                Style="{StaticResource EditViewDatePickerStyle}"
-                                Margin="0 8 0 0"
-                                Height="32"
-                                SelectedDate="05.01.2015"
-                                LostKeyboardFocus="startDatePicker_LostKeyboardFocus">
+
+                    <!-- Row 1: End -->
+                    <TextBlock Style="{DynamicResource Toggl.BodyText}"
+							   Grid.Row="1" Grid.Column="0"
+							   VerticalAlignment="Center"
+							   Margin="0 0 10 8"
+							   Text="End"/>
+
+                    <DatePicker Name="endDatePicker" x:FieldModifier="private"
+								Style="{StaticResource EditViewDatePickerStyle}"
+								Grid.Row="1" Grid.Column="1"
+                                Margin="0 0 0 8"
+								Height="32"
+                                LostKeyboardFocus="endDatePicker_LostKeyboardFocus">
                         <i:Interaction.Behaviors>
                             <behaviors:DatePickerKeyboardHandlingBehavior />
                         </i:Interaction.Behaviors>
                     </DatePicker>
+
+                    <toggl:ExtendedTextBox x:Name="endTimeTextBox" x:FieldModifier="private"
+                                           Grid.Row="1" Grid.Column="2"
+										   Margin="8 0 0 8"
+										   Height="32"
+                                           Style="{StaticResource {x:Type TextBox}}"
+                                           LostKeyboardFocus="endTimeTextBox_OnLostKeyboardFocus"
+                                           KeyDown="endTimeTextBox_OnKeyDown">12:55</toggl:ExtendedTextBox>
+
+                    <!-- Row 2: Duration -->
+                    <TextBlock Style="{DynamicResource Toggl.BodyText}"
+							   Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+							   VerticalAlignment="Center"
+							   Margin="0 0 10 10"
+							   Text="Duration" />
+                    
+                    <toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="2" Grid.Column="2"
+                                           Margin="8 0 0 8"
+										   Height="32"
+                                           Style="{StaticResource {x:Type TextBox}}"
+                                           LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
+                                           KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>
                 </Grid>
 
                 <TextBlock Margin="0 14 0 0" LineHeight="20" FontSize="{DynamicResource NormalFontSize}">

From 7a9e4bc117648a8ce5b6e50d5595e3371367057a Mon Sep 17 00:00:00 2001
From: Dai <dai@dai.me>
Date: Sat, 23 Jan 2021 02:56:52 -0800
Subject: [PATCH 3/6] Integrating the End-Date-Picker with EditView.xaml.cs.

---
 .../TogglDesktop/ui/views/EditView.xaml.cs    | 157 ++++++++++++++++--
 1 file changed, 139 insertions(+), 18 deletions(-)

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
index bdbbeb7677..f1b1bc2089 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
@@ -29,7 +29,7 @@ public partial class EditView
         private ulong selectedClientId;
         private string selectedClientName;
         private bool isCreatingProject;
-        private bool dateSet = false;
+        private bool startDateSet = false;
         public EditView()
         {
             this.DataContext = this;
@@ -75,7 +75,7 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
 
             using (Performance.Measure("filling edit view from OnTimeEntryEditor"))
             {
-                this.dateSet = false;
+                this.startDateSet = false;
                 if (timeEntry.Locked)
                 {
                     open = true;
@@ -110,17 +110,27 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
 
                 this.endTimeTextBox.IsEnabled = !isCurrentlyRunning;
                 this.startDatePicker.IsEnabled = !isCurrentlyRunning;
+                this.endDatePicker.IsEnabled = !isCurrentlyRunning;
 
                 var startDateTime = Toggl.DateTimeFromUnix(timeEntry.Started);
                 var endDateTime = Toggl.DateTimeFromUnix(timeEntry.Ended);
 
                 setText(this.descriptionTextBox, timeEntry.Description, open);
-                setTime(this.durationTextBox, timeEntry.Duration, open);
+
+                // Start:
                 setTime(this.startTimeTextBox, timeEntry.StartTimeString, open);
                 this.startTimeTextBox.ToolTip = startDateTime.ToString("T", CultureInfo.CurrentCulture);
+                this.startDatePicker.SelectedDate = startDateTime;
+
+                // End:
                 setTime(this.endTimeTextBox, timeEntry.EndTimeString, open);
                 this.endTimeTextBox.ToolTip = endDateTime.ToString("T", CultureInfo.CurrentCulture);
-                this.startDatePicker.SelectedDate = startDateTime;
+                this.endDatePicker.SelectedDate = endDateTime;
+
+                // Duration:
+                setTime(this.durationTextBox, timeEntry.Duration, open);
+                
+
                 if (isDifferentTimeEntry)
                 {
                     this.clearUndoHistory();
@@ -128,6 +138,7 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
 
                 if (isCurrentlyRunning)
                 {
+                    this.endDatePicker.SelectedDate = DateTime.Now;
                     this.endTimeTextBox.Text = "";
                 }
 
@@ -165,7 +176,7 @@ private void onTimeEntryEditor(bool open, Toggl.TogglTimeEntryView timeEntry, st
                             ? "Create a new project"
                             : string.Empty;
                 }
-                this.dateSet = true;
+                this.startDateSet = true;
             }
         }
 
@@ -187,6 +198,13 @@ private static void setText(ExtendedTextBox textBox, string text, bool evenIfFoc
             }
         }
 
+        /// <summary>
+        /// When <paramref name="textBox"/> is not focused, or has an empty <see cref="FrameworkElement.Tag"/> property value, or when <paramref name="evenIfFocused"/> is <see langword="true"/>, this method stores <paramref name="time"/> into <paramref name="textBox"/>'s <see cref="FrameworkElement.Tag"/> property.<br/>
+        /// Otherwise, this method does nothing.
+        /// </summary>
+        /// <param name="textBox"></param>
+        /// <param name="time"></param>
+        /// <param name="evenIfFocused"></param>
         private static void setTime(ExtendedTextBox textBox, string time, bool evenIfFocused)
         {
             if (evenIfFocused
@@ -205,9 +223,9 @@ private static void setTime(ExtendedTextBox textBox, string time, bool evenIfFoc
 
         #region duration auto update
 
-        private void durationUpdateTimerTick(object sender, string s)
+        private void durationUpdateTimerTick(object sender, string durationText)
         {
-            if (this.TryBeginInvoke(durationUpdateTimerTick, sender, s))
+            if (this.TryBeginInvoke(durationUpdateTimerTick, sender, durationText))
                 return;
 
             if (!this.hasTimeEntry() || this.timeEntry.DurationInSeconds >= 0)
@@ -222,8 +240,8 @@ private void durationUpdateTimerTick(object sender, string s)
 
             var caret = this.durationTextBox.CaretIndex;
 
-            this.durationTextBox.SetText(s);
-            this.durationTextBox.Tag = s;
+            this.durationTextBox.SetText(durationText);
+            this.durationTextBox.Tag = durationText;
 
             this.durationTextBox.CaretIndex = caret;
         }
@@ -351,7 +369,8 @@ private void saveStartTimeIfChanged()
         }
         private void saveEndTimeIfChanged()
         {
-            this.setTimeEntryTimeIfChanged(this.endTimeTextBox, Toggl.SetTimeEntryEnd, "end time");
+//          this.setTimeEntryTimeIfChanged(this.endTimeTextBox, Toggl.SetTimeEntryEnd, "end time");
+            this.setTimeEntryEndTimestampIfChanged();
         }
         private void saveDurationIfChanged()
         {
@@ -367,18 +386,97 @@ private void setTimeEntryTimeIfChanged(TextBox textBox, Func<string, string, boo
                 return;
             }
 
-            var before = textBox.Tag as string;
-            var now = textBox.Text;
+            var before = textBox.Tag as string; // e.g. "06:00" or "6:00 AM" etc
+            var now = textBox.Text; // e.g. "06:01" or "6:01 AM" etc
             if (before == now)
                 return;
 
             textBox.Tag = null;
 
             apiCall(this.timeEntry.GUID, now);
+
+        }
+
+        private void setTimeEntryEndTimestampIfChanged()
+        {
+            if (!this.hasTimeEntry())
+            {
+                Console.WriteLine("Cannot apply change: No time entry.");
+                return;
+            }
+
+            if (!this.endDatePicker.SelectedDate.HasValue)
+			{
+               Console.WriteLine("Cannot apply change: No end date value.");
+               return;
+			}
+
+            DateTime nowEnd;
+            DateTime previousEnd;
+			{
+                DateTime nowEndDate      = this.endDatePicker.SelectedDate.Value.Date;
+                DateTime previousEndDate = ( this.endDatePicker.Tag as DateTime? ?? DateTime.MinValue ).Date;
+            
+                TimeSpan nowEndTimeOfDay;
+                TimeSpan previousEndTimeOfDay;
+			    {
+                    if (!DateTime.TryParseExact(this.endTimeTextBox.Text, format: "t", CultureInfo.CurrentCulture, DateTimeStyles.NoCurrentDateDefault | DateTimeStyles.AssumeLocal, out DateTime nowEndTimeOfDayAsDate))
+			        {
+                        Console.WriteLine("Cannot apply change: Invalid end time textbox value.");
+                        return;
+			        }
+
+                    if (!DateTime.TryParseExact(this.endTimeTextBox.Tag as string, format: "t", CultureInfo.CurrentCulture, DateTimeStyles.NoCurrentDateDefault | DateTimeStyles.AssumeLocal, out DateTime previousEndTimeOfDayAsDate))
+			        {
+                        previousEndTimeOfDayAsDate = DateTime.MinValue;
+			        }
+
+                    nowEndTimeOfDay      = nowEndTimeOfDayAsDate.TimeOfDay;
+                    previousEndTimeOfDay = previousEndTimeOfDayAsDate.TimeOfDay;
+			    }
+
+                nowEnd      = nowEndDate     .Add(nowEndTimeOfDay);
+                previousEnd = previousEndDate.Add(previousEndTimeOfDay);
+			}
+
+            long nowEndUnix      = Toggl.UnixFromDateTime(nowEnd);
+            long previousEndUnix = Toggl.UnixFromDateTime(previousEnd);
+            if( nowEndUnix == previousEndUnix )
+			{
+                Console.WriteLine("Cannot apply change: No change detected.");
+                return;
+			}
+
+            this.endTimeTextBox.Tag = null;
+
+            Toggl.SetTimeEntryEndTimeStamp(this.timeEntry.GUID, nowEndUnix);
         }
 
         #region datepicker
 
+        private void saveDate() 
+        { 
+            if (!this.hasTimeEntry()) 
+            { 
+                Console.WriteLine("Cannot apply date change: No time entry."); 
+                return; 
+            } 
+            if (!this.startDatePicker.SelectedDate.HasValue) 
+            { 
+                this.startDatePicker.SelectedDate = Toggl.DateTimeFromUnix(this.timeEntry.Started); 
+                return; 
+            } 
+ 
+            DateTime currentDate = Toggl.DateTimeFromUnix(timeEntry.Started); 
+ 
+            if (!currentDate.Equals(this.startDatePicker.SelectedDate.Value)) 
+            { 
+                currentDate = this.startDatePicker.SelectedDate.Value; 
+                Toggl.SetTimeEntryDate(this.timeEntry.GUID, currentDate); 
+            } 
+        } 
+
+        /*
         private void saveDate()
         {
             if (!this.hasTimeEntry())
@@ -386,32 +484,55 @@ private void saveDate()
                 Console.WriteLine("Cannot apply date change: No time entry.");
                 return;
             }
+
             if (!this.startDatePicker.SelectedDate.HasValue)
             {
                 this.startDatePicker.SelectedDate = Toggl.DateTimeFromUnix(this.timeEntry.Started);
                 return;
             }
 
-            DateTime currentDate = Toggl.DateTimeFromUnix(timeEntry.Started);
+            if (!this.endDatePicker.SelectedDate.HasValue)
+            {
+                this.endDatePicker.SelectedDate = Toggl.DateTimeFromUnix(this.timeEntry.Ended);
+            }
+
+            DateTime currentStartedDt = Toggl.DateTimeFromUnix(timeEntry.Started);
+            DateTime currentEndedDt = Toggl.DateTimeFromUnix(timeEntry.Ended);
 
-            if (!currentDate.Equals(this.startDatePicker.SelectedDate.Value))
+            if (this.startDatePicker.SelectedDate.Value != currentStartedDt)
             {
-                currentDate = this.startDatePicker.SelectedDate.Value;
-                Toggl.SetTimeEntryDate(this.timeEntry.GUID, currentDate);
+                currentStartedDt = this.startDatePicker.SelectedDate.Value;
+                Toggl.SetTimeEntryDate(this.timeEntry.GUID, currentStartedDt);
+            }
+
+            if (this.endDatePicker.SelectedDate.Value != currentEndedDt)
+            {
+                currentEndedDt = this.endDatePicker.SelectedDate.Value;
+                long endUnix = Toggl.UnixFromDateTime(currentEndedDt);
+                Toggl.SetTimeEntryEndTimeStamp(this.timeEntry.GUID, endUnix);
             }
         }
+        */
 
         private void startDatePicker_LostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
             if (!startDatePicker.IsKeyboardFocusWithin)
             {
-                if (this.dateSet)
+                if (this.startDateSet)
                 {
                     this.saveDate();
                 }
             }
         }
 
+        private void endDatePicker_LostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+        {
+            if (!endDatePicker.IsKeyboardFocusWithin)
+            {
+                this.setTimeEntryEndTimestampIfChanged();
+            }
+        }
+
         #endregion
 
         #endregion
@@ -831,7 +952,7 @@ private void billableCheckBox_OnClick(object sender, RoutedEventArgs e)
 
         public void SetTimer(Timer timer)
         {
-            timer.ViewModel.WhenValueChanged(x => x.DurationText).Subscribe(x => durationUpdateTimerTick(this, x));
+            timer.ViewModel.WhenValueChanged(x => x.DurationText).Subscribe(durationText => this.durationUpdateTimerTick(this, durationText));
         }
 
         public void FocusField(string focusedFieldName)

From cec74cf6574253a67f7acf8ac8d1198c527abef5 Mon Sep 17 00:00:00 2001
From: Dai <dai@dai.me>
Date: Sat, 23 Jan 2021 03:02:53 -0800
Subject: [PATCH 4/6] Tidying up.

---
 .../TogglDesktop/ui/views/EditView.xaml.cs    | 68 ++++---------------
 1 file changed, 12 insertions(+), 56 deletions(-)

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
index f1b1bc2089..8533e36fd8 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml.cs
@@ -202,9 +202,6 @@ private static void setText(ExtendedTextBox textBox, string text, bool evenIfFoc
         /// When <paramref name="textBox"/> is not focused, or has an empty <see cref="FrameworkElement.Tag"/> property value, or when <paramref name="evenIfFocused"/> is <see langword="true"/>, this method stores <paramref name="time"/> into <paramref name="textBox"/>'s <see cref="FrameworkElement.Tag"/> property.<br/>
         /// Otherwise, this method does nothing.
         /// </summary>
-        /// <param name="textBox"></param>
-        /// <param name="time"></param>
-        /// <param name="evenIfFocused"></param>
         private static void setTime(ExtendedTextBox textBox, string time, bool evenIfFocused)
         {
             if (evenIfFocused
@@ -369,7 +366,6 @@ private void saveStartTimeIfChanged()
         }
         private void saveEndTimeIfChanged()
         {
-//          this.setTimeEntryTimeIfChanged(this.endTimeTextBox, Toggl.SetTimeEntryEnd, "end time");
             this.setTimeEntryEndTimestampIfChanged();
         }
         private void saveDurationIfChanged()
@@ -377,7 +373,6 @@ private void saveDurationIfChanged()
             this.setTimeEntryTimeIfChanged(this.durationTextBox, Toggl.SetTimeEntryDuration, "duration");
         }
 
-
         private void setTimeEntryTimeIfChanged(TextBox textBox, Func<string, string, bool> apiCall, string timeType)
         {
             if (!this.hasTimeEntry())
@@ -394,7 +389,6 @@ private void setTimeEntryTimeIfChanged(TextBox textBox, Func<string, string, boo
             textBox.Tag = null;
 
             apiCall(this.timeEntry.GUID, now);
-
         }
 
         private void setTimeEntryEndTimestampIfChanged()
@@ -406,46 +400,46 @@ private void setTimeEntryEndTimestampIfChanged()
             }
 
             if (!this.endDatePicker.SelectedDate.HasValue)
-			{
+            {
                Console.WriteLine("Cannot apply change: No end date value.");
                return;
-			}
+            }
 
             DateTime nowEnd;
             DateTime previousEnd;
-			{
+            {
                 DateTime nowEndDate      = this.endDatePicker.SelectedDate.Value.Date;
                 DateTime previousEndDate = ( this.endDatePicker.Tag as DateTime? ?? DateTime.MinValue ).Date;
             
                 TimeSpan nowEndTimeOfDay;
                 TimeSpan previousEndTimeOfDay;
-			    {
+                {
                     if (!DateTime.TryParseExact(this.endTimeTextBox.Text, format: "t", CultureInfo.CurrentCulture, DateTimeStyles.NoCurrentDateDefault | DateTimeStyles.AssumeLocal, out DateTime nowEndTimeOfDayAsDate))
-			        {
+                    {
                         Console.WriteLine("Cannot apply change: Invalid end time textbox value.");
                         return;
-			        }
+                    }
 
                     if (!DateTime.TryParseExact(this.endTimeTextBox.Tag as string, format: "t", CultureInfo.CurrentCulture, DateTimeStyles.NoCurrentDateDefault | DateTimeStyles.AssumeLocal, out DateTime previousEndTimeOfDayAsDate))
-			        {
+                    {
                         previousEndTimeOfDayAsDate = DateTime.MinValue;
-			        }
+                    }
 
                     nowEndTimeOfDay      = nowEndTimeOfDayAsDate.TimeOfDay;
                     previousEndTimeOfDay = previousEndTimeOfDayAsDate.TimeOfDay;
-			    }
+                }
 
                 nowEnd      = nowEndDate     .Add(nowEndTimeOfDay);
                 previousEnd = previousEndDate.Add(previousEndTimeOfDay);
-			}
+            }
 
             long nowEndUnix      = Toggl.UnixFromDateTime(nowEnd);
             long previousEndUnix = Toggl.UnixFromDateTime(previousEnd);
             if( nowEndUnix == previousEndUnix )
-			{
+            {
                 Console.WriteLine("Cannot apply change: No change detected.");
                 return;
-			}
+            }
 
             this.endTimeTextBox.Tag = null;
 
@@ -476,44 +470,6 @@ private void saveDate()
             } 
         } 
 
-        /*
-        private void saveDate()
-        {
-            if (!this.hasTimeEntry())
-            {
-                Console.WriteLine("Cannot apply date change: No time entry.");
-                return;
-            }
-
-            if (!this.startDatePicker.SelectedDate.HasValue)
-            {
-                this.startDatePicker.SelectedDate = Toggl.DateTimeFromUnix(this.timeEntry.Started);
-                return;
-            }
-
-            if (!this.endDatePicker.SelectedDate.HasValue)
-            {
-                this.endDatePicker.SelectedDate = Toggl.DateTimeFromUnix(this.timeEntry.Ended);
-            }
-
-            DateTime currentStartedDt = Toggl.DateTimeFromUnix(timeEntry.Started);
-            DateTime currentEndedDt = Toggl.DateTimeFromUnix(timeEntry.Ended);
-
-            if (this.startDatePicker.SelectedDate.Value != currentStartedDt)
-            {
-                currentStartedDt = this.startDatePicker.SelectedDate.Value;
-                Toggl.SetTimeEntryDate(this.timeEntry.GUID, currentStartedDt);
-            }
-
-            if (this.endDatePicker.SelectedDate.Value != currentEndedDt)
-            {
-                currentEndedDt = this.endDatePicker.SelectedDate.Value;
-                long endUnix = Toggl.UnixFromDateTime(currentEndedDt);
-                Toggl.SetTimeEntryEndTimeStamp(this.timeEntry.GUID, endUnix);
-            }
-        }
-        */
-
         private void startDatePicker_LostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
             if (!startDatePicker.IsKeyboardFocusWithin)

From e57d83b972876aabf04ffac1fec662abb48c0847 Mon Sep 17 00:00:00 2001
From: Dai <dai@dai.me>
Date: Sat, 23 Jan 2021 03:20:56 -0800
Subject: [PATCH 5/6] More tabs-to-spaces.

---
 .../TogglDesktop/ui/views/EditView.xaml       | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
index 93ffcd2dcb..699b19f3c3 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="TogglDesktop.EditView"
+<UserControl x:Class="TogglDesktop.EditView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -205,16 +205,16 @@
 
                     <!-- Row 0: Start -->
                     <TextBlock Style="{DynamicResource Toggl.BodyText}"
-							   Grid.Row="0" Grid.Column="0"
-							   VerticalAlignment="Center"
-							   Margin="0 0 10 8"
-							   Text="Start" />
+                               Grid.Row="0" Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Margin="0 0 10 8"
+                               Text="Start" />
 
                     <DatePicker Name="startDatePicker" x:FieldModifier="private"
-								Style="{StaticResource EditViewDatePickerStyle}"
-								Grid.Row="0" Grid.Column="1"
-								Margin="0 0 0 8"
-								Height="32"
+                                Style="{StaticResource EditViewDatePickerStyle}"
+                                Grid.Row="0" Grid.Column="1"
+                                Margin="0 0 0 8"
+                                Height="32"
                                 LostKeyboardFocus="startDatePicker_LostKeyboardFocus">
                         <i:Interaction.Behaviors>
                             <behaviors:DatePickerKeyboardHandlingBehavior />
@@ -223,24 +223,24 @@
 
                     <toggl:ExtendedTextBox x:Name="startTimeTextBox" x:FieldModifier="private"
                                            Grid.Row="0" Grid.Column="2"
-										   Margin="8 0 0 8"
-										   Height="32"
+                                           Margin="8 0 0 8"
+                                           Height="32"
                                            Style="{StaticResource {x:Type TextBox}}"
                                            LostKeyboardFocus="startTimeTextBox_OnLostKeyboardFocus"
                                            KeyDown="startTimeTextBox_OnKeyDown">12:45</toggl:ExtendedTextBox>
 
                     <!-- Row 1: End -->
                     <TextBlock Style="{DynamicResource Toggl.BodyText}"
-							   Grid.Row="1" Grid.Column="0"
-							   VerticalAlignment="Center"
-							   Margin="0 0 10 8"
-							   Text="End"/>
+                               Grid.Row="1" Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Margin="0 0 10 8"
+                               Text="End"/>
 
                     <DatePicker Name="endDatePicker" x:FieldModifier="private"
-								Style="{StaticResource EditViewDatePickerStyle}"
-								Grid.Row="1" Grid.Column="1"
+                                Style="{StaticResource EditViewDatePickerStyle}"
+                                Grid.Row="1" Grid.Column="1"
                                 Margin="0 0 0 8"
-								Height="32"
+                                Height="32"
                                 LostKeyboardFocus="endDatePicker_LostKeyboardFocus">
                         <i:Interaction.Behaviors>
                             <behaviors:DatePickerKeyboardHandlingBehavior />
@@ -249,22 +249,22 @@
 
                     <toggl:ExtendedTextBox x:Name="endTimeTextBox" x:FieldModifier="private"
                                            Grid.Row="1" Grid.Column="2"
-										   Margin="8 0 0 8"
-										   Height="32"
+                                           Margin="8 0 0 8"
+                                           Height="32"
                                            Style="{StaticResource {x:Type TextBox}}"
                                            LostKeyboardFocus="endTimeTextBox_OnLostKeyboardFocus"
                                            KeyDown="endTimeTextBox_OnKeyDown">12:55</toggl:ExtendedTextBox>
 
                     <!-- Row 2: Duration -->
                     <TextBlock Style="{DynamicResource Toggl.BodyText}"
-							   Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
-							   VerticalAlignment="Center"
-							   Margin="0 0 10 10"
-							   Text="Duration" />
+                               Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+                               VerticalAlignment="Center"
+                               Margin="0 0 10 10"
+                               Text="Duration" />
                     
                     <toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="2" Grid.Column="2"
                                            Margin="8 0 0 8"
-										   Height="32"
+                                           Height="32"
                                            Style="{StaticResource {x:Type TextBox}}"
                                            LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
                                            KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>

From 83f002d4e27305f8087d96ce1df4e916c935c7c4 Mon Sep 17 00:00:00 2001
From: Dai <dai@dai.me>
Date: Sat, 23 Jan 2021 03:22:58 -0800
Subject: [PATCH 6/6] Supporting variable-width durationTextBox.

---
 .../TogglDesktop/TogglDesktop/ui/views/EditView.xaml  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
index 699b19f3c3..061bb9a9a2 100644
--- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
+++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="TogglDesktop.EditView"
+<UserControl x:Class="TogglDesktop.EditView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -193,9 +193,9 @@
                 <!-- times, duration -->
                 <Grid Margin="0 22 0 0">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="42"/>
-                        <RowDefinition Height="42"/>
-                        <RowDefinition Height="42"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -262,10 +262,11 @@
                                Margin="0 0 10 10"
                                Text="Duration" />
                     
-                    <toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="2" Grid.Column="2"
+                    <toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"
                                            Margin="8 0 0 8"
                                            Height="32"
                                            Style="{StaticResource {x:Type TextBox}}"
+                                           HorizontalAlignment="Right"
                                            LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
                                            KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>
                 </Grid>