Skip to content

A Swiss Army knife for developers.

Added favorite button

Etienne Baudoux391021c9eebb
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor b/src/app/dev/DevToys.Blazor/Pages/Index.razor
index 39bfb7731..d9fade2b0 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor
@@ -6,106 +6,108 @@
@namespace DevToys.Blazor.Pages
@inherits MefComponentBase
-<!-- Provider for popover -->
-<PopoverProvider />
-
-<!-- Overlay that covers the whole window for context menus -->
-<Overlay ZIndex="80000"
- Visible="ContextMenuService.IsContextMenuOpened"
- OnClick="ContextMenuService.OnCloseContextMenuRequested" />
-
-<!-- Navigation View -->
-<!-- TODO: Localize -->
-<NavBar @ref=_navBar
- TElement="INotifyPropertyChanged"
- TSearchElement="GuiToolViewItem"
- MenuItemsSource="@ViewModel.HeaderAndBodyToolViewItems"
- FooterMenuItemsSource="@ViewModel.FooterToolViewItems"
- CanGoBack="@ViewModel.CanGoBack"
- @bind-SelectedItem="ViewModel.SelectedMenuItem"
- OnBackButtonClicked="OnBackButtonClicked"
- OnHiddenStateChanged="OnHiddenStateChanged"
- SearchBarPlaceholder="Type to search for tools..."
- SearchQueryChanged="OnSearchQueryChanged"
- SearchQuerySubmitted="OnSearchQuerySubmitted"
- SearchResultItems="ViewModel.SearchResults">
- <!-- Header -->
- <Header>
- <TextBlock Text="DevToys" />
- </Header>
-
- <!-- Search box's result item design -->
- <SearchResultItemTemplate Context="item">
- <div class="sidebar-searchbar-result-item">
- <div class="sidebar-searchbar-result-item-icon">
- <FontIcon FontFamily="@item.ToolInstance.IconFontName" Glyph="@item.ToolInstance.IconGlyph" />
- </div>
- <div class="sidebar-searchbar-result-item-text">
- <TextBlock NoWrap="true" Text="@item.ToolInstance.LongDisplayTitle" HighlightedSpans="@item.MatchedSpans" />
+<CascadingValue Value="this" IsFixed="true">
+ <!-- Provider for popover -->
+ <PopoverProvider />
+
+ <!-- Overlay that covers the whole window for context menus -->
+ <Overlay ZIndex="80000"
+ Visible="ContextMenuService.IsContextMenuOpened"
+ OnClick="ContextMenuService.OnCloseContextMenuRequested" />
+
+ <!-- Navigation View -->
+ <!-- TODO: Localize -->
+ <NavBar @ref=_navBar
+ TElement="INotifyPropertyChanged"
+ TSearchElement="GuiToolViewItem"
+ MenuItemsSource="@ViewModel.HeaderAndBodyToolViewItems"
+ FooterMenuItemsSource="@ViewModel.FooterToolViewItems"
+ CanGoBack="@ViewModel.CanGoBack"
+ @bind-SelectedItem="ViewModel.SelectedMenuItem"
+ OnBackButtonClicked="OnBackButtonClicked"
+ OnHiddenStateChanged="OnHiddenStateChanged"
+ SearchBarPlaceholder="Type to search for tools..."
+ SearchQueryChanged="OnSearchQueryChanged"
+ SearchQuerySubmitted="OnSearchQuerySubmitted"
+ SearchResultItems="ViewModel.SearchResults">
+ <!-- Header -->
+ <Header>
+ <TextBlock Text="DevToys" />
+ </Header>
+
+ <!-- Search box's result item design -->
+ <SearchResultItemTemplate Context="item">
+ <div class="sidebar-searchbar-result-item">
+ <div class="sidebar-searchbar-result-item-icon">
+ <FontIcon FontFamily="@item.ToolInstance.IconFontName" Glyph="@item.ToolInstance.IconGlyph" />
+ </div>
+ <div class="sidebar-searchbar-result-item-text">
+ <TextBlock NoWrap="true" Text="@item.ToolInstance.LongDisplayTitle" HighlightedSpans="@item.MatchedSpans" />
+ </div>
</div>
- </div>
- </SearchResultItemTemplate>
-
- <!-- Item design -->
- <NavBarItemIconTemplate Context="item">
- @{
- var iconGlyph = '\0';
- var iconFontFamily = string.Empty;
- if (item is GuiToolViewItem guiToolViewItem)
- {
- iconGlyph = guiToolViewItem.ToolInstance.IconGlyph;
- iconFontFamily = guiToolViewItem.ToolInstance.IconFontName;
- }
- else if (item is GroupViewItem groupViewItem)
- {
- iconGlyph = groupViewItem.IconGlyph;
- iconFontFamily = groupViewItem.IconFontName;
- }
-
- <FontIcon FontFamily="@iconFontFamily" Glyph="@iconGlyph" />
- }
- </NavBarItemIconTemplate>
-
- <NavBarItemTitleTemplate Context="item">
- @{
- var title = string.Empty;
- if (item is GuiToolViewItem guiToolViewItem)
- {
- title = guiToolViewItem.MenuDisplayTitle;
- }
- else if (item is GroupViewItem groupViewItem)
- {
- title = groupViewItem.DisplayTitle;
+ </SearchResultItemTemplate>
+
+ <!-- Item design -->
+ <NavBarItemIconTemplate Context="item">
+ @{
+ var iconGlyph = '\0';
+ var iconFontFamily = string.Empty;
+ if (item is GuiToolViewItem guiToolViewItem)
+ {
+ iconGlyph = guiToolViewItem.ToolInstance.IconGlyph;
+ iconFontFamily = guiToolViewItem.ToolInstance.IconFontName;
+ }
+ else if (item is GroupViewItem groupViewItem)
+ {
+ iconGlyph = groupViewItem.IconGlyph;
+ iconFontFamily = groupViewItem.IconFontName;
+ }
+
+ <FontIcon FontFamily="@iconFontFamily" Glyph="@iconGlyph" />
}
-
- <div style="display: flex;">
- <TextBlock NoWrap="true"
- Text="@title"
- Style="flex-grow: 1 !important; flex-basis: auto !important; align-self:center;" />
- @if (item is GuiToolViewItem guiToolViewItem2 && guiToolViewItem2.IsRecommended)
+ </NavBarItemIconTemplate>
+
+ <NavBarItemTitleTemplate Context="item">
+ @{
+ var title = string.Empty;
+ if (item is GuiToolViewItem guiToolViewItem)
{
- <img src="_content/DevToys.Blazor/img/idea.svg"
- height="16"
- width="16"
- style="flex-basis: auto; align-self:center;" />
+ title = guiToolViewItem.MenuDisplayTitle;
}
- <img />
- </div>
- }
- </NavBarItemTitleTemplate>
-
- <!-- Content of the NavBar-->
- <Content>
- @if (!IsTransitioning)
- {
- if (ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem)
- {
- <ToolPage GuiToolViewItem="@guiToolViewItem"/>
+ else if (item is GroupViewItem groupViewItem)
+ {
+ title = groupViewItem.DisplayTitle;
+ }
+
+ <div style="display: flex;">
+ <TextBlock NoWrap="true"
+ Text="@title"
+ Style="flex-grow: 1 !important; flex-basis: auto !important; align-self:center;" />
+ @if (item is GuiToolViewItem guiToolViewItem2 && guiToolViewItem2.IsRecommended)
+ {
+ <img src="_content/DevToys.Blazor/img/idea.svg"
+ height="16"
+ width="16"
+ style="flex-basis: auto; align-self:center;" />
+ }
+ <img />
+ </div>
}
- else if (ViewModel.SelectedMenuItem is GroupViewItem groupToolViewItem)
+ </NavBarItemTitleTemplate>
+
+ <!-- Content of the NavBar-->
+ <Content>
+ @if (!IsTransitioning)
{
- <ToolGroup GroupViewItem="@groupToolViewItem" />
+ if (ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem)
+ {
+ <ToolPage GuiToolViewItem="@guiToolViewItem"/>
+ }
+ else if (ViewModel.SelectedMenuItem is GroupViewItem groupToolViewItem)
+ {
+ <ToolGroup GroupViewItem="@groupToolViewItem" />
+ }
}
- }
- </Content>
-</NavBar>
\ No newline at end of file
+ </Content>
+ </NavBar>
+</CascadingValue>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
index 7d9bf5820..d1a95f6ed 100644
--- a/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Pages/Index.razor.cs
@@ -97,16 +97,6 @@ public partial class Index : MefComponentBase
ViewModel.SearchBoxQuerySubmittedCommand.Execute(selectedItem);
}
- internal void OnSetFavorite()
- {
- // WARNING: This should be done in ToolPageViewModel. Doing it here just for demo.
- if (ViewModel.SelectedMenuItem is GuiToolViewItem guiToolViewItem)
- {
- bool isFavorite = GuiToolProvider.GetToolIsFavorite(guiToolViewItem.ToolInstance);
- GuiToolProvider.SetToolIsFavorite(guiToolViewItem.ToolInstance, !isFavorite);
- }
- }
-
protected override void OnAfterRender(bool firstRender)
{
if (firstRender)
diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
index 47bb3a92e..3fd427765 100644
--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
@@ -12,7 +12,7 @@
else
{
<div class="entrance-theme-transition tool-page-content">
- @RenderToolWithHeader(false)
+ @RenderToolWithHeader(false)
</div>
}
@@ -25,28 +25,37 @@ else
{
<Grid RowSpacing="12"
Rows="@(new List<GridLength>
- {
- GridLength.Auto,
- new GridLength(1, GridUnitType.Fraction)
- })">
+ {
+ GridLength.Auto,
+ new GridLength(1, GridUnitType.Fraction)
+ })"
+ ColumnSpacing="6"
+ Columns="@(new List<GridLength>
+ {
+ new GridLength(1, GridUnitType.Fraction),
+ GridLength.Auto
+ })">
- <GridCell Row="0">
+ <GridCell Row="0" Column="0">
<TextBlock Appearance="@TextBlockAppearance.Title"
Style="font-size: 24px !important"
Text="@ViewModel.HeaderText" />
</GridCell>
+ <GridCell Row="0"
+ Column="1">
+ <StackPanel Wrap="false">
+ <Button IsVisible="@ViewModel.IsSelectedMenuItemSupportFavorite"
+ Appearance="ButtonAppearance.Stealth"
+ @onclick="@OnToggleFavorite">
+ <StackPanel>
+ <FontIcon Glyph="@(ViewModel.IsSelectedMenuItemAFavoriteTool ? '\uF71A' : '\uF70F')" />
+ <TextBlock Text="@ViewModel.GetFavoriteButtonText(ViewModel.IsSelectedMenuItemAFavoriteTool)" />
+ </StackPanel>
+ </Button>
+ </StackPanel>
+ </GridCell>
- <GridCell Row="1">
- @*@if (isScrollable)
- {
- <UIElementPresenter UIElement="@ViewModel.ToolView.RootElement" />
- }
- else
- {
- <FullScreenContainer>
- <UIElementPresenter UIElement="@ViewModel.ToolView.RootElement" />
- </FullScreenContainer>
- }*@
+ <GridCell Row="1" ColumnSpan="2">
<FullScreenContainer IsInFullScreenModeChanged="@OnIsInFullScreenModeChanged">
<UIElementPresenter UIElement="@ViewModel.ToolView.RootElement" />
</FullScreenContainer>
diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
index 39a5b8d1a..d93a5611f 100644
--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor.cs
@@ -15,6 +15,9 @@ public partial class ToolPage : MefComponentBase, IDisposable
[Parameter]
public bool IsInFullScreenMode { get; set; }
+ [CascadingParameter]
+ protected Index? IndexPage { get; set; }
+
protected override void OnInitialized()
{
base.OnInitialized();
@@ -47,4 +50,10 @@ public partial class ToolPage : MefComponentBase, IDisposable
{
IsInFullScreenMode = isInFullScreenMode;
}
+
+ private void OnToggleFavorite()
+ {
+ ViewModel.ToggleSelectedMenuItemFavoriteCommand.Execute(null);
+ IndexPage.StateHasChanged();
+ }
}