Skip to content

Commit 2781c34

Browse files
committed
Fixed last minute bugs...
1 parent 71f3aac commit 2781c34

File tree

13 files changed

+76
-18
lines changed

13 files changed

+76
-18
lines changed

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BladeControl/BladePage.xaml.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@
1010
// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE.
1111
// ******************************************************************
1212

13-
using Windows.UI.Xaml.Controls;
14-
1513
namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
1614
{
1715
/// <summary>
1816
/// An page that shows how to use the Blade Control
1917
/// </summary>
20-
public sealed partial class BladePage : Page
18+
public sealed partial class BladePage
2119
{
2220
public BladePage()
2321
{

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Facebook Service/FacebookPage.xaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages"
99
mc:Ignorable="d">
1010
<Page.Resources>
11-
12-
<local:FacebookPhotoTemplateSelector x:Key="facebookPhotoTemplateSelector" FacebookAlbumTemplate="{StaticResource FacebookAlbumSchemaTemplate}" FacebookPhotoTemplate="{StaticResource FacebookPhotoSchemaTemplate}" />
13-
1411
<DataTemplate x:Key="FacebookPostSchemaTemplate" x:DataType="facebook:FacebookPost">
1512
<Border Background="White" BorderBrush="#FFCCCCCC" BorderThickness="1" Margin="24,0,24,12">
1613
<Grid>
@@ -54,6 +51,9 @@
5451
</Border>
5552
</DataTemplate>
5653

54+
<local:FacebookPhotoTemplateSelector x:Key="facebookPhotoTemplateSelector"
55+
FacebookAlbumTemplate="{StaticResource FacebookAlbumSchemaTemplate}"
56+
FacebookPhotoTemplate="{StaticResource FacebookPhotoSchemaTemplate}" />
5757
</Page.Resources>
5858

5959
<Grid Background="{StaticResource Brush-Grey-05}" MaxWidth="800">
@@ -97,7 +97,9 @@
9797

9898
<StackPanel x:Name="CredentialsBox" Orientation="Vertical" Margin="24" Grid.Row="1">
9999
<TextBox Header="App ID" x:Name="AppIDText" Margin="0,0,0,12"/>
100-
<HyperlinkButton Content="Show me how to get this ID" NavigateUri="https://developer.microsoft.com/en-us/windows/uwp-community-toolkit/services/facebook" Margin="0,0,0,15"></HyperlinkButton>
100+
<HyperlinkButton Content="Show me how to get this ID"
101+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/services/Facebook/"
102+
Margin="0,0,0,15"></HyperlinkButton>
101103
<StackPanel Orientation="Horizontal">
102104
<ComboBox x:Name="QueryType" Header="Type:"></ComboBox>
103105
<Button Content="Connect" x:Name="ConnectButton" Click="ConnectButton_OnClick" Margin="10,0,0,0" VerticalAlignment="Bottom"></Button>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GridSplitter/GridSplitter.bind

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
Width="11"
9494
Background="{StaticResource Brush-Grey-04}"
9595
GripperCursor="@[GripperCursor:Enum:GripperCursorType.Default]"
96-
HorizontalAlignment="@[HorizontalAlignment:Enum:HorizontalAlignment.Left]"
9796
Grid.Column="@[Column:Slider:1:0-2]"
9897
ResizeDirection="@[ResizeDirection:Enum:GridResizeDirection.Auto]"
9998
ResizeBehavior="@[ResizeBehavior:Enum:GridResizeBehavior.BasedOnAlignment]"

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GridSplitter/GridSplitterPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
Width="11"
115115
GripperCursor="{Binding GripperCursor.Value,Mode=TwoWay}"
116116
Background="{StaticResource Brush-Grey-04}"
117-
HorizontalAlignment="{Binding HorizontalAlignment.Value,Mode=TwoWay}"
117+
HorizontalAlignment="Left"
118118
Grid.Column="{Binding Column.Value}"
119119
GripperForeground="White"
120120
ResizeDirection="{Binding ResizeDirection.Value,Mode=TwoWay}"

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Helpers/HelpersPage.xaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,22 @@
1212
<TextBlock Margin="0,20,20,0">
1313
We will soon provide more samples for helpers.
1414
</TextBlock>
15-
<HyperlinkButton Content="Click here to go to helpers documentation"
16-
NavigateUri="https://developer.microsoft.com/en-us/windows/uwp-community-toolkit/codehelpers"></HyperlinkButton>
15+
<HyperlinkButton Content="Colors"
16+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/Colors/"/>
17+
<HyperlinkButton Content="ConnectionHelper"
18+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/ConnectionHelper/"/>
19+
<HyperlinkButton Content="Converters"
20+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/Converters/"/>
21+
<HyperlinkButton Content="HyperlinkExtensions"
22+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/HyperlinkExtensions/"/>
23+
<HyperlinkButton Content="StorageFileHelper"
24+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/StorageFileHelper/"/>
25+
<HyperlinkButton Content="Streams"
26+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/Streams/"/>
27+
<HyperlinkButton Content="VisualTreeExtensions"
28+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/VisualTreeExtensions/"/>
29+
<HyperlinkButton Content="WeakEventListener"
30+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/helpers/WeakEventListener/"/>
1731
</StackPanel>
1832
</Grid>
1933
</Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LinkedIn Service/LinkedInPage.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
</Grid>
5252

5353
<StackPanel x:Name="CredentialsBox" Orientation="Vertical" Margin="24" Grid.Row="1">
54-
<HyperlinkButton Content="Show me how to get these values" NavigateUri="https://developer.microsoft.com/en-us/windows/uwp-community-toolkit/services/linkedin" Margin="0,0,0,15"/>
54+
<HyperlinkButton Content="Show me how to get these values"
55+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/services/Linkedin/"
56+
Margin="0,0,0,15"/>
5557
<TextBox Header="Client Id:" x:Name="ClientId" Margin="0,0,0,12"/>
5658
<TextBox Header="Client Secret:" x:Name="ClientSecret" Margin="0,0,0,12"/>
5759
<TextBox Header="Callback URI:" x:Name="CallbackUri" Margin="0,0,0,12"/>
@@ -60,7 +62,7 @@
6062
</Grid>
6163

6264
<!-- Share area -->
63-
<Grid Grid.Row="1" x:Name="ShareBox">
65+
<Grid Grid.Row="1" x:Name="ShareBox" Visibility="Collapsed">
6466
<Grid.RowDefinitions>
6567
<RowDefinition Height="Auto"/>
6668
<RowDefinition Height="Auto"/>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LinkedIn Service/LinkedInPage.xaml.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ public LinkedInPage()
3030

3131
private async void ConnectButton_Click(object sender, RoutedEventArgs e)
3232
{
33+
if (!await Tools.CheckInternetConnectionAsync())
34+
{
35+
return;
36+
}
37+
38+
if (string.IsNullOrEmpty(ClientId.Text) || string.IsNullOrEmpty(ClientSecret.Text) || string.IsNullOrEmpty(CallbackUri.Text))
39+
{
40+
return;
41+
}
42+
3343
var oAuthTokens = new LinkedInOAuthTokens
3444
{
3545
ClientId = ClientId.Text,
@@ -47,6 +57,8 @@ private async void ConnectButton_Click(object sender, RoutedEventArgs e)
4757

4858
ProfileImage.DataContext = profile;
4959
ProfileImage.Visibility = Visibility.Visible;
60+
61+
ShareBox.Visibility = Visibility.Visible;
5062
}
5163
}
5264

@@ -57,6 +69,11 @@ private async void ShareButton_Click(object sender, RoutedEventArgs e)
5769
return;
5870
}
5971

72+
if (string.IsNullOrEmpty(ShareText.Text))
73+
{
74+
return;
75+
}
76+
6077
var response = await LinkedInService.Instance.ShareActivityAsync(ShareText.Text);
6178

6279
var message = new MessageDialog("Share sent to LinkedIn");

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Microsoft Graph Service/MicrosoftGraphPage.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<TextBox Header="Client Id:"
8080
x:Name="ClientId"
8181
Margin="0,0,0,12"/>
82+
<HyperlinkButton Content="Show me how to get this ID"
83+
NavigateUri="http://uwpcommunitytoolkit.readthedocs.io/en/master/services/MicrosoftGraph/"
84+
Margin="0,0,0,15"/>
8285
<Button Content="Sign in"
8386
x:Name="ConnectButton"
8487
Click="ConnectButton_Click"

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Microsoft Graph Service/MicrosoftGraphPage.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ private async void ConnectButton_Click(object sender, RoutedEventArgs e)
4545
return;
4646
}
4747

48+
if (string.IsNullOrEmpty(ClientId.Text))
49+
{
50+
return;
51+
}
52+
4853
// Initialize the service
4954
MicrosoftGraphService.Instance.Initialize(ClientId.Text);
5055

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Object Storage/ObjectStoragePage.xaml.cs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
1616
{
1717
public sealed partial class ObjectStoragePage
1818
{
19-
private IObjectStorageHelper localStorageHelper = new LocalObjectStorageHelper();
20-
private IObjectStorageHelper roamingStorageHelper = new RoamingObjectStorageHelper();
19+
private readonly IObjectStorageHelper localStorageHelper = new LocalObjectStorageHelper();
20+
private readonly IObjectStorageHelper roamingStorageHelper = new RoamingObjectStorageHelper();
2121

2222
public ObjectStoragePage()
2323
{
@@ -26,6 +26,11 @@ public ObjectStoragePage()
2626

2727
private void ReadButton_Click(object sender, RoutedEventArgs e)
2828
{
29+
if (string.IsNullOrEmpty(KeyTextBox.Text))
30+
{
31+
return;
32+
}
33+
2934
if (StorageModeToggle.IsOn)
3035
{
3136
// Read from roaming storage
@@ -46,6 +51,16 @@ private void ReadButton_Click(object sender, RoutedEventArgs e)
4651

4752
private void SaveButton_Click(object sender, RoutedEventArgs e)
4853
{
54+
if (string.IsNullOrEmpty(KeyTextBox.Text))
55+
{
56+
return;
57+
}
58+
59+
if (string.IsNullOrEmpty(ContentTextBox.Text))
60+
{
61+
return;
62+
}
63+
4964
if (StorageModeToggle.IsOn)
5065
{
5166
// Save into roaming storage

0 commit comments

Comments
 (0)