Skip to content

Commit 7d1d949

Browse files
ferrariofilippoyaira2
authored andcommitted
Use teaching tip
1 parent 6f50a94 commit 7d1d949

File tree

1 file changed

+10
-47
lines changed

1 file changed

+10
-47
lines changed

src/Files.App/Views/Settings/DevToolsPage.xaml

Lines changed: 10 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
ColumnSpacing="8"
104104
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolVisibilityConverter}, Mode=OneWay}">
105105
<Grid.ColumnDefinitions>
106+
<ColumnDefinition Width="Auto" />
106107
<ColumnDefinition Width="Auto" />
107108
<ColumnDefinition Width="Auto" />
108109
<ColumnDefinition Width="*" />
@@ -213,47 +214,15 @@
213214
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolVisibilityConverter}, Mode=OneWay}">
214215
<TextBox.Resources>
215216
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
217+
<TeachingTip
218+
x:Name="InvalidFriendlyNameWarning"
219+
Title="{helpers:ResourceString Name=InvalidFriendlyNameError}"
220+
IsOpen="{x:Bind ViewModel.IsFriendlyNameValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
221+
PreferredPlacement="Bottom"
222+
Target="{x:Bind IDEFriendlyNameTextBox}" />
216223
</TextBox.Resources>
217224
</TextBox>
218225

219-
<Grid
220-
x:Name="InvalidFriendlyNameWarning"
221-
Grid.Row="1"
222-
Grid.Column="2"
223-
Padding="12,4"
224-
VerticalAlignment="Stretch"
225-
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Mode=OneWay}"
226-
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
227-
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
228-
BorderThickness="1"
229-
ColumnSpacing="8"
230-
CornerRadius="4"
231-
ToolTipService.ToolTip="{helpers:ResourceString Name=ErrorInputEmpty}"
232-
Visibility="{x:Bind ViewModel.IsFriendlyNameValid, Mode=OneWay, Converter={StaticResource InvertedBoolVisibilityConverter}}">
233-
<Grid.ColumnDefinitions>
234-
<ColumnDefinition Width="Auto" />
235-
<ColumnDefinition Width="Auto" />
236-
</Grid.ColumnDefinitions>
237-
238-
<TextBlock
239-
VerticalAlignment="Center"
240-
AutomationProperties.AccessibilityView="Raw"
241-
FontFamily="{ThemeResource SymbolThemeFontFamily}"
242-
FontSize="{StaticResource InfoBarIconFontSize}"
243-
Foreground="{ThemeResource InfoBarErrorSeverityIconBackground}"
244-
Text="{StaticResource InfoBarIconBackgroundGlyph}" />
245-
<TextBlock
246-
VerticalAlignment="Center"
247-
FontFamily="{ThemeResource SymbolThemeFontFamily}"
248-
FontSize="{StaticResource InfoBarIconFontSize}"
249-
Foreground="{ThemeResource InfoBarInformationalSeverityIconForeground}"
250-
Text="{StaticResource InfoBarErrorIconGlyph}" />
251-
<TextBlock
252-
Grid.Column="1"
253-
VerticalAlignment="Center"
254-
Text="{helpers:ResourceString Name=InvalidFriendlyNameError}" />
255-
</Grid>
256-
257226
<!-- Edit -->
258227
<Button
259228
x:Name="EditIDEConfigButton"
@@ -332,30 +301,24 @@
332301
<Setter Target="InvalidPathWarning.(Grid.Row)" Value="0" />
333302
<Setter Target="IDEPathGrid.RowSpacing" Value="0" />
334303
<Setter Target="IDEPathGrid.ColumnSpacing" Value="8" />
335-
<Setter Target="InvalidFriendlyNameWarning.(Grid.Column)" Value="2" />
336-
<Setter Target="InvalidFriendlyNameWarning.(Grid.Row)" Value="1" />
337-
<Setter Target="InvalidFriendlyNameWarning.(Grid.ColumnSpan)" Value="1" />
338304
</VisualState.Setters>
339305
</VisualState>
340306
<VisualState x:Name="CompactState">
341307
<VisualState.Setters>
342308
<Setter Target="IDEPathTextBox.Width" Value="Auto" />
343309
<Setter Target="IDEPathTextBox.HorizontalAlignment" Value="Stretch" />
344-
<Setter Target="IDEPathTextBox.(Grid.Column)" Value="2" />
310+
<Setter Target="IDEPathTextBox.(Grid.Column)" Value="3" />
345311
<Setter Target="IDEFriendlyNameTextBox.Width" Value="Auto" />
346312
<Setter Target="IDEFriendlyNameTextBox.HorizontalAlignment" Value="Stretch" />
347313
<Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="3" />
348-
<Setter Target="IDEPathButtons.(Grid.Column)" Value="2" />
314+
<Setter Target="IDEPathButtons.(Grid.Column)" Value="3" />
349315
<Setter Target="IDEPathButtons.(Grid.Row)" Value="1" />
350316
<Setter Target="IDEPathButtons.Orientation" Value="Vertical" />
351317
<Setter Target="IDEPathButtons.Spacing" Value="8" />
352-
<Setter Target="InvalidPathWarning.(Grid.Column)" Value="2" />
318+
<Setter Target="InvalidPathWarning.(Grid.Column)" Value="3" />
353319
<Setter Target="InvalidPathWarning.(Grid.Row)" Value="2" />
354320
<Setter Target="IDEPathGrid.RowSpacing" Value="12" />
355321
<Setter Target="IDEPathGrid.ColumnSpacing" Value="0" />
356-
<Setter Target="InvalidFriendlyNameWarning.(Grid.Column)" Value="0" />
357-
<Setter Target="InvalidFriendlyNameWarning.(Grid.Row)" Value="2" />
358-
<Setter Target="InvalidFriendlyNameWarning.(Grid.ColumnSpan)" Value="3" />
359322
</VisualState.Setters>
360323
</VisualState>
361324
</VisualStateGroup>

0 commit comments

Comments
 (0)