Skip to content

Commit 295d76f

Browse files
committed
Fixed visual states for MAUI app
1 parent 62b4611 commit 295d76f

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

src/Codebreaker.MAUI/Views/Pages/GamePage.xaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@
2020
<VisualStateGroup>
2121
<VisualState x:Name="Start">
2222
<VisualState.Setters>
23-
<Setter TargetName="StartGameArea" Property="IsVisible" Value="True" />
24-
<Setter TargetName="PegSelectionArea" Property="IsVisible" Value="False" />
25-
<Setter TargetName="PegScrollView" Property="IsVisible" Value="False" />
23+
<Setter TargetName="StartGameArea" Property="FlexLayout.IsVisible" Value="True" />
24+
<Setter TargetName="PegSelectionArea" Property="components:PegSelectionView.IsVisible" Value="False" />
25+
<Setter TargetName="PegScrollView" Property="ScrollView.IsVisible" Value="False" />
2626
</VisualState.Setters>
2727
</VisualState>
2828
<VisualState x:Name="Playing">
2929
<VisualState.Setters>
30-
<Setter TargetName="StartGameArea" Property="IsVisible" Value="False" />
31-
<Setter TargetName="PegSelectionArea" Property="IsVisible" Value="True" />
32-
<Setter TargetName="PegScrollView" Property="IsVisible" Value="True" />
30+
<Setter TargetName="StartGameArea" Property="FlexLayout.IsVisible" Value="False" />
31+
<Setter TargetName="PegSelectionArea" Property="components:PegSelectionView.IsVisible" Value="True" />
32+
<Setter TargetName="PegScrollView" Property="ScrollView.IsVisible" Value="True" />
3333
</VisualState.Setters>
3434
</VisualState>
3535
<VisualState x:Name="Finished">
3636
<VisualState.Setters>
37-
<Setter TargetName="StartGameArea" Property="IsVisible" Value="False" />
38-
<Setter TargetName="PegSelectionArea" Property="IsVisible" Value="False" />
39-
<Setter TargetName="PegScrollView" Property="IsVisible" Value="True" />
37+
<Setter TargetName="StartGameArea" Property="FlexLayout.IsVisible" Value="False" />
38+
<Setter TargetName="PegSelectionArea" Property="components:PegSelectionView.IsVisible" Value="False" />
39+
<Setter TargetName="PegScrollView" Property="ScrollView.IsVisible" Value="True" />
4040
</VisualState.Setters>
4141
</VisualState>
4242
</VisualStateGroup>
@@ -90,7 +90,6 @@
9090

9191
<ScrollView Grid.Row="2" Padding="0,15,0,15" x:Name="PegScrollView" HorizontalOptions="CenterAndExpand">
9292
<ListView
93-
x:Name="test"
9493
HorizontalOptions="FillAndExpand"
9594
SelectionMode="None"
9695
ItemsSource="{Binding GameMoves, Mode=OneWay}"

src/Codebreaker.MAUI/Views/Pages/GamePage.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public GamePage(GamePageViewModel viewModel, INavigationService navigationServic
1414
BindingContext = viewModel;
1515
WeakReferenceMessenger.Default.RegisterAll(this);
1616
ViewModel.PropertyChanged += ViewModel_PropertyChanged;
17-
this.GoToState("Start");
17+
ContentWrapper.GoToState("Start");
1818
}
1919

2020
public GamePageViewModel ViewModel { get; }
@@ -44,7 +44,7 @@ private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.Pro
4444
GameMode.Won or GameMode.Lost => "Finished",
4545
_ => "Start",
4646
};
47-
this.GoToState(stateName);
47+
ContentWrapper.GoToState(stateName);
4848
}
4949

5050
private async void Button_Clicked(object sender, EventArgs e)

0 commit comments

Comments
 (0)