add separate button for create project and repository, closes #218

Author: unitycoder

UnityLauncherPro/NewProject.xaml

@@ -7,7 +7,7 @@
         xmlns:data="clr-namespace:UnityLauncherPro.Data"
         d:DataContext="{d:DesignInstance Type=local:NewProject}"
         mc:Ignorable="d"
-        Title="Create New Project" Height="660" Width="650" Background="{DynamicResource ThemeDarkestBackground}" PreviewKeyDown="Window_PreviewKeyDown" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="True">
+        Title="Create New Project" Height="660" Width="670" Background="{DynamicResource ThemeDarkestBackground}" PreviewKeyDown="Window_PreviewKeyDown" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="True">
 
     <Grid>
         <Grid.ColumnDefinitions>
@@ -67,11 +67,13 @@
             <!--<Label x:Name="lblNewProjectFolder" Content="(folder)" Foreground="{DynamicResource ThemeButtonForegroundDisabled}" Margin="0" FontSize="10" Padding="5,0,5,3" />-->
             <Grid HorizontalAlignment="Stretch" Margin="0,20,0,0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="0.7*"/>
+                    <ColumnDefinition Width="0.3*"/>
+                    <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnCancelNewProject" Margin="0,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCancelNewProject_Click" TabIndex="4" Content="Cancel"/>
-                <Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnCreateNewProject" Margin="3,0,0,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCreateNewProject_Click" TabIndex="3" Content="_Create Project"/>
+                <Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnCancelNewProject" Margin="0,0,3,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCancelNewProject_Click" TabIndex="4" Content="_Cancel"/>
+                <Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnCreateNewProjectAndRepo" Margin="3,0,0,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="btnCreateNewProjectAndRepo_Click" TabIndex="3" Content="New Project+_Repo"/>
+                <Button Grid.Column="2" Style="{StaticResource CustomButton}" x:Name="btnCreateNewProject" Margin="3,0,0,3" BorderBrush="{x:Null}" VerticalAlignment="Top" Height="35" Click="BtnCreateNewProject_Click" TabIndex="3" Content="_New Project"/>
             </Grid>
 
             <Expander x:Name="expVersionControl" Margin="0,10,0,0" Header="Version Control (Github)" Foreground="{DynamicResource ThemeButtonForeground}" IsExpanded="True" Collapsed="expVersionControl_Collapsed" Expanded="expVersionControl_Collapsed">

UnityLauncherPro/NewProject.xaml.cs

