Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Remove experiment from Install Application's search bar #3954

Merged
lauren-ciha merged 3 commits into from
Nov 5, 2024
Merged

Remove experiment from Install Application's search bar #3954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2ac488
Update AppManagement search bar
lauren-ciha Oct 10, 2024
3ffacb1
Add back search bar style
lauren-ciha Oct 21, 2024
cdd6070
Unwrap SearchBox from ExperimentControl
lauren-ciha Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions tools/SetupFlow/DevHome.SetupFlow/Strings/en-us/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,10 +709,6 @@
<value>Try "GitHub"</value>
<comment>{Locked="GitHub"}Placeholder text displayed in a search box</comment>
</data>
<data name="SearchBox_Experiment.PlaceholderText" xml:space="preserve">
<value>Search for apps</value>
<comment>Placeholder text displayed in a search box</comment>
</data>
<data name="SelectAll.Content" xml:space="preserve">
<value>Select all</value>
<comment>Label for select all checkbox</comment>
Expand Down
43 changes: 13 additions & 30 deletions tools/SetupFlow/DevHome.SetupFlow/Views/AppManagementView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<ResourceDictionary Source="ms-appx:///DevHome.SetupFlow/Styles/SetupFlowStyles.xaml" />
</ResourceDictionary.MergedDictionaries>
<converters:DoubleToVisibilityConverter x:Key="CountToVisibilityConverter" GreaterThan="0" FalseValue="Visible" TrueValue="Collapsed" />
<Style x:Key="SearchBoxStyle" TargetType="AutoSuggestBox" BasedOn="{StaticResource DefaultAutoSuggestBoxStyle}">
<Setter Property="QueryIcon" Value="Find"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Width" Value="400"/>
<Setter Property="Margin" Value="0,0,0,20"/>
</Style>
</ResourceDictionary>
</UserControl.Resources>

Expand Down Expand Up @@ -58,36 +64,13 @@
</Grid.RowDefinitions>

<!-- Search bar -->
<common:ExperimentControl ExperimentKey="AppManagement_SearchBoxPlaceholder" x:Name="SearchBox">
<common:ExperimentControl.Resources>
<Style TargetType="AutoSuggestBox" BasedOn="{StaticResource DefaultAutoSuggestBoxStyle}">
<Setter Property="QueryIcon" Value="Find"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Width" Value="400"/>
<Setter Property="Margin" Value="0,0,0,20"/>
</Style>
</common:ExperimentControl.Resources>

<common:ExperimentControl.DefaultContent>
<AutoSuggestBox x:Name="SearchBox_Default" x:Uid="SearchBox" Text="{x:Bind ViewModel.SearchText, Mode=TwoWay}">
<i:Interaction.Behaviors>
<ic:EventTriggerBehavior EventName="TextChanged">
<ic:InvokeCommandAction Command="{x:Bind ViewModel.SearchTextChangedCommand}" CommandParameter="{x:Bind Path=SearchBox_Default.Text, Mode=OneWay}"/>
</ic:EventTriggerBehavior>
</i:Interaction.Behaviors>
</AutoSuggestBox>
</common:ExperimentControl.DefaultContent>

<common:ExperimentControl.ExperimentContent>
<AutoSuggestBox x:Name="SearchBox_Experiment" x:Uid="SearchBox_Experiment" Text="{x:Bind ViewModel.SearchText, Mode=TwoWay}">
<i:Interaction.Behaviors>
<ic:EventTriggerBehavior EventName="TextChanged">
<ic:InvokeCommandAction Command="{x:Bind ViewModel.SearchTextChangedCommand}" CommandParameter="{x:Bind Path=SearchBox_Experiment.Text, Mode=OneWay}"/>
</ic:EventTriggerBehavior>
</i:Interaction.Behaviors>
</AutoSuggestBox>
</common:ExperimentControl.ExperimentContent>
</common:ExperimentControl>
<AutoSuggestBox x:Name="SearchBox" x:Uid="SearchBox" Text="{x:Bind ViewModel.SearchText, Mode=TwoWay}" Style="{StaticResource SearchBoxStyle}">
<i:Interaction.Behaviors>
<ic:EventTriggerBehavior EventName="TextChanged">
<ic:InvokeCommandAction Command="{x:Bind ViewModel.SearchTextChangedCommand}" CommandParameter="{x:Bind Path=SearchBox.Text, Mode=OneWay}"/>
</ic:EventTriggerBehavior>
</i:Interaction.Behaviors>
</AutoSuggestBox>

<!-- Main content -->
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Name="MainContent" AutomationProperties.AccessibilityView="Raw">
Expand Down