Skip to content

Feature: Removed toolbar from homepage #16589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 10, 2024
Merged

Feature: Removed toolbar from homepage #16589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85b9bca
Hide toolbar on homepage
Lamparter Dec 9, 2024
d6180f9
Change method to using multi-bool converter
Lamparter Dec 10, 2024
a1e9256
Merge branch 'files-community:main' into no-home
Lamparter Dec 10, 2024
effd6c3
Fix spacing
yaira2 Dec 10, 2024
41871d1
Remove header
yaira2 Dec 10, 2024
a850f40
Update MultiBooleanConverter.cs
yaira2 Dec 10, 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
3 changes: 3 additions & 0 deletions src/Files.App/Converters/MultiBooleanConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ public static Boolean OrAndConvert(bool a, bool b, bool c)
public static Visibility OrConvertToVisibility(bool a, bool b)
=> (a || b) ? Visibility.Visible : Visibility.Collapsed;

public static Visibility AndConvertToVisibility(bool a, bool b)
=> (a && b) ? Visibility.Visible : Visibility.Collapsed;

public static Visibility NorConvertToVisibility(bool a, bool b)
=> !(a || b) ? Visibility.Visible : Visibility.Collapsed;

Expand Down
11 changes: 0 additions & 11 deletions src/Files.App/UserControls/InnerNavigationToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,6 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<!-- Home page header -->
<TextBlock
x:Name="HomePageHeaderTextBlock"
Grid.Column="0"
Margin="18,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
Style="{StaticResource App.Theme.SubtitleTextBlockStyle}"
Text="{helpers:ResourceString Name=Home}" />

<!-- Context Commands -->
<CommandBar
x:Name="ContextCommandBar"
Expand Down
3 changes: 2 additions & 1 deletion src/Files.App/Views/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
x:Class="Files.App.Views.MainPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="using:Files.App.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:helpers="using:Files.App.Helpers"
xmlns:i="using:Microsoft.Xaml.Interactivity"
Expand Down Expand Up @@ -205,7 +206,7 @@
ShowPreviewPaneButton="{x:Bind ViewModel.ShouldPreviewPaneBeDisplayed, Mode=OneWay}"
ShowViewControlButton="{x:Bind ViewModel.ShouldViewControlBeDisplayed, Mode=OneWay}"
TabIndex="2"
Visibility="{x:Bind ViewModel.ShowToolbar, Mode=OneWay}" />
Visibility="{x:Bind converters:MultiBooleanConverter.AndConvertToVisibility(SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, ViewModel.ShowToolbar), Mode=OneWay}" />

<!-- Page Content -->
<ContentPresenter
Expand Down