Merge pull request #59 from CyanCoding/CyanCoding-folder-branch

CyanCoding folder branch

Author: CyanCoding

README.md

@@ -3,9 +3,15 @@ With the Project Tracker, easily **create**, **manage**, **track**, and **develo
 programming projects. At the heart of the Project Tracker is a *simple* to-do list.
 Create tasks for each project, categorized by three simple criteria (error, feature, 
 or comment). You'll be able to manage all of your development tasks and to-do's better
-with Project Tracker's *blazingly* fast features and intuitive design created for developers. Coming soon
-are more features designed to help you develop faster and more efficiently like
-automatic lines of code counting, offline GitHub project integration, easy access
-to your project's folders and files with the click of a button, and more!
+with Project Tracker's *blazingly* fast features and intuitive design created for developers.
+
+
+Some of these features include **automatic code counting** and **folder integration**. Code counting
+means you can keep track of the length of your project and how much coding you've done on it. 
+Folder integration means never again will you have to navigate endlessly through File Explorer 
+looking for your project! With the click of a button, navigate to your project's folder. 
+
+Coming soon are more features designed to help you develop faster and more efficiently like
+offline GitHub project integration, project searching, and more!
 
 ![Project Tracker](https://i.imgur.com/iWFPgGg.png)

ROADMAP.md

@@ -37,10 +37,10 @@ date will be posted allowing you to stay up to date with when new updates will b
 
 ### v3.0:
 **Estimated release date:** `July 10th, 2020`
+- [x] A way to see the release date of the next project and what new features it's bringing.
+- [x] Lines of code counting and display.
+- [x] Allow linking of a folder to each project to easily see files from Project Tracker.
 - [ ] Bring back project duration.
-- [ ] Allow linking of a folder to each project to easily see files from Project Tracker.
 - [ ] GitHub integration!
-- [ ] Lines of code counting and display.
-- [ ] A way to see the release date of the next project and what new features it's bringing.
 - [ ] Search bar functionality.
 - [ ] Themes.

app/Project Tracker/Project Tracker/Folder.cs

@@ -0,0 +1,27 @@
+using Microsoft.WindowsAPICodePack.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Project_Tracker {
+	class Folder {
+		// WARNING: READONLY VARIABLES. IF YOU CHANGE THESE, CHANGE IN ALL OTHER FILES.
+		private static readonly string INITIAL_FILE_DIALOG_DIRECTORY = Environment.SpecialFolder.MyDocuments.ToString();
+
+		public static string SelectFolder() {
+			CommonOpenFileDialog folderDialog = new CommonOpenFileDialog();
+			folderDialog.InitialDirectory = INITIAL_FILE_DIALOG_DIRECTORY;
+			folderDialog.IsFolderPicker = true;
+
+			if (folderDialog.ShowDialog() == CommonFileDialogResult.Ok) {
+				return folderDialog.FileName;
+			}
+			else {
+				return "";
+			}
+		}
+	}
+}

app/Project Tracker/Project Tracker/MainWindow.xaml

@@ -323,8 +323,10 @@
 			<Label x:Name="tasksMadeLabel" Content="Tasks created: 0" HorizontalAlignment="Left" Margin="20,90,0,0" VerticalAlignment="Top" FontSize="24"/>
 			<Label x:Name="tasksCompletedLabel" Content="Tasks completed: 0" HorizontalAlignment="Left" Margin="20,125,0,0" VerticalAlignment="Top" FontSize="24"/>
 			<Label x:Name="statisticsDurationLabel" Content="Duration: coming soon..." HorizontalAlignment="Left" Margin="20,195,0,0" VerticalAlignment="Top" FontSize="24"/>
-			<Label x:Name="linesOfCodeLabel" Content="Lines of code: 0" HorizontalAlignment="Left" Margin="20,265,0,0" VerticalAlignment="Top" FontSize="24"/>
+			<Label x:Name="linesOfCodeLabel" Content="Lines of code: 0" HorizontalAlignment="Left" Margin="20,270,0,0" VerticalAlignment="Top" FontSize="24"/>
 			<Button x:Name="setCodeCountingButton" Content="Set up code counting" HorizontalAlignment="Left" Margin="20,312,0,0" VerticalAlignment="Top" Width="202" Height="52" FontSize="18" Cursor="Hand" PreviewMouseDown="setCodeCountingButton_PreviewMouseDown"/>
+			<Label x:Name="folderLocationLabel" Content="Folder location: " HorizontalAlignment="Left" Margin="20,0,0,92" VerticalAlignment="Bottom" FontSize="24" Width="780"/>
+			<Button x:Name="folderLocationResetButton" Content="Set folder location" HorizontalAlignment="Left" Margin="20,0,0,40" VerticalAlignment="Bottom" Width="202" Height="52" FontSize="18" Cursor="Hand" PreviewMouseDown="folderLocationResetButton_PreviewMouseDown"/>
 
 		</Grid>
 

app/Project Tracker/Project Tracker/MainWindow.xaml.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -23,7 +24,7 @@ public partial class MainWindow : UWPHost.Window {
 			Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
 			+ "/Project Tracker";
 		// IF YOU CHANGE THIS, ALSO CHANGE IT IN UpdateWindow.xaml.cs
-		private readonly string CURRENT_VERSION = "2.2";
+		private readonly string CURRENT_VERSION = "2.4";
 
 		private readonly string DATA_DIRECTORY =
 			Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
@@ -91,7 +92,7 @@ public partial class MainWindow : UWPHost.Window {
 		private string icon;
 
 
-
+		#pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null'
 		public MainWindow() {
 			InitializeComponent();
 			Startup();
@@ -387,14 +388,16 @@ private void CheckmarkPressed(object sender, MouseButtonEventArgs e) {
 			string name = callingImage.Name;
 			name = name.Remove(0, 1); // Removes the t from the name (e.g. t5 -> 5)
 
-			if (taskData[Int32.Parse(name) - 1] == "1") {
+			if (taskData[Int32.Parse(name) - 1] == "1") { // It's already checked
 				taskData[Int32.Parse(name) - 1] = "0";
+				tasksCompleted--;
 			}
-			else {
+			else { // It's not checked
 				taskData[Int32.Parse(name) - 1] = "1";
+				tasksCompleted++;
 			}
 
-			tasksCompleted++;
+			
 
 			CalculatePercentage();
 		}
@@ -1312,7 +1315,17 @@ private void ProjectStatisticsMouseDown(object sender, MouseButtonEventArgs e) {
 			tasksMadeLabel.Content = "Tasks created: " + tasksMade;
 			tasksCompletedLabel.Content = "Tasks completed: " + tasksCompleted;
 			statisticsDurationLabel.Content = "Duration: coming soon...";
-			linesOfCodeLabel.Content = "Lines of code: " + Statistics.CountLines(linesOfCodeFiles.ToArray());
+			linesOfCodeLabel.Content = "Lines of code: " + String.Format("{0:#,###0}", Statistics.CountLines(linesOfCodeFiles.ToArray()));
+
+
+			if (folderLocation != "" && Directory.Exists(folderLocation)) {
+				folderLocationResetButton.Content = "Reset folder location";
+				folderLocationLabel.Content = "Folder location: " + folderLocation;
+			}
+			else {
+				folderLocationLabel.Content = "Folder location: not set";
+				folderLocationResetButton.Content = "Set folder location";
+			}
 		}
 
 		private void RenameProjectButtonPressed(object sender, MouseButtonEventArgs e) {
@@ -1609,6 +1622,7 @@ private void SetSelectedProject() {
 				completeGrid.Visibility = Visibility.Visible;
 				addItemBorder.Visibility = Visibility.Visible;
 				settingsImage.Visibility = Visibility.Visible;
+				folderImage.Visibility = Visibility.Visible;
 
 				string json = File.ReadAllText(filesRead[selectedIndex - 1]);
 				MainTableManifest.Rootobject projectInfo =
@@ -2077,7 +2091,10 @@ private void UpdateButtonMouseDown(object sender, MouseButtonEventArgs e) {
 				File.Delete(NEXT_VERSION_INFO);
 			}
 
+			#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
 			DisableUpdateButton();
+			#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+
 			// Download latest version information
 			try {
 				updateButton1.IsEnabled = false;
@@ -2215,6 +2232,7 @@ private void Window_SizeChanged(object sender, SizeChangedEventArgs e) {
 			blackRectangle.Height = this.Height + 5;
 			addItemBorder.Width = this.Width - 450;
 			changeTitleBorder.Width = this.Width - 700;
+			folderLocationLabel.Width = this.Width - 420;
 
 			scrollviewerGrid.Width = this.Width - 450;
 
@@ -2411,7 +2429,14 @@ private void FeatureItemPressed(object sender, MouseButtonEventArgs e) {
 		#endregion Item selection presses
 
 		private void folderImage_PreviewMouseDown(object sender, MouseButtonEventArgs e) {
+			if (folderLocation == "" || !Directory.Exists(folderLocation)) {
+				folderLocation = Folder.SelectFolder();
 
+				Save(filesRead[selectedIndex - 1]);
+			}
+			else {
+				Process.Start(folderLocation);
+			}
 		}
 
 		private void setCodeCountingButton_PreviewMouseDown(object sender, MouseButtonEventArgs e) {
@@ -2423,7 +2448,18 @@ private void setCodeCountingButton_PreviewMouseDown(object sender, MouseButtonEv
 
 			Save(filesRead[selectedIndex - 1]);
 
-			linesOfCodeLabel.Content = "Lines of code: " + Statistics.CountLines(linesOfCodeFiles.ToArray());
+			linesOfCodeLabel.Content = "Lines of code: " + String.Format("{0:#,###0}", Statistics.CountLines(linesOfCodeFiles.ToArray()));
+		}
+
+		private void folderLocationResetButton_PreviewMouseDown(object sender, MouseButtonEventArgs e) {
+			folderLocation = Folder.SelectFolder();
+			Save(filesRead[selectedIndex - 1]);
+
+			folderLocationLabel.Content = "Folder location: " + folderLocation;
+
+			if (folderLocation != "" && Directory.Exists(folderLocation)) {
+				folderLocationResetButton.Content = "Reset folder location";
+			}
 		}
 	}
 }

app/Project Tracker/Project Tracker/Project Tracker.csproj

@@ -42,6 +42,12 @@
     <Reference Include="Microsoft.Windows.Shell, Version=3.5.41019.1, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UWPHost.1.0.0\lib\net40\Microsoft.Windows.Shell.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -74,6 +80,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="BackgroundProcesses.cs" />
+    <Compile Include="Folder.cs" />
     <Compile Include="NextVersionManifest.cs" />
     <Compile Include="SettingsManifest.cs" />
     <Compile Include="Statistics.cs" />

app/Project Tracker/Project Tracker/UpdateWindow.xaml.cs

@@ -18,7 +18,7 @@ public partial class UpdateWindow : Window {
 
 		private readonly string INSTALLER_PATH = @"C:\Program Files\Project Tracker\Project Tracker Installer.exe";
 		private readonly string VERSION_FILE = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "/Project Tracker/update.txt";
-		private readonly string CURRENT_VERSION = "2.2";
+		private readonly string CURRENT_VERSION = "2.4";
 		private readonly Color sortColor = Color.FromRgb(228, 233, 235);
 		private readonly FontFamily textFont = new FontFamily("Microsoft Sans Serif");
 

app/Project Tracker/Project Tracker/packages.config

@@ -2,4 +2,6 @@
 <packages>
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="UWPHost" version="1.0.0" targetFramework="net472" />
+  <package id="WindowsAPICodePack-Core" version="1.1.1" targetFramework="net472" />
+  <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net472" />
 </packages>