Skip to content

Commit 2aeab09

Browse files
author
Yair Aichenbaum
committed
Merge branch 'develop'
2 parents f2e0af0 + 0785fff commit 2aeab09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+5587
-2616
lines changed

‎Files.Package/Files.Package.wapproj

-4
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@
149149
<Content Include="Assets\Wide310x150Logo.scale-150.png" />
150150
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
151151
<Content Include="Assets\Wide310x150Logo.scale-400.png" />
152-
<None Include="Files.Package_TemporaryKey.pfx" />
153-
<None Include="FilesUwp.Package_StoreKey.pfx" />
154-
<None Include="Package.StoreAssociation.xml" />
155-
<None Include="FilesUwp.Package_TemporaryKey.pfx" />
156152
</ItemGroup>
157153
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
158154
</Project>

‎Files.Package/Package.appxmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
3-
<Identity Name="FilesUWP" Publisher="CN=Luke Blevins" Version="0.7.2.0" />
3+
<Identity Name="FilesUWP" Publisher="CN=Luke Blevins" Version="0.7.3.0" />
44
<Properties>
55
<DisplayName>Files UWP - Preview</DisplayName>
66
<PublisherDisplayName>FilesUWP</PublisherDisplayName>

‎Files/App.xaml

+49-31
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,71 @@
66
<Application.Resources>
77
<ResourceDictionary>
88
<ResourceDictionary.MergedDictionaries>
9-
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
10-
<ResourceDictionary Source="/ResourceDictionaries/ToolbarButtonStyle.xaml"/>
9+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
10+
<ResourceDictionary Source="/ResourceDictionaries/ToolbarButtonStyle.xaml" />
1111
<ResourceDictionary>
1212
<ResourceDictionary.ThemeDictionaries>
1313
<ResourceDictionary x:Key="Default">
14-
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="White"/>
15-
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="White"/>
16-
<AcrylicBrush x:Key="BackgroundAcrylicBrush" FallbackColor="{StaticResource SystemListLowColor}" BackgroundSource="HostBackdrop" TintOpacity="0.7" Windows10version1903:TintLuminosityOpacity="0.9" TintColor="White"/>
17-
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="White"/>
18-
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor"/>
14+
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="White" />
15+
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="White" />
16+
<AcrylicBrush
17+
x:Key="BackgroundAcrylicBrush"
18+
Windows10version1903:TintLuminosityOpacity="0.9"
19+
BackgroundSource="HostBackdrop"
20+
FallbackColor="{StaticResource SystemListLowColor}"
21+
TintColor="White"
22+
TintOpacity="0.9" />
23+
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="White" />
24+
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor" />
1925
</ResourceDictionary>
2026
<ResourceDictionary x:Key="Light">
21-
<AcrylicBrush x:Key="BackgroundAcrylicBrush" FallbackColor="{StaticResource SystemListLowColor}" BackgroundSource="HostBackdrop" TintOpacity="0.7" Windows10version1903:TintLuminosityOpacity="0.9" TintColor="White"/>
22-
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="White"/>
23-
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="White"/>
24-
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White"/>
25-
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef"/>
26-
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef"/>
27-
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="DarkGray"/>
28-
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="White"/>
29-
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor"/>
27+
<AcrylicBrush
28+
x:Key="BackgroundAcrylicBrush"
29+
Windows10version1903:TintLuminosityOpacity="0.9"
30+
BackgroundSource="HostBackdrop"
31+
FallbackColor="{StaticResource SystemChromeWhiteColor}"
32+
TintColor="White"
33+
TintOpacity="0.9" />
34+
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="White" />
35+
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="White" />
36+
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="White" />
37+
<SolidColorBrush x:Key="YourHomeCardBackgroundColor" Color="#f3f1ef" />
38+
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="#f3f1ef" />
39+
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="DarkGray" />
40+
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="White" />
41+
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor" />
3042
</ResourceDictionary>
3143
<ResourceDictionary x:Key="Dark">
32-
<AcrylicBrush x:Key="BackgroundAcrylicBrush" FallbackColor="{StaticResource SystemListLowColor}" BackgroundSource="HostBackdrop" TintOpacity="0.7" Windows10version1903:TintLuminosityOpacity="0.9" TintColor="Black"/>
33-
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="#191919"/>
34-
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="#191919"/>
35-
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#191919"/>
36-
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black"/>
37-
<StaticResource x:Key="YourHomeCardBackgroundColor" ResourceKey="TextControlBackground"/>
38-
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="White"/>
39-
<SolidColorBrush x:Key="TabViewBackground" Color="Black"/>
40-
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="#191919"/>
44+
<AcrylicBrush
45+
x:Key="BackgroundAcrylicBrush"
46+
Windows10version1903:TintLuminosityOpacity="0.9"
47+
BackgroundSource="HostBackdrop"
48+
FallbackColor="{StaticResource SystemListLowColor}"
49+
TintColor="Black"
50+
TintOpacity="0.7" />
51+
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="#191919" />
52+
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="#191919" />
53+
<SolidColorBrush x:Key="ApplicationPageBackgroundThemeBrush" Color="#191919" />
54+
<SolidColorBrush x:Key="UnmodifiedSystemPageColor" Color="Black" />
55+
<StaticResource x:Key="YourHomeCardBackgroundColor" ResourceKey="TextControlBackground" />
56+
<SolidColorBrush x:Key="YourHomeCardBorderColor" Color="White" />
57+
<SolidColorBrush x:Key="TabViewBackground" Color="Black" />
58+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="#191919" />
4159
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="#191919" />
42-
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="#191919"/>
43-
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="#FF363636"/>
60+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="#191919" />
61+
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="#FF363636" />
4462
<!--<SolidColorBrush x:Key="TextControlBorderBrush" Color="#FF363636"/>-->
45-
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="#131313"/>
46-
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor"/>
63+
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="#131313" />
64+
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor" />
4765
</ResourceDictionary>
4866
<ResourceDictionary x:Key="HighContrast">
49-
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->
67+
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->
5068
</ResourceDictionary>
5169
</ResourceDictionary.ThemeDictionaries>
5270
</ResourceDictionary>
5371
</ResourceDictionary.MergedDictionaries>
5472
</ResourceDictionary>
5573

