Skip to content

Commit 428fc25

Browse files
committed
chore(Listboard): Solve Merge conflicts
2 parents b056c58 + 268c999 commit 428fc25

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/DevTKSS.Uno.Samples.MvuxGallery/Presentation/ViewModels/ListboardModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ public ListboardModel(
5959
/// </remarks>
6060
public IListFeed<string> CodeSampleOptions => ListFeed<string>
6161
.Async(_codeSampleService.GetCodeSampleOptionsAsync)
62-
.Selection(SelectedSampleOption);
62+
.Selection(SelectedOption);
6363

6464
/// <summary>
6565
/// Represents the selected code sample option.
6666
/// </summary>
6767
/// <remarks>
6868
/// Uses <see cref="string.Empty"/> as the default value to avoid null checks in the XAML.
6969
/// </remarks>
70-
public IState<string> SelectedSampleOption => State<string>
70+
public IState<string> SelectedOption => State<string>
7171
.Value(this, () => string.Empty)
7272
.ForEach(SwitchCodeSampleAsync);
7373

@@ -92,7 +92,7 @@ public ListboardModel(
9292
/// }
9393
/// </code>
9494
/// </example>
95-
public async ValueTask SwitchCodeSampleAsync([FeedParameter(nameof(SelectedSampleOption))] string? choice, CancellationToken ct = default)
95+
public async ValueTask SwitchCodeSampleAsync([FeedParameter(nameof(SelectedOption))] string? choice, CancellationToken ct = default)
9696
{
9797
string sample = await _codeSampleService.GetCodeSampleAsync(choice ?? string.Empty);
9898
await CurrentCodeSample.SetAsync(sample, ct);

src/DevTKSS.Uno.Samples.MvuxGallery/Presentation/Views/ListboardPage.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
<Grid.RowDefinitions>
1919
<RowDefinition Height="Auto"/>
2020
<RowDefinition Height="*"/>
21-
<RowDefinition Height="Auto"
22-
MaxHeight="300" />
21+
<RowDefinition Height="Auto" />
2322
</Grid.RowDefinitions>
2423

2524
<TextBlock Grid.Row="0"

0 commit comments

Comments
 (0)