Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Dev drive insights and pip cache move rebased to changes from main #2486

Merged
merged 6 commits into from
Apr 1, 2024
Merged

Dev drive insights and pip cache move rebased to changes from main #2486

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6058ab8
Applied Dev Drive Insights changes on top of Windows Customization fr…
SohamDas2021 Mar 29, 2024
1a0d87f
Addressed PR comments 1
SohamDas2021 Mar 29, 2024
aa482b9
Addressed PR comments
SohamDas2021 Mar 29, 2024
f162c12
Addressed PR comments
SohamDas2021 Apr 1, 2024
a1a730a
More cleanups
SohamDas2021 Apr 1, 2024
54fd0cf
Merge branch 'main' into user/sodas/devdriveinsights_032824
SohamDas2021 Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions DevHome.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Customization", "Customization", "{623998FD-B0A6-4980-95D5-A5072301CA10}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.Customization", "tools\Customization\DevHome.Customization\DevHome.Customization.csproj", "{AF527EA4-6A24-4BD6-BC6E-A5863DC3489C}"
ProjectSection(ProjectDependencies) = postProject
{0901B260-1B88-4B99-A9F8-477ED0A74FBD} = {0901B260-1B88-4B99-A9F8-477ED0A74FBD}
{54082587-A435-423F-AE1B-01B906FFA7C5} = {54082587-A435-423F-AE1B-01B906FFA7C5}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Binary file added src/Assets/Fonts/AMCIcons.ttf
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions src/Styles/FontFamilies.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@
https://github.com/microsoft/cascadia-code/issues/55-->
<FontFamily x:Key="CascadiaMonoFontFamily">ms-appx:///Assets/Fonts/CascadiaMono.ttf#Cascadia Mono,MS Gothic, NSimSun</FontFamily>
<FontFamily x:Key="DevHomeFluentIcons">ms-appx:///Assets/Fonts/DevHome.ttf#DevHome Fluent Icons</FontFamily>
<!-- Needed for icons on Windows Customization -> Dev Drvie Insights page -->
<FontFamily x:Key="AmcFluentIcons">ms-appx:///Assets/Fonts/AmcIcons.ttf#Amc Fluent Icons</FontFamily>
</ResourceDictionary>
4 changes: 4 additions & 0 deletions tools/Customization/DevHome.Customization/DevHome.Customization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

<ItemGroup>
<ProjectReference Include="..\..\..\common\DevHome.Common.csproj" />
<ProjectReference Include="..\..\SetupFlow\DevHome.SetupFlow.Common\DevHome.SetupFlow.Common.csproj" />
Copy link
Collaborator

@krschau krschau Apr 1, 2024 •
edited by SohamDas2021
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be great if you could add the DevHome.Customization project to the mermaid diagram of project relationships in https://github.com/microsoft/devhome/blob/main/docs/architecture.md #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#2506

<ProjectReference Include="..\..\SetupFlow\DevHome.SetupFlow\DevHome.SetupFlow.csproj" />
</ItemGroup>

<ItemGroup>
Expand All @@ -33,6 +35,8 @@
<ItemGroup>
<None Remove="Views\DeveloperFileExplorerPage.xaml" />
<None Remove="Views\DeveloperFileExplorerView.xaml" />
<None Remove="Views\DevDriveInsightsPage.xaml" />
<None Remove="Views\DevDriveInsightsView.xaml" />
<None Remove="Views\MainPage.xaml" />
<None Remove="Views\MainPageView.xaml" />
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion tools/Customization/DevHome.Customization/Extensions/PageExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public static class PageExtensions
{
public static void ConfigureCustomizationPages(this IPageService pageService)
{
pageService.Configure<DeveloperFileExplorerViewModel, DeveloperFileExplorerPage>();
pageService.Configure<DeveloperFileExplorerViewModel, DeveloperFileExplorerPage>();
pageService.Configure<DevDriveInsightsViewModel, DevDriveInsightsPage>();
}
}
8 changes: 7 additions & 1 deletion tools/Customization/DevHome.Customization/Extensions/ServiceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using System;
using DevHome.Customization.ViewModels;
using DevHome.Customization.ViewModels.Environments;
using DevHome.Customization.Views;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
Expand All @@ -16,7 +18,11 @@ public static IServiceCollection AddWindowsCustomization(this IServiceCollection
services.AddTransient<MainPage>();

services.AddSingleton<DeveloperFileExplorerViewModel>();
services.AddTransient<DeveloperFileExplorerPage>();
services.AddTransient<DeveloperFileExplorerPage>();

services.AddSingleton<OptimizeDevDriveDialogViewModelFactory>(sp => (cacheLocation, environmentVariable) => ActivatorUtilities.CreateInstance<OptimizeDevDriveDialogViewModel>(sp, cacheLocation, environmentVariable));
services.AddSingleton<DevDriveInsightsViewModel>();
services.AddTransient<DevDriveInsightsPage>();

return services;
}
Expand Down
52 changes: 52 additions & 0 deletions tools/Customization/DevHome.Customization/Strings/en-us/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,34 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChooseDirectoryPromptText" xml:space="preserve">
<value>Choose directory on dev drive...</value>
Copy link
Collaborator