5674
</Application.Resources>
57-
75+
5876
</Application>

‎Files/App.xaml.cs

+41-31
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
1-
using Files.Interacts;
1+
using Files.CommandLine;
2+
using Files.Controls;
3+
using Files.Filesystem;
4+
using Files.Interacts;
5+
using Files.View_Models;
6+
using Microsoft.AppCenter;
7+
using Microsoft.AppCenter.Analytics;
8+
using Microsoft.AppCenter.Crashes;
9+
using Microsoft.Toolkit.Uwp.Helpers;
10+
using NLog;
211
using System;
312
using System.Collections.Generic;
4-
using System.Diagnostics;
13+
using System.Collections.ObjectModel;
14+
using System.Linq;
515
using Windows.ApplicationModel;
616
using Windows.ApplicationModel.Activation;
717
using Windows.ApplicationModel.DataTransfer;
818
using Windows.Storage;
9-
using Windows.UI;
19+
using Windows.UI.Core;
1020
using Windows.UI.Xaml;
1121
using Windows.UI.Xaml.Controls;
22+
using Windows.UI.Xaml.Controls.Primitives;
23+
using Windows.UI.Xaml.Media;
1224
using Windows.UI.Xaml.Media.Animation;
1325
using Windows.UI.Xaml.Navigation;
14-
using Microsoft.AppCenter;
15-
using Microsoft.AppCenter.Analytics;
16-
using Microsoft.AppCenter.Crashes;
17-
using Windows.UI.Xaml.Media;
18-
using Files.Filesystem;
19-
using System.IO;
20-
using System.Linq;
21-
using System.Collections.ObjectModel;
22-
using Windows.UI.Core;
23-
using Windows.UI.Xaml.Controls.Primitives;
24-
using Windows.System;
25-
using Files.CommandLine;
26-
using Files.View_Models;
27-
using Files.Controls;
28-
using NLog;
2926

