Skip to content

Commit 1eecf56

Browse files
committed
Improved OOBE experience
1 parent 6c539f9 commit 1eecf56

17 files changed

+78
-41
lines changed
683 KB
Loading
335 KB
Loading
626 KB
Loading
1.16 MB
Loading
-63.5 KB
Loading
-28.5 KB
Loading

ClipboardCanvas/Helpers/WebHelpers.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public static async Task<string> FormatImageUrl(string rawImageUrl, string url)
214214

215215
if (!rawImageUrl.Contains("http"))
216216
{
217-
string baseUrl;
217+
string baseUrl = null;
218218
if (rawImageUrl.EndsWith(".ico"))
219219
{
220220
string http;
@@ -226,14 +226,19 @@ public static async Task<string> FormatImageUrl(string rawImageUrl, string url)
226226
{
227227
http = "http://";
228228
}
229-
230-
Uri rawImageUri = new Uri(rawImageUrl);
231-
if (!string.IsNullOrEmpty(rawImageUri.Host))
229+
230+
try
232231
{
233-
baseUrl = $"{http}{rawImageUri.Host}";
234-
rawImageUrl = rawImageUrl.Replace(rawImageUri.Host, string.Empty);
232+
Uri rawImageUri = new Uri(rawImageUrl);
233+
if (!string.IsNullOrEmpty(rawImageUri.Host))
234+
{
235+
baseUrl = $"{http}{rawImageUri.Host}";
236+
rawImageUrl = rawImageUrl.Replace(rawImageUri.Host, string.Empty);
237+
}
235238
}
236-
else
239+
catch { }
240+
241+
if (string.IsNullOrEmpty(baseUrl))
237242
{
238243
Uri uri = new Uri(url);
239244
baseUrl = $"{http}{uri.Host}";
@@ -271,7 +276,8 @@ public static async Task<bool> CheckImageUrlIfExists(string imageUrl)
271276
request.Accept = "*/*";
272277
request.Proxy.Credentials = CredentialCache.DefaultCredentials;
273278

274-
await request.GetResponseAsync();
279+
var response = await request.GetResponseAsync();
280+
response.Dispose();
275281

276282
return true;
277283
});

ClipboardCanvas/MainPage.xaml.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
using ClipboardCanvas.Helpers;
2-
using System.ComponentModel;
1+
using System.ComponentModel;
32
using System.Runtime.CompilerServices;
43
using Windows.ApplicationModel.Core;
54
using Windows.UI.ViewManagement;
65
using Windows.UI.Xaml;
76
using Windows.UI.Xaml.Controls;
87

8+
using ClipboardCanvas.Helpers;
9+
910
// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
1011

1112
namespace ClipboardCanvas
@@ -15,12 +16,12 @@ namespace ClipboardCanvas
1516
/// </summary>
1617
public sealed partial class MainPage : Page, INotifyPropertyChanged
1718
{
19+
public static MainPage Instance => (MainPage)((Frame)Window.Current.Content).Content;
20+
1821
public static ApplicationViewTitleBar TitleBar { get; private set; }
1922

2023
public static CoreApplicationViewTitleBar CoreTitleBar { get; private set; }
2124

22-
public static MainPage Instance => (MainPage)((Frame)Window.Current.Content).Content;
23-
2425
private bool _IntroductionPanelLoad;
2526
public bool IntroductionPanelLoad
2627
{

ClipboardCanvas/Pages/SettingsPages/SettingsAboutPage.xaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
Text="About" />
2828

2929
<StackPanel Spacing="4">
30+
<StackPanel.ChildrenTransitions>
31+
<TransitionCollection>
32+
<ReorderThemeTransition />
33+
</TransitionCollection>
34+
</StackPanel.ChildrenTransitions>
35+
3036
<uc:SettingBlockControl Description="Clipboard Canvas">
3137
<uc:SettingBlockControl.Icon>
3238
<muxc:ImageIcon

ClipboardCanvas/UserControls/OOBE/IntroductionScreenGenericPreview.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
<Image
2121
Grid.Column="0"
22+
HorizontalAlignment="Center"
2223
Source="{x:Bind PreviewImage, Mode=OneWay}"
23-
Stretch="Uniform" />
24+
Stretch="UniformToFill" />
2425

2526
<!-- Content -->
2627
<Grid

0 commit comments

Comments
 (0)