Skip to content

Commit

Permalink
Merge pull request #73 from duke7553/testing
Browse files Browse the repository at this point in the history 
0.4.9 Changes Roundup From testing
  • Loading branch information
@lukeblevins
lukeblevins authored Mar 3, 2019
2 parents e6172ac + 45dc559 commit 256a881
Show file tree
Hide file tree
Showing 28 changed files with 1,517 additions and 569 deletions.
6 changes: 3 additions & 3 deletions Files UWP/AddItem.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
if (userInput != null)
{
await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
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) });
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) });
}
}
else if ((e.ClickedItem as AddListItem).Header == "Text Document")
Expand All @@ -53,7 +53,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
if (userInput != null)
{
await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
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" });
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" });
}
}
else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
Expand All @@ -63,7 +63,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
if (userInput != null)
{
await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
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" });
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" });

}
}
Expand Down
35 changes: 17 additions & 18 deletions Files UWP/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,27 @@
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default">
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
BackgroundSource="Backdrop"
TintColor="LightSlateGray"
TintOpacity="0.6"/>
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" FallbackColor="#eaeaea" TintColor="LightSlateGray" TintOpacity="0.6"/>
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" FallbackColor="#eaeaea" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White"/>
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>

</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
BackgroundSource="Backdrop"
TintColor="LightSlateGray"
TintOpacity="0.6"/>
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" FallbackColor="#eaeaea" BackgroundSource="Backdrop" TintColor="LightSlateGray" TintOpacity="0.6"/>
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="#eaeaea"/>
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="#eaeaea"/>
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f4f4f4"/>
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
BackgroundSource="Backdrop"
TintColor="Black"
TintOpacity="0.6"/>
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="Black" FallbackColor="#FF494949"/>
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black" FallbackColor="#FF494949"/>
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="Backdrop" TintColor="Black" TintOpacity="0.6"/>
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="Black"/>
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black"/>
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#191919"/>
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black"/>
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="Black"/>
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->
Expand Down
3 changes: 3 additions & 0 deletions Files UWP/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Threading;
using Windows.ApplicationModel;
using Windows.ApplicationModel.Activation;
using Windows.Storage;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
Expand Down Expand Up @@ -55,6 +56,8 @@ public App()

this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;
Debug.WriteLine("!!Requested Theme!!" + RequestedTheme.ToString());


}
public static Filesystem.ItemViewModel ViewModel = new Filesystem.ItemViewModel();
public static DisplayedPathText PathText { get; set; } = new DisplayedPathText();
Expand Down
Binary file added Files UWP/Assets/PathbarTeachingTipVisual.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Files UWP/ClassicMode.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public ClassicMode()
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
ClassicView = ClassicModePage;
App.ViewModel.MemoryFriendlyGetItemsAsync(@"C:\", ClassicView);
App.ViewModel.AddItemsToCollectionAsync(@"C:\", ClassicView);
}


Expand Down
12 changes: 8 additions & 4 deletions Files UWP/FilesUWP.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<AssemblyName>Files</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18342.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down Expand Up @@ -163,6 +163,7 @@
<Content Include="Assets\Cards\Gradients\Orange.png" />
<Content Include="Assets\Cards\Gradients\Pink.png" />
<Content Include="Assets\Cards\Gradients\Red.png" />
<Content Include="Assets\PathbarTeachingTipVisual.gif" />
<Content Include="Assets\FilesDrive.jpg" />
<Content Include="Assets\FilesHome.jpg" />
<Content Include="Assets\LargeTile.scale-100.png" />
Expand Down Expand Up @@ -261,6 +262,9 @@
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ByteSize">
<Version>1.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.1.9</Version>
</PackageReference>
Expand All @@ -283,14 +287,14 @@
<Version>5.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.1.190131001-prerelease</Version>
<Version>2.1.190218001-prerelease</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="Files_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
<SDKReference Include="WindowsDesktop, Version=10.0.18342.0">
<Name>Windows Desktop Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
Expand Down
Loading

0 comments on commit 256a881

Please sign in to comment.