3027
namespace Files
3128
{
3229
sealed partial class App : Application
3330
{
34-
31+
3532
private static IShellPage currentInstance;
3633
public static IShellPage CurrentInstance
3734
{
@@ -41,9 +38,9 @@ public static IShellPage CurrentInstance
4138
}
4239
set
4340
{
44-
if(value != currentInstance && value != null)
41+
if (value != currentInstance && value != null)
4542
{
46-
currentInstance = value;
43+
currentInstance = value;
4744
}
4845
}
4946
}
@@ -62,7 +59,7 @@ public static IShellPage CurrentInstance
6259

6360
public App()
6461
{
65-
this.InitializeComponent();
62+
this.InitializeComponent();
6663
this.Suspending += OnSuspending;
6764

6865
// Initialize NLog
@@ -87,10 +84,10 @@ public App()
8784

8885
private void RegisterUncaughtExceptionLogger()
8986
{
90-
UnhandledException += (sender, args) =>
91-
{
92-
Logger.Error(args.Exception, args.Message);
93-
};
87+
UnhandledException += (sender, args) =>
88+
{
89+
Logger.Error(args.Exception, args.Message);
90+
};
9491
}
9592

9693
private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs args)
@@ -153,15 +150,13 @@ public static void Clipboard_ContentChanged(object sender, object e)
153150

154151
public static Windows.UI.Xaml.UnhandledExceptionEventArgs exceptionInfo { get; set; }
155152
public static string exceptionStackTrace { get; set; }
156-
157-
158153

159154
private async void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
160155
{
161156
e.Handled = true;
162157
exceptionInfo = e;
163158
exceptionStackTrace = e.Exception.StackTrace;
164-
await exceptionDialog.ShowAsync(ContentDialogPlacement.Popup);
159+
await exceptionDialog.ShowAsync(ContentDialogPlacement.Popup);
165160
}
166161

167162
public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
@@ -170,7 +165,7 @@ public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
170165
List<ContentDialog> dialogs = new List<ContentDialog>();
171166
List<ContentDialog> openDialogs = new List<ContentDialog>();
172167
Interaction.FindChildren<ContentDialog>(dialogs, Window.Current.Content.XamlRoot.Content as DependencyObject);
173-
foreach(var dialog in dialogs)
168+
foreach (var dialog in dialogs)
174169
{
175170
var popups = new List<Popup>();
176171
Interaction.FindChildren<Popup>(popups, dialog);
@@ -192,9 +187,24 @@ public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
192187
/// <param name="e">Details about the launch request and process.</param>
193188
protected override void OnLaunched(LaunchActivatedEventArgs e)
194189
{
190+
//start tracking app usage
191+
SystemInformation.TrackAppUse(e);
192+
193+
if (SystemInformation.IsAppUpdated)
194+
{
195+
var dialog = new ContentDialog()
196+
{
197+
Title = "What's new in v0.7.3",
198+
Content = "• We are starting to test a brand new design, this is still in the early stages so make sure to send us any feedback on GitHub. \n• We fixed an issue where a swipe gesture was having unexpected side effects. \n• We started work on layout modes, it is not fully functional yet and we will improve it in future updates.",
199+
PrimaryButtonText = "Lets go!"
200+
};
201+
202+
dialog.ShowAsync();
203+
}
204+
195205
Logger.Info("App launched");
196206

197-
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
207+
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
198208

199209
Frame rootFrame = Window.Current.Content as Frame;
200210

0 commit comments

Comments
 (0)