Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit d9c9e8b

Browse files
authored
Merge branch 'main' into issue757
2 parents c12fbc8 + 5beed2a commit d9c9e8b

File tree

12 files changed

+70
-63
lines changed

12 files changed

+70
-63
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ xmlns:xct="http://xamarin.com/schemas/2020/toolkit">
4646

4747
## Documentation
4848

49-
The documentation is currently under construction at the [official Docs repo](https://github.com/MicrosoftDocs/xamarin-communitytoolkit). We're working to get these published as soon as possible. For now, please refer to the markdown files that are in the repo. Contributions to the Docs are very much welcomed!
49+
The documentation is still under construction, but we've published the most important things over at [Microsoft Docs](https://docs.microsoft.com/en-us/xamarin/community-toolkit/). If you want to contribute some of the missing bits you can do this over at the [official Docs repo](https://github.com/MicrosoftDocs/xamarin-communitytoolkit) as contributions are very much welcomed!
5050

5151
## Contributions welcome!
5252

samples/XCT.Sample.Tizen/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using Xamarin.Forms;
33

44
namespace Xamarin.CommunityToolkit.Sample.Tizen

samples/XCT.Sample.UWP/App.xaml.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ namespace Xamarin.CommunityToolkit.Sample.UWP
2020
/// <summary>
2121
/// Provides application-specific behavior to supplement the default Application class.
2222
/// </summary>
23-
sealed partial class App : Application
23+
public sealed partial class App : Application
2424
{
2525
/// <summary>
2626
/// Initializes the singleton application object. This is the first line of authored code
2727
/// executed, and as such is the logical equivalent of main() or WinMain().
2828
/// </summary>
2929
public App()
3030
{
31-
this.InitializeComponent();
32-
this.Suspending += OnSuspending;
31+
InitializeComponent();
32+
Suspending += OnSuspending;
3333
}
3434

3535
/// <summary>
@@ -42,7 +42,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
4242
#if DEBUG
4343
if (System.Diagnostics.Debugger.IsAttached)
4444
{
45-
this.DebugSettings.EnableFrameRateCounter = true;
45+
DebugSettings.EnableFrameRateCounter = true;
4646
}
4747
#endif
4848

@@ -61,7 +61,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
6161

6262
if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
6363
{
64-
//TODO: Load state from previously suspended application
64+
// TODO: Load state from previously suspended application
6565
}
6666

6767
// Place the frame in the current Window
@@ -75,6 +75,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
7575
// parameter
7676
rootFrame.Navigate(typeof(MainPage), e.Arguments);
7777
}
78+
7879
// Ensure the current window is active
7980
Window.Current.Activate();
8081
}
@@ -96,10 +97,11 @@ void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
9697
/// </summary>
9798
/// <param name="sender">The source of the suspend request.</param>
9899
/// <param name="e">Details about the suspend request.</param>
99-
private void OnSuspending(object sender, SuspendingEventArgs e)
100+
void OnSuspending(object sender, SuspendingEventArgs e)
100101
{
101102
var deferral = e.SuspendingOperation.GetDeferral();
102-
//TODO: Save application state and stop any background activity
103+
104+
// TODO: Save application state and stop any background activity
103105
deferral.Complete();
104106
}
105107
}

samples/XCT.Sample.UWP/MainPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public sealed partial class MainPage
1919
{
2020
public MainPage()
2121
{
22-
this.InitializeComponent();
22+
InitializeComponent();
2323

2424
LoadApplication(new Xamarin.CommunityToolkit.Sample.App());
2525
}

samples/XCT.Sample.UWP/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44

5-
// General Information about an assembly is controlled through the following
5+
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
88
[assembly: AssemblyTitle("Xamarin.CommunityToolkit.Sample.UWP")]
@@ -17,11 +17,11 @@
1717
// Version information for an assembly consists of the following four values:
1818
//
1919
// Major Version
20-
// Minor Version
20+
// Minor Version
2121
// Build Number
2222
// Revision
2323
//
24-
// You can specify all the values or you can default the Build and Revision Numbers
24+
// You can specify all the values or you can default the Build and Revision Numbers
2525
// by using the '*' as shown below:
2626
// [assembly: AssemblyVersion("1.0.*")]
2727
[assembly: AssemblyVersion("1.0.0.0")]

samples/XCT.Sample.WPF/Properties/AssemblyInfo.cs

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,19 @@
2121
// COM, set the ComVisible attribute to true on that type.
2222
[assembly: ComVisible(false)]
2323

24-
//In order to begin building localizable applications, set
25-
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
26-
//inside a <PropertyGroup>. For example, if you are using US english
27-
//in your source files, set the <UICulture> to en-US. Then uncomment
28-
//the NeutralResourceLanguage attribute below. Update the "en-US" in
29-
//the line below to match the UICulture setting in the project file.
30-
31-
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
24+
// In order to begin building localizable applications, set
25+
// <UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
26+
// inside a <PropertyGroup>. For example, if you are using US english
27+
// in your source files, set the <UICulture> to en-US. Then uncomment
28+
// the NeutralResourceLanguage attribute below. Update the "en-US" in
29+
// the line below to match the UICulture setting in the project file.
3230

31+
// [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
3332

3433
[assembly: ThemeInfo(
35-
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
36-
//(used if a resource is not found in the page,
37-
// or application resource dictionaries)
38-
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
39-
//(used if a resource is not found in the page,
40-
// app, or any theme specific resource dictionaries)
41-
)]
42-
34+
ResourceDictionaryLocation.None, // where theme specific resource dictionaries are located (used if a resource is not found in the page, or application resource dictionaries)
35+
ResourceDictionaryLocation.SourceAssembly) // where the generic resource dictionary is located (used if a resource is not found in the page, app, or any theme specific resource dictionaries)
36+
]
4337

