combine projects into one

This commit is contained in:
2021-08-11 14:09:03 +08:00
parent 24f39a2e27
commit 521d82829d
34 changed files with 431 additions and 192 deletions

View File

@@ -4,7 +4,8 @@
xmlns:local="clr-namespace:Gallery"
xmlns:r="clr-namespace:Gallery.Resources"
xmlns:ui="clr-namespace:Gallery.Resources.UI"
xmlns:util="clr-namespace:Gallery.Util;assembly=Gallery.Util"
xmlns:util="clr-namespace:Gallery.Util"
xmlns:v="clr-namespace:Gallery.Views"
x:Class="Gallery.AppShell"
x:Name="appShell"
BackgroundColor="{DynamicResource NavigationColor}"
@@ -15,18 +16,18 @@
<Shell.Resources>
<ResourceDictionary>
<Style x:Key="BaseStyle" TargetType="Element">
<Setter Property="Shell.BackgroundColor" Value="{DynamicResource NavigationColor}" />
<Setter Property="Shell.ForegroundColor" Value="{DynamicResource TintColor}" />
<Setter Property="Shell.TitleColor" Value="{DynamicResource TextColor}" />
<Setter Property="Shell.DisabledColor" Value="#B4FFFFFF" />
<Setter Property="Shell.UnselectedColor" Value="{DynamicResource TintColor}" />
<Setter Property="Shell.TabBarBackgroundColor" Value="{DynamicResource NavigationColor}" />
<Setter Property="Shell.BackgroundColor" Value="{DynamicResource NavigationColor}"/>
<Setter Property="Shell.ForegroundColor" Value="{DynamicResource TintColor}"/>
<Setter Property="Shell.TitleColor" Value="{DynamicResource TextColor}"/>
<Setter Property="Shell.DisabledColor" Value="#B4FFFFFF"/>
<Setter Property="Shell.UnselectedColor" Value="{DynamicResource TintColor}"/>
<Setter Property="Shell.TabBarBackgroundColor" Value="{DynamicResource NavigationColor}"/>
<Setter Property="Shell.TabBarForegroundColor" Value="{DynamicResource TintColor}"/>
<Setter Property="Shell.TabBarUnselectedColor" Value="{DynamicResource TintColor}"/>
<Setter Property="Shell.TabBarTitleColor" Value="{DynamicResource TextColor}"/>
</Style>
<Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}" />
<Style TargetType="FlyoutItem" BasedOn="{StaticResource BaseStyle}" />
<Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}"/>
<Style TargetType="FlyoutItem" BasedOn="{StaticResource BaseStyle}"/>
<!--
Custom Style you can apply to any Flyout Item
<Style Class="MenuItemLayoutStyle" TargetType="Layout" ApplyToDerivedTypes="True">
@@ -35,7 +36,7 @@
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal">
<VisualState.Setters>
<Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{DynamicResource Primary}" />
<Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{DynamicResource Primary}"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
@@ -109,10 +110,17 @@
-->
<FlyoutItem x:Name="flyoutItems"
FlyoutDisplayOptions="AsMultipleItems"
Route="{x:Static util:Routes.Gallery}" />
Route="{x:Static util:Routes.Gallery}"/>
<FlyoutItem FlyoutIcon="{DynamicResource FontIconOption}"
Title="{r:Text Option}"
Route="{x:Static util:Routes.Option}">
<Tab>
<ShellContent ContentTemplate="{DataTemplate v:OptionPage}"/>
</Tab>
</FlyoutItem>
<!-- When the Flyout is visible this will be a menu item you can tie a click behavior to -->
<!--<MenuItem Text="Logout" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked" />-->
<!--<MenuItem Text="Logout" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked"/>-->
<!--
TabBar lets you define content that won't show up in a flyout menu. When this content is active
@@ -121,7 +129,7 @@
content you can do so by calling
await Shell.Current.GoToAsync("//LoginPage");
<TabBar>
<ShellContent Route="LoginPage" ContentTemplate="{DataTemplate local:LoginPage}" />
<ShellContent Route="LoginPage" ContentTemplate="{DataTemplate local:LoginPage}"/>
</TabBar>
-->