@@ -62,17 +62,16 @@ public NewProject(string unityVersion, string suggestedName, string targetFolder
 
             txtNewProjectFolder.Text = targetFolder;
 
+            UpdateCreateButtonsEnabledState();
+
             if (MainWindow.unityInstallationsSource.Count == 0)
             {
                 Tools.SetStatus("No Unity installations found! Please add Unity installations first.");
                 isInitializing = false;
                 btnCreateNewProject.IsEnabled = false;
+                btnCreateNewProjectAndRepo.IsEnabled = false;
                 return;
             }
-            else
-            {
-                btnCreateNewProject.IsEnabled = true;
-            }
 
             // fill available versions, only replace if it's a different collection instance
             if (!ReferenceEquals(gridAvailableVersions.ItemsSource, MainWindow.unityInstallationsSource))
@@ -217,10 +216,26 @@ void UpdateModulesDropdown(string version)
 
         bool isCreatingProject = false;
         private async void BtnCreateNewProject_Click(object sender, RoutedEventArgs e)
+        {
+            await CreateNewProject(withRepo: false);
+        }
+
+        private async void btnCreateNewProjectAndRepo_Click(object sender, RoutedEventArgs e)
+        {
+            await CreateNewProject(withRepo: true);
+        }
+
+        private async Task CreateNewProject(bool withRepo)
         {
             if (isCreatingProject) return;
             isCreatingProject = true;
 
+            btnCreateNewProject.IsEnabled = false;
+            btnCreateNewProjectAndRepo.IsEnabled = false;
+
+            try
+            {
+
             // check if projectname already exists (only if should be automatically created name)
             var targetPath = Path.Combine(targetFolder, txtNewProjectName.Text);
             if (txtNewProjectName.IsEnabled == true && Directory.Exists(targetPath) == true)
@@ -279,9 +294,7 @@ private async void BtnCreateNewProject_Click(object sender, RoutedEventArgs e)
                 Settings.Default.Save();
             }
 
-            btnCreateNewProject.IsEnabled = false;
-
-            if (chkEnableVersionControl.IsChecked == true)
+            if (withRepo && chkEnableVersionControl.IsChecked == true)
             {
                 // setup local git
                 try
@@ -352,7 +365,7 @@ private async void BtnCreateNewProject_Click(object sender, RoutedEventArgs e)
             } // if version control enabled
 
             // create readme if enabled
-            if (chkAddReadme.IsChecked == true)
+            if (withRepo && chkAddReadme.IsChecked == true)
             {
                 var readmePath = Path.Combine(txtNewProjectFolder.Text, txtNewProjectName.Text, "README.md");
                 try
@@ -370,7 +383,7 @@ private async void BtnCreateNewProject_Click(object sender, RoutedEventArgs e)
             }
 
             // download .gitignore if enabled
-            if (chkAddUnityGitIgnore.IsChecked == true)
+            if (withRepo && chkAddUnityGitIgnore.IsChecked == true)
             {
                 //var gitIgnoreUrl = "https://raw.githubusercontent.com/github/gitignore/refs/heads/main/Unity.gitignore";
 
@@ -391,13 +404,12 @@ private async void BtnCreateNewProject_Click(object sender, RoutedEventArgs e)
                 {
                     Tools.SetStatus("Failed to create .gitignore file for this project.");
                 }
-            }
+            } // if add gitignore
 
-            if (chkEnableVersionControl.IsChecked == true)
+            if (withRepo && chkEnableVersionControl.IsChecked == true)
             {
                 if (chkInitialCommit.IsChecked == true)
                 {
-                    Console.WriteLine(1);
                     try
                     {
                         await GithubActions.RunGitAsync(Path.Combine(txtNewProjectFolder.Text, txtNewProjectName.Text), "add .");
@@ -421,11 +433,26 @@ private async void BtnCreateNewProject_Click(object sender, RoutedEventArgs e)
 
             } // if version control enabled
 
-            btnCreateNewProject.IsEnabled = true;
-            isCreatingProject = false;
+            }
+            finally
+            {
+                isCreatingProject = false;
+                UpdateCreateButtonsEnabledState();
+            }
 
             DialogResult = true;
-        } // BtnCreateNewProject_Click
+        }
+
+        private void UpdateCreateButtonsEnabledState()
+        {
+            bool folderExists = Directory.Exists(txtNewProjectFolder.Text);
+            bool projectNameAvailable = !string.IsNullOrWhiteSpace(txtNewProjectName.Text) && !Directory.Exists(Path.Combine(targetFolder, txtNewProjectName.Text));
+            bool onlineTemplateReady = !(listOnlineTemplates.SelectedItem is OnlineTemplateItem selectedOnlineTemplate) || selectedOnlineTemplate.IsDownloaded;
+            bool versionControlEnabled = chkEnableVersionControl.IsChecked == true;
+
+            btnCreateNewProject.IsEnabled = folderExists && projectNameAvailable && onlineTemplateReady && !isCreatingProject;
+            btnCreateNewProjectAndRepo.IsEnabled = btnCreateNewProject.IsEnabled && versionControlEnabled;
+        }
 
 
         private void BtnCancelNewProject_Click(object sender, RoutedEventArgs e)
@@ -434,7 +461,7 @@ private void BtnCancelNewProject_Click(object sender, RoutedEventArgs e)
         }
 
 
