Skip to content

Added support for collapsing widgets on the homepage #7285

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 5 commits into from
Dec 15, 2021
Merged

Added support for collapsing widgets on the homepage #7285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e31a8ed
Added support for collapsing widgets on the homepage
yaira2 Dec 13, 2021
6563b9f
Improved widget layouts
yaira2 Dec 13, 2021
6e8851c
Formatted xaml
yaira2 Dec 14, 2021
4cc26ed
Merge branch 'main' into WidgetExpanders
yaira2 Dec 15, 2021
af24464
State of expanders is now preserved
d2dyno1 Dec 15, 2021
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
76 changes: 38 additions & 38 deletions src/Files/Dialogs/SettingsDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,49 +23,49 @@
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewItemBackground" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewItemBackground" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewItemBackground" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}"/>
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
Expand All @@ -91,10 +91,10 @@
<muxc:NavigationView.MenuItems>
<muxc:NavigationViewItem
AccessKey="A"
CornerRadius="4,0,0,4"
AutomationProperties.AutomationId="SettingsItemAppearance"
Content="{helpers:ResourceString Name=Appearance}"
CornerRadius="4,0,0,4"
IsSelected="True"
AutomationProperties.AutomationId="SettingsItemAppearance"
Tag="0">
<muxc:NavigationViewItem.Icon>
<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
Expand All @@ -103,9 +103,9 @@
<muxc:NavigationViewItem
x:Uid="SettingsNavPreferences"
AccessKey="P"
CornerRadius="0"
Content="Preferences"
AutomationProperties.AutomationId="SettingsItemPreferences"
Content="Preferences"
CornerRadius="0"
Tag="1">
<muxc:NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
Expand All @@ -114,8 +114,8 @@
<muxc:NavigationViewItem
x:Uid="SettingsNavMultitasking"
AccessKey="M"
Content="Multitasking"
AutomationProperties.AutomationId="SettingsItemMultitasking"
Content="Multitasking"
CornerRadius="0"
Tag="2">
<muxc:NavigationViewItem.Icon>
Expand All @@ -125,8 +125,8 @@
<muxc:NavigationViewItem
x:Uid="SettingsNavExperimental"
AccessKey="E"
Content="Experimental"
AutomationProperties.AutomationId="SettingsItemExperimental"
Content="Experimental"
CornerRadius="0"
Tag="3">
<muxc:NavigationViewItem.Icon>
Expand All @@ -135,10 +135,10 @@
</muxc:NavigationViewItem>
<muxc:NavigationViewItem
AccessKey="B"
CornerRadius="0,4,4,0"
AutomationProperties.AutomationId="SettingsItemAbout"
Content="{helpers:ResourceString Name=About}"
Tag="4">
CornerRadius="0,4,4,0"
Tag="4">
<muxc:NavigationViewItem.Icon>
<FontIcon FontSize="16" Glyph="&#xE946;" />
</muxc:NavigationViewItem.Icon>
Expand Down
8 changes: 4 additions & 4 deletions src/Files/MultilingualResources/Files.af.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<source>Remove this item</source>
<target state="translated">Verwyder hierdie item</target>
</trans-unit>
<trans-unit id="RecentFilesHeader.Text" translate="yes" xml:space="preserve">
<trans-unit id="RecentFiles" translate="yes" xml:space="preserve">
<source>Recent Files</source>
<target state="translated">Onlangse lêers</target>
</trans-unit>
Expand Down Expand Up @@ -1527,7 +1527,7 @@
<source>Shortcut item</source>
<target state="translated">Kortpad item</target>
</trans-unit>
<trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
<trans-unit id="Drives" translate="yes" xml:space="preserve">
<source>Drives</source>
<target state="translated">Skywe</target>
</trans-unit>
Expand Down Expand Up @@ -1707,7 +1707,7 @@
<source>Dual pane</source>
<target state="translated">Dubbele paneel</target>
</trans-unit>
<trans-unit id="FolderWidgetDescription.Text" translate="yes" xml:space="preserve">
<trans-unit id="Folders" translate="yes" xml:space="preserve">
<source>Folders</source>
<target state="translated">Omslae</target>
</trans-unit>
Expand Down Expand Up @@ -1839,7 +1839,7 @@
<source>Remove Bundle</source>
<target state="translated">Verwyder van bondel</target>
</trans-unit>
<trans-unit id="BundlesWidgetHeader.Text" translate="yes" xml:space="preserve">
<trans-unit id="Bundles" translate="yes" xml:space="preserve">
<source>Bundles</source>
<target state="translated">Bondels</target>
</trans-unit>
Expand Down
8 changes: 4 additions & 4 deletions src/Files/MultilingualResources/Files.ar.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@
<source>Shortcut item</source>
<target state="translated">Shortcut item</target>
</trans-unit>
<trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
<trans-unit id="Drives" translate="yes" xml:space="preserve">
<source>Drives</source>
<target state="translated" state-qualifier="tm-suggestion">محركات الأقراص:</target>
</trans-unit>
Expand Down Expand Up @@ -1556,7 +1556,7 @@
<target state="needs-review-translation">جزء مزدوج</target>
<note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
</trans-unit>
<trans-unit id="FolderWidgetDescription.Text" translate="yes" xml:space="preserve">
<trans-unit id="Folders" translate="yes" xml:space="preserve">
<source>Folders</source>
<target state="translated" state-qualifier="tm-suggestion">المجلدات</target>
</trans-unit>
Expand Down Expand Up @@ -1670,7 +1670,7 @@
<source>Remove Bundle</source>
<target state="translated">إزالة الحزمة</target>
</trans-unit>
<trans-unit id="BundlesWidgetHeader.Text" translate="yes" xml:space="preserve">
<trans-unit id="Bundles" translate="yes" xml:space="preserve">
<source>Bundles</source>
<target state="translated" state-qualifier="tm-suggestion">الحزم</target>
</trans-unit>
Expand Down Expand Up @@ -2690,7 +2690,7 @@
<source>Restore Libraries</source>
<target state="new">Restore Libraries</target>
</trans-unit>
<trans-unit id="RecentFilesHeader.Text" translate="yes" xml:space="preserve">
<trans-unit id="RecentFiles" translate="yes" xml:space="preserve">
<source>Recent Files</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">الملفات الأخيرة</target>
</trans-unit>
Expand Down
8 changes: 4 additions & 4 deletions src/Files/MultilingualResources/Files.ca.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<source>Remove this item</source>
<target state="translated">Elimina aquest element</target>
</trans-unit>
<trans-unit id="RecentFilesHeader.Text" translate="yes" xml:space="preserve">
<trans-unit id="RecentFiles" translate="yes" xml:space="preserve">
<source>Recent Files</source>
<target state="translated">Arxius recents</target>
</trans-unit>
Expand Down Expand Up @@ -1512,7 +1512,7 @@
<source>Shortcut item</source>
<target state="new">Shortcut item</target>
</trans-unit>
<trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
<trans-unit id="Drives" translate="yes" xml:space="preserve">
<source>Drives</source>
<target state="new">Drives</target>
</trans-unit>
Expand Down Expand Up @@ -1692,7 +1692,7 @@
<source>Dual pane</source>
<target state="new">Dual pane</target>
</trans-unit>
<trans-unit id="FolderWidgetDescription.Text" translate="yes" xml:space="preserve">
<trans-unit id="Folders" translate="yes" xml:space="preserve">
<source>Folders</source>
<target state="new">Folders</target>
</trans-unit>
Expand Down Expand Up @@ -1816,7 +1816,7 @@
<source>Remove Bundle</source>
<target state="new">Remove Bundle</target>
</trans-unit>
<trans-unit id="BundlesWidgetHeader.Text" translate="yes" xml:space="preserve">
<trans-unit id="Bundles" translate="yes" xml:space="preserve">
<source>Bundles</source>
<target state="new">Bundles</target>
</trans-unit>
Expand Down
Loading