@krschau krschau Apr 1, 2024 •
edited by SohamDas2021
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dev Drive should be capitalized, I believe. (Applies to all instances on this page)

Suggested change
<value>Choose directory on dev drive...</value>
<value>Choose directory on Dev Drive...</value>
``` #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is what it says in the Figma.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually @SohamDas2021 it should be like Kristen outlined, If I recall, it was from Marketing who said that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So capitalize all Dev Drive in the text?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, thanks.

<comment>Choose directory on dev drive</comment>
</data>
<data name="DevDriveFreeSizeText" xml:space="preserve">
<value>{0} {1} free</value>
<comment>Dev drive size free</comment>
</data>
<data name="DevDriveInsightsCard.Description" xml:space="preserve">
<value>All things, dev drives, optimizations, etc.</value>
Copy link
Contributor

@bbonaby bbonaby Apr 1, 2024 •
edited by SohamDas2021
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed this one, but will let you update it in another PR #Resolved

<comment>The description for the Dev Drive Insights settings card</comment>
</data>
<data name="DevDriveInsightsCard.Header" xml:space="preserve">
<value>Dev Drive Insights</value>
<comment>The header for the Dev Drive Insights settings card</comment>
</data>
<data name="DevDriveInsights_Header" xml:space="preserve">
<value>Dev Drive Insights</value>
<comment>Header for Dev Drive insights page in the breadcrumb bar</comment>
</data>
<data name="DevDriveSizeText" xml:space="preserve">
<value>Size - {0} {1}</value>
<comment>Dev drive size</comment>
</data>
<data name="DevDriveUsedSizeText" xml:space="preserve">
<value>{0} {1} used</value>
<comment>Dev drive size used</comment>
</data>
<data name="DeveloperFileExplorerCard.Description" xml:space="preserve">
<value>Adjust these settings for a more developer-friendly experience using File Explorer</value>
<comment>The description for the Developer File Explorer settings card</comment>
Expand All @@ -133,6 +161,10 @@
<value>Enable end task in taskbar by right click</value>
<comment>The description for the end task on task bar settings card</comment>
</data>
<data name="ExampleDevDriveLocation" xml:space="preserve">
<value>Example: E:\packages\pip</value>
<comment>Example dev drive location</comment>
</data>
<data name="EndTaskOnTaskBar.Header" xml:space="preserve">
<value>End Task</value>
<comment>The header for the end task on task bar settings card</comment>
Expand All @@ -149,6 +181,18 @@
<value>Windows customization</value>
<comment>Navigation pane content</comment>
</data>
<data name="OptimizedDevDriveDescription" xml:space="preserve">
<value>The environment variable {0} is set to {1}</value>
<comment>Optimized dev drive description</comment>
</data>
<data name="OptimizeDevDriveDialogDescription.Text" xml:space="preserve">
<value>Contents of {0} will be copied to chosen directory. And {1} will be set to chosen directory.</value>
<comment>Optimize dev drive dialog description</comment>
</data>
<data name="OptimizerDevDriveDescription" xml:space="preserve">
<value>Global environment variable {0} is set to {1}, which is not located on dev drive. Move contents of this folder to a directory on dev drive such as {2} and set {3} to that chosen directory on dev drive</value>
<comment>Optimizer dev drive description</comment>
</data>
<data name="SettingsAutoSuggestBox.PlaceholderText" xml:space="preserve">
<value>Search</value>
<comment>The placholder text for the settings auto suggest box</comment>
Expand All @@ -173,6 +217,14 @@
<value>Show hidden and system files</value>
<comment>The header for the show hidden and system files setting.</comment>
</data>
<data name="DevDriveOptimizationSuggestion" xml:space="preserve">
<value>Suggestion</value>
<comment>Dev drive optimization suggestion</comment>
</data>
<data name="DevDriveOptimized" xml:space="preserve">
<value>Optimized</value>
<comment>Dev drive optimized indicator</comment>
</data>
<data name="MainPage_Header" xml:space="preserve">
<value>Windows customization</value>
<comment>Header for main Windows customization page in the breadcrumb bar</comment>
Expand Down
Loading