Skip to content

Commit 256a881

Browse files
lukeblevinslukeblevins
authored
Merge pull request #73 from duke7553/testing
0.4.9 Changes Roundup From testing
2 parents e6172ac + 45dc559 commit 256a881

28 files changed

+1517
-569
lines changed

‎Files UWP/AddItem.xaml.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
4343
if (userInput != null)
4444
{
4545
await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
46-
App.ViewModel.FilesAndFolders.Add(new ListedItem(){ FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileExtension = "Folder", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput) });
46+
App.ViewModel.FilesAndFolders.Add(new ListedItem(){ FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput) });
4747
}
4848
}
4949
else if ((e.ClickedItem as AddListItem).Header == "Text Document")
@@ -53,7 +53,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
5353
if (userInput != null)
5454
{
5555
await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
56-
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "Text Document", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
56+
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "Text Document", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
5757
}
5858
}
5959
else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
@@ -63,7 +63,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
6363
if (userInput != null)
6464
{
6565
await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
66-
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "BMP File", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
66+
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "BMP File", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
6767

6868
}
6969
}

‎Files UWP/App.xaml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,27 @@
1010
<ResourceDictionary>
1111
<ResourceDictionary.ThemeDictionaries>
1212
<ResourceDictionary x:Key="Default">
13-
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
14-
BackgroundSource="Backdrop"
15-
TintColor="LightSlateGray"
16-
TintOpacity="0.6"/>
17-
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
18-
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
13+
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" FallbackColor="#eaeaea" TintColor="LightSlateGray" TintOpacity="0.6"/>
14+
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" FallbackColor="#eaeaea" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White"/>
15+
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
16+
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
17+
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
18+
1919
</ResourceDictionary>
2020
<ResourceDictionary x:Key="Light">
21-
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
22-
BackgroundSource="Backdrop"
23-
TintColor="LightSlateGray"
24-
TintOpacity="0.6"/>
25-
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
26-
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
21+
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" FallbackColor="#eaeaea" BackgroundSource="Backdrop" TintColor="LightSlateGray" TintOpacity="0.6"/>
22+
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="#eaeaea"/>
23+
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
24+
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
25+
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
2726
</ResourceDictionary>
2827
<ResourceDictionary x:Key="Dark">
29-
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
30-
BackgroundSource="Backdrop"
31-
TintColor="Black"
32-
TintOpacity="0.6"/>
33-
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="Black" FallbackColor="#FF494949"/>
34-
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black" FallbackColor="#FF494949"/>
28+
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" TintColor="Black" TintOpacity="0.6"/>
29+
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="Black"/>
30+
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black"/>
31+
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#191919"/>
32+
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black"/>
33+
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="Black"/>
3534
</ResourceDictionary>
3635
<ResourceDictionary x:Key="HighContrast">
3736
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->

‎Files UWP/App.xaml.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Threading;
55
using Windows.ApplicationModel;
66
using Windows.ApplicationModel.Activation;
7+
using Windows.Storage;
78
using Windows.UI;
89
using Windows.UI.Xaml;
910
using Windows.UI.Xaml.Controls;
@@ -55,6 +56,8 @@ public App()
5556

5657
this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;
5758
Debug.WriteLine("!!Requested Theme!!" + RequestedTheme.ToString());
59+
60+
5861
}
5962
public static Filesystem.ItemViewModel ViewModel = new Filesystem.ItemViewModel();
6063
public static DisplayedPathText PathText { get; set; } = new DisplayedPathText();

‎Files UWP/Assets/PathbarTeachingTipVisual.gif‎

63.4 KB
Loading

‎Files UWP/ClassicMode.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public ClassicMode()
2222
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
2323
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
2424
ClassicView = ClassicModePage;
25-
App.ViewModel.MemoryFriendlyGetItemsAsync(@"C:\", ClassicView);
25+
App.ViewModel.AddItemsToCollectionAsync(@"C:\", ClassicView);
2626
}
2727

2828

‎Files UWP/FilesUWP.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AssemblyName>Files</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18342.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -163,6 +163,7 @@
163163
<Content Include="Assets\Cards\Gradients\Orange.png" />
164164
<Content Include="Assets\Cards\Gradients\Pink.png" />
165165
<Content Include="Assets\Cards\Gradients\Red.png" />
166+
<Content Include="Assets\PathbarTeachingTipVisual.gif" />
166167
<Content Include="Assets\FilesDrive.jpg" />
167168
<Content Include="Assets\FilesHome.jpg" />
168169
<Content Include="Assets\LargeTile.scale-100.png" />
@@ -261,6 +262,9 @@
261262
</Page>
262263
</ItemGroup>
263264
<ItemGroup>
265+
<PackageReference Include="ByteSize">
266+
<Version>1.3.0</Version>
267+
</PackageReference>
264268
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
265269
<Version>6.1.9</Version>
266270
</PackageReference>
@@ -283,14 +287,14 @@
283287
<Version>5.1.0</Version>
284288
</PackageReference>
285289
<PackageReference Include="Microsoft.UI.Xaml">
286-
<Version>2.1.190131001-prerelease</Version>
290+
<Version>2.1.190218001-prerelease</Version>
287291
</PackageReference>
288292
</ItemGroup>
289293
<ItemGroup>
290294
<None Include="Files_TemporaryKey.pfx" />
291295
</ItemGroup>
292296
<ItemGroup>
293-
<SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
297+
<SDKReference Include="WindowsDesktop, Version=10.0.18342.0">
294298
<Name>Windows Desktop Extensions for the UWP</Name>
295299
</SDKReference>
296300
</ItemGroup>

0 commit comments

Comments
 (0)