Skip to content

Commit 62145a0

Browse files
committed
Revert "Removed TabView/TabViewItem, HeaderedTextBlock, LightBehavior/AnimationExtensions.Light, and some other smaller methods marked as Obsolete."
This reverts commit 274492b.
1 parent 97df594 commit 62145a0

Some content is hidden

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

48 files changed

+3201
-4
lines changed

Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,17 @@ public async Task<bool> LoginAsync()
154154
return false;
155155
}
156156

157+
/// <summary>
158+
/// Log user out of LinkedIn.
159+
/// </summary>
160+
[Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
161+
public void Logout()
162+
{
163+
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
164+
LogoutAsync();
165+
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
166+
}
167+
157168
/// <summary>
158169
/// Log user out of LinkedIn.
159170
/// </summary>

Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInService.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ public Task<LinkedInShareResponse> ShareActivityAsync(LinkedInShareRequest share
9292
return Provider.ShareDataAsync<LinkedInShareRequest, LinkedInShareResponse>(shareRequest);
9393
}
9494

95+
/// <summary>
96+
/// Log user out of LinkedIn.
97+
/// </summary>
98+
[Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
99+
public void Logout()
100+
{
101+
Provider.Logout();
102+
}
103+
95104
/// <summary>
96105
/// Log user out of LinkedIn.
97106
/// </summary>

Microsoft.Toolkit.Services/Services/Twitter/TwitterDataProvider.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,17 @@ public async Task<bool> LoginAsync()
273273
return false;
274274
}
275275

276+
/// <summary>
277+
/// Log user out of Twitter.
278+
/// </summary>
279+
[Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
280+
public void Logout()
281+
{
282+
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
283+
LogoutAsync();
284+
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
285+
}
286+
276287
/// <summary>
277288
/// Log user out of Twitter.
278289
/// </summary>

Microsoft.Toolkit.Services/Services/Twitter/TwitterService.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,15 @@ public Task<bool> LoginAsync()
400400
return Provider.LoginAsync();
401401
}
402402

403+
/// <summary>
404+
/// Log user out of Twitter.
405+
/// </summary>
406+
[Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
407+
public void Logout()
408+
{
409+
Provider.Logout();
410+
}
411+
403412
/// <summary>
404413
/// Log user out of Twitter.
405414
/// </summary>

Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,17 @@ public async Task<bool> LoginAsync()
163163
return false;
164164
}
165165

166+
/// <summary>
167+
/// Log user out of Weibo.
168+
/// </summary>
169+
[Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
170+
public void Logout()
171+
{
172+
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
173+
LogoutAsync();
174+
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
175+
}
176+
166177
/// <summary>
167178
/// Log user out of Weibo.
168179
/// </summary>

Microsoft.Toolkit.Services/Services/Weibo/WeiboService.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,15 @@ public Task<bool> LoginAsync()
183183
return Provider.LoginAsync();
184184
}
185185

186+
/// <summary>
187+
/// Log user out of Weibo.
188+
/// </summary>
189+
[Obsolete("Logout is deprecated, please use LogoutAsync instead.", true)]
190+
public void Logout()
191+
{
192+
Provider.Logout();
193+
}
194+
186195
/// <summary>
187196
/// Log user out of Weibo.
188197
/// </summary>

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
<Content Include="SamplePages\RemoteDeviceHelper\RemoteDeviceHelper.png" />
281281
<Content Include="SamplePages\ImageCropper\ImageCropper.png" />
282282
<Content Include="SamplePages\StaggeredLayout\StaggeredLayout.png" />
283+
<Content Include="SamplePages\TabView\TabView.png" />
283284
<Content Include="SamplePages\PeoplePicker\PeoplePicker.png" />
284285
<Content Include="SamplePages\PersonView\PersonView.png" />
285286
<Content Include="SamplePages\TokenizingTextBox\TokenizingTextBox.png" />
@@ -316,6 +317,7 @@
316317
<Content Include="SamplePages\AlignmentGrid\AlignmentGrid.png" />
317318
<Content Include="SamplePages\HeaderedContentControl\HeaderedContentControl.png" />
318319
<Content Include="SamplePages\HeaderedItemsControl\HeaderedItemsControl.png" />
320+
<Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlock.png" />
319321
<Content Include="SamplePages\ImageBlendBrush\ImageBlendBrush.png" />
320322
<Content Include="SamplePages\ImageCache\ImageCache.png" />
321323
<Content Include="SamplePages\ImageEx\ImageEx.png" />
@@ -324,6 +326,7 @@
324326
<Content Include="SamplePages\Incremental Loading Collection\icon.png" />
325327
<Content Include="SamplePages\LayoutTransformControl\LayoutTransformControl.png" />
326328
<Content Include="SamplePages\InfiniteCanvas\InfiniteCanvas.png" />
329+
<Content Include="SamplePages\Light\LightBehavior.png" />
327330
<Content Include="SamplePages\LinkedIn Service\LinkedInLogo.png" />
328331
<Content Include="Assets\Helpers.png" />
329332
<Content Include="SamplePages\LiveTile\LiveTile.png" />
@@ -364,6 +367,8 @@
364367
<Content Include="SamplePages\Twitter Service\TwitterLogo.png" />
365368
<Content Include="SamplePages\Twitter Service\TwitterCode.bind" />
366369
<Content Include="SamplePages\Twitter Service\icon.png" />
370+
<Content Include="SamplePages\Facebook Service\FacebookCode.bind" />
371+
<Content Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockCode.bind" />
367372
<Content Include="SamplePages\ViewExtensions\ViewExtensions.png" />
368373
<Content Include="SamplePages\ViewportBehavior\ViewportBehavior.png" />
369374
<Content Include="SamplePages\Visual Extensions\VisualExtensions.png" />
@@ -423,6 +428,8 @@
423428
<Content Include="SamplePages\Connected Animations\ConnectedAnimationsCode.bind" />
424429
<Content Include="SamplePages\Loading\LoadingCode.bind" />
425430
<Content Include="SamplePages\ReorderGridAnimation\ReorderGrid.bind" />
431+
<Content Include="SamplePages\Light\LightBehaviorCode.bind" />
432+
<Content Include="SamplePages\Light\LightBehaviorXaml.bind" />
426433
<Content Include="SamplePages\TextBoxMask\TextBoxMask.bind" />
427434
<Content Include="SamplePages\TileControl\TileControl.bind">
428435
<SubType>Designer</SubType>
@@ -504,6 +511,9 @@
504511
<Content Include="SamplePages\RemoteDevicePicker\RemoteDevicePickerCode.bind" />
505512
<Content Include="SamplePages\DataGrid\DataGridCode.bind" />
506513
<Content Include="SamplePages\ViewportBehavior\ViewportBehaviorCode.bind" />
514+
<Content Include="SamplePages\TabView\TabViewXaml.bind">
515+
<SubType>Designer</SubType>
516+
</Content>
507517
<Content Include="SamplePages\Weibo Service\WeiboCode.bind" />
508518
<Compile Include="Common\TextBlockHyperlinkBehavior.cs" />
509519
<Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
@@ -645,6 +655,9 @@
645655
<Compile Include="Models\LandingPageResource.cs" />
646656
<Compile Include="Models\LandingPageLink.cs" />
647657
<Compile Include="Models\PaneState.cs" />
658+
<Compile Include="SamplePages\TabView\TabViewPage.xaml.cs">
659+
<DependentUpon>TabViewPage.xaml</DependentUpon>
660+
</Compile>
648661
<Compile Include="SamplePages\UniformGrid\UniformGridPage.xaml.cs">
649662
<DependentUpon>UniformGridPage.xaml</DependentUpon>
650663
</Compile>
@@ -853,6 +866,9 @@
853866
</Compile>
854867
<Compile Include="SamplePages\Incremental Loading Collection\PeopleSource.cs" />
855868
<Compile Include="SamplePages\Incremental Loading Collection\Person.cs" />
869+
<Compile Include="SamplePages\Light\LightBehaviorPage.xaml.cs">
870+
<DependentUpon>LightBehaviorPage.xaml</DependentUpon>
871+
</Compile>
856872
<Compile Include="SamplePages\LinkedIn Service\LinkedInPage.xaml.cs">
857873
<DependentUpon>LinkedInPage.xaml</DependentUpon>
858874
</Compile>
@@ -904,6 +920,9 @@
904920
<Compile Include="SamplePages\Fade\FadeBehaviorPage.xaml.cs">
905921
<DependentUpon>FadeBehaviorPage.xaml</DependentUpon>
906922
</Compile>
923+
<Compile Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml.cs">
924+
<DependentUpon>HeaderedTextBlockPage.xaml</DependentUpon>
925+
</Compile>
907926
<Compile Include="SamplePages\ImageEx\ImageExPage.xaml.cs">
908927
<DependentUpon>ImageExPage.xaml</DependentUpon>
909928
</Compile>
@@ -1036,6 +1055,10 @@
10361055
<SubType>Designer</SubType>
10371056
<Generator>MSBuild:Compile</Generator>
10381057
</Page>
1058+
<Page Include="SamplePages\TabView\TabViewPage.xaml">
1059+
<Generator>MSBuild:Compile</Generator>
1060+
<SubType>Designer</SubType>
1061+
</Page>
10391062
<Page Include="SamplePages\PeoplePicker\PeoplePickerPage.xaml">
10401063
<Generator>MSBuild:Compile</Generator>
10411064
<SubType>Designer</SubType>
@@ -1328,6 +1351,10 @@
13281351
<Generator>MSBuild:Compile</Generator>
13291352
<SubType>Designer</SubType>
13301353
</Page>
1354+
<Page Include="SamplePages\Light\LightBehaviorPage.xaml">
1355+
<SubType>Designer</SubType>
1356+
<Generator>MSBuild:Compile</Generator>
1357+
</Page>
13311358
<Page Include="SamplePages\LinkedIn Service\LinkedInPage.xaml">
13321359
<SubType>Designer</SubType>
13331360
<Generator>MSBuild:Compile</Generator>
@@ -1396,6 +1423,10 @@
13961423
<Generator>MSBuild:Compile</Generator>
13971424
<SubType>Designer</SubType>
13981425
</Page>
1426+
<Page Include="SamplePages\HeaderedTextBlock\HeaderedTextBlockPage.xaml">
1427+
<SubType>Designer</SubType>
1428+
<Generator>MSBuild:Compile</Generator>
1429+
</Page>
13991430
<Page Include="SamplePages\ImageEx\ImageExPage.xaml">
14001431
<Generator>MSBuild:Compile</Generator>
14011432
<SubType>Designer</SubType>
Loading
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Page
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
7+
mc:Ignorable="d">
8+
9+
<Grid>
10+
<controls:HeaderedTextBlock
11+
Header="@[Header:String:Name]"
12+
Text="@[Text:String:Windows Community Toolkit]"
13+
Orientation="@[Orientation:Enum:Orientation.Vertical]"
14+
Margin="20,10,0,0" />
15+
</Grid>
16+
</Page>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.HeaderedTextBlockPage"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
mc:Ignorable="d">
8+
9+
</Page>

0 commit comments

Comments
 (0)