chore: Cleaning up code
This commit is contained in:
Родитель
a40bb11c2d
Коммит
d4686c741a
|
@ -14,6 +14,6 @@
|
|||
</ResourceDictionary.MergedDictionaries>
|
||||
</ResourceDictionary>
|
||||
</Application.Resources>
|
||||
<!-- Add resources here -->
|
||||
|
||||
|
||||
</Application>
|
||||
|
|
|
@ -74,8 +74,6 @@ public partial class App : Application
|
|||
MainWindow = builder.Window;
|
||||
|
||||
Host = await builder.NavigateAsync<Shell>();
|
||||
|
||||
//MainWindow.Content = new MainPage();
|
||||
}
|
||||
|
||||
private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<!-- Load WinUI resources -->
|
||||
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
|
||||
<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
|
||||
ColorOverrideSource="ms-appx:///MauiEmbedding/Styles/ColorPaletteOverride.xaml"
|
||||
FontOverrideSource="ms-appx:///MauiEmbedding/Styles/MaterialFontsOverride.xaml" />
|
||||
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
<!-- Add resources here -->
|
||||
|
||||
</ResourceDictionary>
|
|
@ -1,4 +1,4 @@
|
|||
<Project Sdk="Uno.Sdk">
|
||||
<Project Sdk="Uno.Sdk">
|
||||
<Import Project="..\..\..\src\tfms-ui-maui.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
|
@ -31,10 +31,8 @@
|
|||
-->
|
||||
<UnoFeatures>
|
||||
Material;
|
||||
Dsp;
|
||||
Toolkit;
|
||||
Mvvm;
|
||||
ThemeService;
|
||||
Mvvm;
|
||||
</UnoFeatures>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
@ -35,6 +35,6 @@
|
|||
</ResourceDictionary>
|
||||
</Application.Resources>
|
||||
|
||||
<!-- Add resources here -->
|
||||
|
||||
|
||||
</Application>
|
||||
|
|
|
@ -11,6 +11,6 @@
|
|||
</ResourceDictionary>
|
||||
</Application.Resources>
|
||||
|
||||
<!-- Add resources here -->
|
||||
|
||||
|
||||
</Application>
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
<!-- Load Uno.UI.Toolkit resources -->
|
||||
<ToolkitResources xmlns="using:Uno.Toolkit.UI" />
|
||||
|
||||
<!--<MaterialColors xmlns="using:Uno.Material" />
|
||||
<MaterialFonts xmlns="using:Uno.Material" />-->
|
||||
<MaterialResources xmlns="using:Uno.Material" />
|
||||
|
||||
<MaterialToolkitResources xmlns="using:Uno.Toolkit.UI.Material" />
|
||||
|
@ -23,7 +21,6 @@
|
|||
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<!-- Add resources here -->
|
||||
<x:Double x:Key="WideMinWindowWidth">800</x:Double>
|
||||
|
||||
<Style TargetType="utu:LoadingView">
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
Toolkit;
|
||||
Mvvm;
|
||||
</UnoFeatures>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)'=='Debug' or '$(IsUiAutomationMappingEnabled)'=='True'">
|
||||
|
|
Загрузка…
Ссылка в новой задаче