4438
// Version information for an assembly consists of the following four values:
4539
//

samples/XCT.Sample/Helpers/MarkupExtensions.cs

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,30 @@
33

44
namespace Xamarin.CommunityToolkit.Sample
55
{
6-
public static class MarkupExtensions
7-
{
8-
public static TBindable Rainbow<TBindable>(this TBindable bindable) where TBindable : BindableObject { DebugRainbow.SetShowColors(bindable, true); return bindable; }
6+
public static class MarkupExtensions
7+
{
8+
public static TBindable Rainbow<TBindable>(this TBindable bindable) where TBindable : BindableObject
9+
{
10+
DebugRainbow.SetShowColors(bindable, true);
11+
return bindable;
12+
}
913

10-
public static TVisualElement Background<TVisualElement>(this TVisualElement visualElement, Color color) where TVisualElement : VisualElement { visualElement.BackgroundColor = color; return visualElement; }
14+
public static TVisualElement Background<TVisualElement>(this TVisualElement visualElement, Color color) where TVisualElement : VisualElement
15+
{
16+
visualElement.BackgroundColor = color;
17+
return visualElement;
18+
}
1119

12-
public static TStackLayout Horizontal<TStackLayout>(this TStackLayout stackLayout) where TStackLayout : StackLayout { stackLayout.Orientation = StackOrientation.Horizontal; return stackLayout; }
13-
14-
public static TStackLayout Vertical<TStackLayout>(this TStackLayout stackLayout) where TStackLayout : StackLayout { stackLayout.Orientation = StackOrientation.Vertical; return stackLayout; }
15-
}
20+
public static TStackLayout Horizontal<TStackLayout>(this TStackLayout stackLayout) where TStackLayout : StackLayout
21+
{
22+
stackLayout.Orientation = StackOrientation.Horizontal;
23+
return stackLayout;
24+
}
25+
26+
public static TStackLayout Vertical<TStackLayout>(this TStackLayout stackLayout) where TStackLayout : StackLayout
27+
{
28+
stackLayout.Orientation = StackOrientation.Vertical;
29+
return stackLayout;
30+
}
31+
}
1632
}

samples/XCT.Sample/Pages/Behaviors/RequiredStringValidationBehaviorPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Xamarin.Forms.Xaml;
1+
using Xamarin.Forms.Xaml;
22

33
namespace Xamarin.CommunityToolkit.Sample.Pages.Behaviors
44
{

samples/XCT.Sample/Pages/Views/UniformGridPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Xamarin.CommunityToolkit.Sample.Pages.Views
22
{
3-
public partial class UniformGridPage
3+
public partial class UniformGridPage
44
{
55
public UniformGridPage() => InitializeComponent();
66
}

samples/XCT.Sample/ViewModels/Effects/EffectsGalleryViewModel.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,27 @@ public class EffectsGalleryViewModel : BaseGalleryViewModel
1212
new SectionModel(
1313
typeof(SafeAreaEffectPage),
1414
nameof(SafeAreaEffect),
15-
"The SafeAreaEffect is an effectwill help to make sure that content isn't clipped by rounded device corners, the home indicator, or the sensor housing on an iPhone X (or alike)"
16-
),
15+
"The SafeAreaEffect is an effectwill help to make sure that content isn't clipped by rounded device corners, the home indicator, or the sensor housing on an iPhone X (or alike)"),
1716

1817
new SectionModel(
1918
typeof(RemoveBorderEffectPage),
2019
nameof(RemoveBorderEffect),
21-
"The RemoveBorderEffect is an effect that will remove the border from an Entry on iOS and the underline from an entry on Android"
22-
),
20+
"The RemoveBorderEffect is an effect that will remove the border from an Entry on iOS and the underline from an entry on Android"),
2321

2422
new SectionModel(
2523
typeof(SelectAllTextEffectPage),
2624
nameof(SelectAllTextEffect),
27-
"The SelectAllTextEffect is an effect that will select all text in an Entry / Editor when it becomes focussed"
28-
),
25+
"The SelectAllTextEffect is an effect that will select all text in an Entry / Editor when it becomes focussed"),
2926

3027
new SectionModel(
3128
typeof(IconTintColorEffectPage),
3229
nameof(IconTintColorEffect),
33-
"With the IconTintColorEffect you set the tint color of an Image or ImageButton."
34-
),
30+
"With the IconTintColorEffect you set the tint color of an Image or ImageButton."),
3531

3632
new SectionModel(
3733
typeof(TouchEffectPage),
3834
nameof(TouchEffect),
39-
"The TouchEffect is an effect that allows changing the view's appearance depending on the touch state (normal, pressed, hovered). Also, it allows to handle long presses."
40-
),
35+
"The TouchEffect is an effect that allows changing the view's appearance depending on the touch state (normal, pressed, hovered). Also, it allows to handle long presses."),
4136
};
4237
}
4338
}

0 commit comments

Comments
 (0)