Skip to content

Commit ba85228

Browse files
lukeblevinslukeblevins
committed
Implement Friendly Dates
1 parent fc28a53 commit ba85228

File tree

7 files changed

+371
-193
lines changed

7 files changed

+371
-193
lines changed

‎Files UWP/FilesUWP.csproj

Lines changed: 3 additions & 3 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.17763.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18342.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.18342.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -294,7 +294,7 @@
294294
<None Include="Files_TemporaryKey.pfx" />
295295
</ItemGroup>
296296
<ItemGroup>
297-
<SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
297+
<SDKReference Include="WindowsDesktop, Version=10.0.18342.0">
298298
<Name>Windows Desktop Extensions for the UWP</Name>
299299
</SDKReference>
300300
</ItemGroup>

‎Files UWP/Filesystem/ItemViewModel.cs

Lines changed: 323 additions & 175 deletions
Large diffs are not rendered by default.

‎Files UWP/MainPage.xaml.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ public MainPage()
6565
{
6666
titleBar.ButtonForegroundColor = Colors.Black;
6767
}
68+
69+
6870
}
6971

7072
public async void PopulateNavViewWithExternalDrives()
71-
{
73+
{
7274
var knownRemDevices = new ObservableCollection<string>();
7375
foreach (var f in await KnownFolders.RemovableDevices.GetFoldersAsync())
7476
{

‎Files UWP/PhotoAlbum.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,10 @@
520520
<RowDefinition Height="75*"/>
521521
<RowDefinition Height="25*"/>
522522
</Grid.RowDefinitions>
523-
<Grid Grid.Row="0" Name="Picture" Visibility="{Binding FileIconVis}">
524-
<Image Stretch="Uniform" Source="{Binding FileImg}"/>
523+
<Grid Padding="2" Grid.Row="0" Name="Picture" Visibility="{Binding FileIconVis}">
524+
<controls:DropShadowPanel OffsetY="5">
525+
<Image Stretch="Uniform" Source="{Binding FileImg}"/>
526+
</controls:DropShadowPanel>
525527
</Grid>
526528

527529
<Grid Grid.Row="0" Name="Album" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Visibility="{Binding FolderImg}">

‎Files.sln

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,31 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilesUWP", "Files UWP\Files
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14+
Debug|Any CPU = Debug|Any CPU
1415
Debug|ARM = Debug|ARM
1516
Debug|x64 = Debug|x64
1617
Debug|x86 = Debug|x86
18+
Release|Any CPU = Release|Any CPU
1719
Release|ARM = Release|ARM
1820
Release|x64 = Release|x64
1921
Release|x86 = Release|x86
2022
EndGlobalSection
2123
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2226
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|ARM.ActiveCfg = Debug|Any CPU
23-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x64.ActiveCfg = Debug|Any CPU
24-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x64.Build.0 = Debug|Any CPU
25-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x86.ActiveCfg = Debug|Any CPU
26-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x86.Build.0 = Debug|Any CPU
27+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x64.ActiveCfg = Debug|x64
28+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x64.Build.0 = Debug|x64
29+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x86.ActiveCfg = Debug|x86
30+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Debug|x86.Build.0 = Debug|x86
31+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|Any CPU.Build.0 = Release|Any CPU
2733
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|ARM.ActiveCfg = Release|Any CPU
28-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x64.ActiveCfg = Release|Any CPU
29-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x64.Build.0 = Release|Any CPU
30-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x86.ActiveCfg = Release|Any CPU
31-
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x86.Build.0 = Release|Any CPU
34+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x64.ActiveCfg = Release|x64
35+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x64.Build.0 = Release|x64
36+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x86.ActiveCfg = Release|x86
37+
{53CB570B-3DB0-45B0-A2FD-B40874EDAA9D}.Release|x86.Build.0 = Release|x86
38+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|Any CPU.ActiveCfg = Debug|x86
3239
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.ActiveCfg = Debug|ARM
3340
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.Build.0 = Debug|ARM
3441
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -38,6 +45,7 @@ Global
3845
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x86.ActiveCfg = Debug|x86
3946
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x86.Build.0 = Debug|x86
4047
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Debug|x86.Deploy.0 = Debug|x86
48+
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|Any CPU.ActiveCfg = Release|x86
4149
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM.ActiveCfg = Release|ARM
4250
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM.Build.0 = Release|ARM
4351
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|ARM.Deploy.0 = Release|ARM
@@ -47,12 +55,14 @@ Global
4755
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x86.ActiveCfg = Release|x86
4856
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x86.Build.0 = Release|x86
4957
{3B15596C-3DB9-4B58-B4C8-442D06A8C130}.Release|x86.Deploy.0 = Release|x86
58+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|Any CPU.ActiveCfg = Debug|x86
5059
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM.ActiveCfg = Debug|ARM
5160
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|ARM.Build.0 = Debug|ARM
5261
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x64.ActiveCfg = Debug|x64
5362
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x64.Build.0 = Debug|x64
5463
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x86.ActiveCfg = Debug|x86
5564
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Debug|x86.Build.0 = Debug|x86
65+
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|Any CPU.ActiveCfg = Release|x86
5666
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM.ActiveCfg = Release|ARM
5767
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|ARM.Build.0 = Release|ARM
5868
{64C30C4E-A69A-411C-9F78-776E7AAD583C}.Release|x64.ActiveCfg = Release|x64

‎FilesUwp.Package/FilesUwp.Package.wapproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
3636
<PropertyGroup>
3737
<ProjectGuid>3b15596c-3db9-4b58-b4c8-442d06a8c130</ProjectGuid>
38-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
39-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
38+
<TargetPlatformVersion>10.0.18342.0</TargetPlatformVersion>
39+
<TargetPlatformMinVersion>10.0.18342.0</TargetPlatformMinVersion>
4040
<DefaultLanguage>en-US</DefaultLanguage>
4141
<PackageCertificateKeyFile>FilesUwp.Package_TemporaryKey.pfx</PackageCertificateKeyFile>
4242
<EntryPointProjectUniqueName>..\Files UWP\FilesUWP.csproj</EntryPointProjectUniqueName>

‎Launcher/Launcher.csproj

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
18+
<PlatformTarget>x64</PlatformTarget>
1919
<DebugSymbols>true</DebugSymbols>
2020
<DebugType>full</DebugType>
2121
<Optimize>false</Optimize>
@@ -25,14 +25,30 @@
2525
<WarningLevel>4</WarningLevel>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
28+
<PlatformTarget>x64</PlatformTarget>
2929
<DebugType>pdbonly</DebugType>
3030
<Optimize>true</Optimize>
3131
<OutputPath>bin\Release\</OutputPath>
3232
<DefineConstants>TRACE</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
37+
<PlatformTarget>x64</PlatformTarget>
38+
<OutputPath>bin\x64\Debug\</OutputPath>
39+
</PropertyGroup>
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
41+
<PlatformTarget>x64</PlatformTarget>
42+
<OutputPath>bin\x64\Release\</OutputPath>
43+
</PropertyGroup>
44+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
45+
<PlatformTarget>x86</PlatformTarget>
46+
<OutputPath>bin\x86\Debug\</OutputPath>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
49+
<PlatformTarget>x86</PlatformTarget>
50+
<OutputPath>bin\x86\Release\</OutputPath>
51+
</PropertyGroup>
3652
<ItemGroup>
3753
<Reference Include="System" />
3854
<Reference Include="System.Core" />

0 commit comments

Comments
 (0)