Skip to content

Commit

Permalink
Various UI updates
Browse files Browse the repository at this point in the history
  • Loading branch information
gus33000 committed Jul 7, 2021
1 parent f414304 commit dab0295
Show file tree
Hide file tree
Showing 9 changed files with 288 additions and 135 deletions.
10 changes: 1 addition & 9 deletions App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" Version="Latest" />
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" ControlsResourcesVersion="Version2" />
<flui:FluiFrameworkThemeResources/>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
Expand All @@ -18,17 +18,9 @@
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<x:Double x:Key="NavigationViewTopPaneHeight">80</x:Double>

<media:AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeMediumLowColor}" TintOpacity="0.7" FallbackColor="{StaticResource SystemChromeMediumLowColor}"/>
<media:AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeMediumLowColor}" TintOpacity="0.7" FallbackColor="{StaticResource SystemChromeMediumLowColor}"/>
<media:AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeMediumLowColor}" TintOpacity="0.7" FallbackColor="{StaticResource SystemChromeMediumLowColor}"/>
</ResourceDictionary>
<ResourceDictionary x:Key="Light">
<x:Double x:Key="NavigationViewTopPaneHeight">80</x:Double>

<media:AcrylicBrush x:Key="NavigationViewDefaultPaneBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeMediumLowColor}" TintOpacity="0.7" FallbackColor="{StaticResource SystemChromeMediumLowColor}"/>
<media:AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeMediumLowColor}" TintOpacity="0.7" FallbackColor="{StaticResource SystemChromeMediumLowColor}"/>
<media:AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource SystemChromeMediumLowColor}" TintOpacity="0.7" FallbackColor="{StaticResource SystemChromeMediumLowColor}"/>
</ResourceDictionary>
<ResourceDictionary x:Key="HighContrast">
</ResourceDictionary>
Expand Down
2 changes: 1 addition & 1 deletion Chat.BackgroundTasks/Chat.BackgroundTasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>Chat.BackgroundTasks</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
Expand Down
2 changes: 1 addition & 1 deletion Chat.Common/Chat.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>Chat.Common</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
Expand Down
6 changes: 4 additions & 2 deletions Chat.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>Chat</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
Expand All @@ -28,6 +28,8 @@
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
<PackageCertificateKeyFile />
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -230,7 +232,7 @@
<Version>6.1.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.6.0-prerelease.210129001</Version>
<Version>2.6.0-prerelease.210623001</Version>
</PackageReference>
<PackageReference Include="MvvmLightLibs">
<Version>5.4.1.1</Version>
Expand Down
133 changes: 91 additions & 42 deletions Controls/TitlebarControl.xaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,93 @@
<UserControl
x:Class="Chat.Controls.TitlebarControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Chat.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
d:DesignHeight="300"
d:DesignWidth="400">

<Grid x:Name="CustomTitleBar">
<Canvas
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />

<Grid Visibility="Collapsed"
Width="48"
HorizontalAlignment="Left">
<Rectangle
x:Name="BackButtonBg"
Fill="{ThemeResource SystemControlForegroundAccentBrush}"
Visibility="Collapsed" />
<TextBlock
x:Name="Arrow"
Width="13"
Margin="-1,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Segoe MDL2 Assets"
FontSize="16"
FontStretch="ExtraCondensed"
Opacity="0.5"
Text="" />
<UserControl x:Class="Chat.Controls.TitlebarControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Chat.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="300"
d:DesignWidth="400"
mc:Ignorable="d">

<Grid x:Name="CustomTitleBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Grid.ColumnDefinitions>
<!-- Back Button -->
<ColumnDefinition Width="Auto" />
<!-- App Icon -->
<ColumnDefinition Width="48" />
<!-- Title -->
<ColumnDefinition Width="Auto" />
<!-- Main Area -->
<ColumnDefinition Width="*" />
<!-- Title -->
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<Grid Grid.ColumnSpan="5" Height="4" VerticalAlignment="Top">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<Rectangle x:Name="RedIndicator"
Grid.Column="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Fill="Red"
Opacity="0.5"
Visibility="Collapsed" />

<Rectangle x:Name="OrangeIndicator"
Grid.Column="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Fill="Orange"
Opacity="0.5"
Visibility="Collapsed" />

<Rectangle x:Name="YellowIndicator"
Grid.Column="2"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Fill="Yellow"
Opacity="0.5"
Visibility="Collapsed" />
</Grid>
<TextBlock
x:Name="WindowTitle"
Margin="12,0,0,0"
VerticalAlignment="Center"
FontSize="12"
TextTrimming="CharacterEllipsis"/>

<Image x:Name="AppFontIcon"
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Source="ms-appx:///Assets/ApplicationLogos/AppIcon/Square44x44Logo.png"
Width="16"
Height="16" />

<TextBlock x:Name="WindowTitle"
Grid.Column="2"
VerticalAlignment="Center"
Margin="12,0,0,0"
Style="{StaticResource CaptionTextBlockStyle}"/>

<Canvas x:Name="TitlebarCanvas"
Grid.ColumnSpan="5"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="Transparent" />

<Button x:Name="BackButton"
Grid.Row="0"
Style="{ThemeResource NavigationBackButtonNormalStyle}"
Width="48"
Click="Back_Click"
Visibility="Collapsed" />

<Button x:Name="AttachDebuggerButton"
Grid.Column="4"
Click="AttachDebuggerButton_Click"
Background="Transparent"
Visibility="Collapsed"
BorderBrush="Transparent">
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xEBE8;" FontSize="14" />
</Button>
</Grid>
</UserControl>
</UserControl>
Loading

0 comments on commit dab0295

Please sign in to comment.