-        private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
+        private async void Window_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             switch (e.Key)
             {
@@ -460,7 +487,7 @@ private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
                     e.Handled = true; // override writing to textbox
                     break;
                 case Key.Enter: // enter, create proj
-                    BtnCreateNewProject_Click(null, null);
+                    await CreateNewProject(withRepo: false);
                     e.Handled = true;
                     break;
                 case Key.Escape: // esc cancel
@@ -523,15 +550,15 @@ private void TxtNewProjectName_TextChanged(object sender, TextChangedEventArgs e
                 System.Console.WriteLine("Project already exists");
                 txtNewProjectName.BorderBrush = Brushes.Red; // not visible if focused
                 txtNewProjectName.ToolTip = "Project folder already exists";
-                btnCreateNewProject.IsEnabled = false;
             }
             else
             {
                 txtNewProjectName.BorderBrush = null;
-                btnCreateNewProject.IsEnabled = true;
                 txtNewProjectName.ToolTip = "";
             }
 
+            UpdateCreateButtonsEnabledState();
+
             //System.Console.WriteLine("newProjectName: " + txtNewProjectName.Text);
 
             newProjectName = txtNewProjectName.Text;
@@ -612,14 +639,14 @@ private void CmbNewProjectPlatform_DropDownOpened(object sender, System.EventArg
             previousSelectedModuleIndex = cmbNewProjectPlatform.SelectedIndex;
         }
 
-        private void gridAvailableVersions_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
+        private async void gridAvailableVersions_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             // check that we clicked actually on a row
             var src = VisualTreeHelper.GetParent((DependencyObject)e.OriginalSource);
             var srcType = src.GetType();
             if (srcType == typeof(ContentPresenter))
             {
-                BtnCreateNewProject_Click(null, null);
+                await CreateNewProject(withRepo: false);
             }
         }
 
@@ -635,14 +662,7 @@ private void chkEnableVersionControl_Checked(object sender, RoutedEventArgs e)
         {
             bool state = chkEnableVersionControl.IsChecked == true;
 
-            if (state == true)
-            {
-                btnCreateNewProject.Content = "Create Project + GitHub Repo";
-            }
-            else
-            {
-                btnCreateNewProject.Content = "Create Project";
-            }
+            btnCreateNewProjectAndRepo.IsEnabled = state;
 
             if (isInitializing) return;
 
@@ -699,16 +719,16 @@ private void txtNewProjectFolder_TextChanged(object sender, TextChangedEventArgs
             if (Directory.Exists(txtNewProjectFolder.Text) == false)
             {
                 txtNewProjectFolder.BorderBrush = Brushes.Red; // not visible if focused
-                btnCreateNewProject.IsEnabled = false;
                 btnCreateMissingFolder.IsEnabled = true;
             }
             else
             {
                 txtNewProjectFolder.BorderBrush = null;
-                btnCreateNewProject.IsEnabled = true;
                 targetFolder = txtNewProjectFolder.Text;
                 btnCreateMissingFolder.IsEnabled = false;
             }
+
+            UpdateCreateButtonsEnabledState();
         }
 
         private void btnCreateMissingFolder_Click(object sender, RoutedEventArgs e)
@@ -942,8 +962,6 @@ private void listOnlineTemplates_SelectionChanged(object sender, SelectionChange
                 cmbNewProjectTemplate.IsEnabled = false;
                 cmbNewProjectTemplate.SelectedIndex = 0; // Reset to default
 
-                // disable create button if template not downloaded yet
-                btnCreateNewProject.IsEnabled = selectedTemplate.IsDownloaded;
                 btnCreateNewProject.Content = selectedTemplate.IsDownloaded ? "Create Project" : "Download Template First >";
             }
             else
@@ -955,9 +973,10 @@ private void listOnlineTemplates_SelectionChanged(object sender, SelectionChange
                 cmbNewProjectTemplate.IsEnabled = true;
 
                 // enable create button
-                btnCreateNewProject.IsEnabled = true;
                 btnCreateNewProject.Content = "Create Project";
             }
+
+            UpdateCreateButtonsEnabledState();
         }
 
         private async void btnDownloadTemplate_Click(object sender, RoutedEventArgs e)
@@ -1230,6 +1249,5 @@ private void txtTokenInput_PasswordChanged(object sender, RoutedEventArgs e)
             btnAuthorizeToken.IsEnabled = tokenSeemsOK;
         }
 
-
     } // class NewProject
 } // namespace UnityLauncherPro