Update namespaces
This commit is contained in:
Brandon Minnick
Родитель
305a33d545
Коммит
c74c9d58bb
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:Class="MvvmSampleXF.App">
|
||||
x:Class="MvvmSampleMAUI.App">
|
||||
<Application.Resources>
|
||||
<Color x:Key="PrimaryColor">#3750D1</Color>
|
||||
<Color x:Key="FrameBackgroundColorDark">#1AFFFFFF</Color>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:controls="clr-namespace:MvvmSampleXF.Controls"
|
||||
xmlns:views="clr-namespace:MvvmSampleXF.Views"
|
||||
x:Class="MvvmSampleXF.AppShell">
|
||||
xmlns:controls="clr-namespace:MvvmSampleMAUI.Controls"
|
||||
xmlns:views="clr-namespace:MvvmSampleMAUI.Views"
|
||||
x:Class="MvvmSampleMAUI.AppShell">
|
||||
<Shell.FlyoutHeader>
|
||||
<controls:FlyoutHeader />
|
||||
</Shell.FlyoutHeader>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="MvvmSampleXF.Controls.FlyoutHeader">
|
||||
x:Class="MvvmSampleMAUI.Controls.FlyoutHeader">
|
||||
<Grid BackgroundColor="{AppThemeBinding Dark=Black, Light=White}">
|
||||
<Image Aspect="AspectFill"
|
||||
Source="headerBg"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:Class="MvvmSampleXF.Controls.InteractiveSample">
|
||||
x:Class="MvvmSampleMAUI.Controls.InteractiveSample">
|
||||
<ContentView.Resources>
|
||||
<ControlTemplate x:Key="InteractiveSampleTemplate">
|
||||
<Border CornerRadius="4"
|
||||
|
|
|
|||
|
|
@ -3,9 +3,10 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
xmlns:controls="clr-namespace:MvvmSampleXF.Controls"
|
||||
xmlns:converters="clr-namespace:MvvmSampleXF.Converters"
|
||||
x:Class="MvvmSampleXF.Views.AsyncRelayCommandPage"
|
||||
xmlns:controls="clr-namespace:MvvmSampleMAUI.Controls"
|
||||
xmlns:converters="clr-namespace:MvvmSampleMAUI.Converters"
|
||||
xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
|
||||
x:Class="MvvmSampleMAUI.Views.AsyncRelayCommandPage"
|
||||
x:DataType="vm:AsyncRelayCommandPageViewModel"
|
||||
Title="Commands">
|
||||
<ContentPage.Resources>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:Class="MvvmSampleXF.Views.BuildingTheUIPage"
|
||||
x:Class="MvvmSampleMAUI.Views.BuildingTheUIPage"
|
||||
x:DataType="vm:SamplePageViewModel"
|
||||
Title="Building the UI">
|
||||
<ScrollView Padding="16">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:Class="MvvmSampleXF.Views.IntroductionPage"
|
||||
x:Class="MvvmSampleMAUI.Views.IntroductionPage"
|
||||
x:DataType="vm:ObservableObjectPageViewModel"
|
||||
Title="Introduction">
|
||||
<ScrollView Padding="16">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:Class="MvvmSampleXF.Views.IoCPage"
|
||||
x:Class="MvvmSampleMAUI.Views.IoCPage"
|
||||
x:DataType="vm:IocPageViewModel"
|
||||
Title="Inversion of Control">
|
||||
<ScrollView Padding="16">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:Class="MvvmSampleXF.Views.MessengerPage"
|
||||
x:Class="MvvmSampleMAUI.Views.MessengerPage"
|
||||
x:DataType="vm:MessengerPageViewModel"
|
||||
Title="Messenger">
|
||||
<ScrollView Padding="16">
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
xmlns:controls="clr-namespace:MvvmSampleXF.Controls"
|
||||
x:Class="MvvmSampleXF.Views.MessengerRequestPage"
|
||||
xmlns:controls="clr-namespace:MvvmSampleMAUI.Controls"
|
||||
x:Class="MvvmSampleMAUI.Views.MessengerRequestPage"
|
||||
Title="Messenger">
|
||||
<ScrollView Padding="16">
|
||||
<VerticalStackLayout Padding="16">
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
xmlns:controls="clr-namespace:MvvmSampleXF.Controls"
|
||||
x:Class="MvvmSampleXF.Views.MessengerSendPage"
|
||||
xmlns:controls="clr-namespace:MvvmSampleMAUI.Controls"
|
||||
x:Class="MvvmSampleMAUI.Views.MessengerSendPage"
|
||||
x:DataType="vm:MessengerPageViewModel"
|
||||
Title="Messenger">
|
||||
<ScrollView Padding="16">
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
xmlns:controls="clr-namespace:MvvmSampleXF.Controls"
|
||||
x:Class="MvvmSampleXF.Views.ObservableObjectPage"
|
||||
xmlns:controls="clr-namespace:MvvmSampleMAUI.Controls"
|
||||
x:Class="MvvmSampleMAUI.Views.ObservableObjectPage"
|
||||
x:DataType="vm:ObservableObjectPageViewModel"
|
||||
Title="ObservableObject">
|
||||
<ScrollView Padding="16">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:Class="MvvmSampleXF.Views.PuttingThingsTogetherPage"
|
||||
x:Class="MvvmSampleMAUI.Views.PuttingThingsTogetherPage"
|
||||
x:DataType="vm:SamplePageViewModel">
|
||||
<ScrollView Padding="16">
|
||||
<VerticalStackLayout Spacing="16">
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:controls="clr-namespace:MvvmSampleXF.Controls"
|
||||
xmlns:controls="clr-namespace:MvvmSampleMAUI.Controls"
|
||||
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
|
||||
xmlns:widgets="clr-namespace:MvvmSampleXF.Views.Widgets"
|
||||
x:Class="MvvmSampleXF.Views.RedditBrowserPage"
|
||||
xmlns:widgets="clr-namespace:MvvmSampleMAUI.Views.Widgets"
|
||||
x:Class="MvvmSampleMAUI.Views.RedditBrowserPage"
|
||||
Title="The Final Result!">
|
||||
<Grid Padding="16">
|
||||
<controls:InteractiveSample ControlTemplate="{StaticResource InteractiveSampleTemplate}">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:DataType="vm:SamplePageViewModel"
|
||||
x:Class="MvvmSampleXF.Views.RedditServicePage"
|
||||
x:Class="MvvmSampleMAUI.Views.RedditServicePage"
|
||||
Title="Creating a Service">
|
||||
<ScrollView Padding="16">
|
||||
<VerticalStackLayout Spacing="16">
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:controls="clr-namespace:MvvmSampleXF.Controls"
|
||||
x:Class="MvvmSampleXF.Views.RelayCommandPage"
|
||||
xmlns:controls="clr-namespace:MvvmSampleMAUI.Controls"
|
||||
x:Class="MvvmSampleMAUI.Views.RelayCommandPage"
|
||||
x:DataType="vm:RelayCommandPageViewModel"
|
||||
Title="Commands">
|
||||
<ScrollView Padding="16">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="MvvmSampleXF.Views.SettingUpTheViewModelsPage"
|
||||
x:Class="MvvmSampleMAUI.Views.SettingUpTheViewModelsPage"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:DataType="vm:SamplePageViewModel"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="MvvmSampleXF.Views.SettingsServicePage"
|
||||
x:Class="MvvmSampleMAUI.Views.SettingsServicePage"
|
||||
xmlns:vm="clr-namespace:MvvmSample.Core.ViewModels;assembly=MvvmSample.Core"
|
||||
xmlns:md="clr-namespace:Xam.Forms.Markdown;assembly=Xam.Forms.MarkdownView"
|
||||
x:DataType="vm:SamplePageViewModel"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:widgets="clr-namespace:MvvmSample.Core.ViewModels.Widgets;assembly=MvvmSample.Core"
|
||||
xmlns:converters="clr-namespace:MvvmSampleXF.Converters"
|
||||
x:Class="MvvmSampleXF.Views.Widgets.PostWidget">
|
||||
xmlns:converters="clr-namespace:MvvmSampleMAUI.Converters"
|
||||
x:Class="MvvmSampleMAUI.Views.Widgets.PostWidget">
|
||||
<ContentView.Resources>
|
||||
<converters:IsSelfPostToWidthRequestConverter WidthRequest="160"
|
||||
x:Key="IsSelfPostToWidthRequestConverter" />
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
|
||||
xmlns:models="clr-namespace:MvvmSample.Core.Models;assembly=MvvmSample.Core"
|
||||
xmlns:widgets="clr-namespace:MvvmSample.Core.ViewModels.Widgets;assembly=MvvmSample.Core"
|
||||
xmlns:converters="clr-namespace:MvvmSampleXF.Converters"
|
||||
x:Class="MvvmSampleXF.Views.Widgets.SubredditWidget">
|
||||
xmlns:converters="clr-namespace:MvvmSampleMAUI.Converters"
|
||||
x:Class="MvvmSampleMAUI.Views.Widgets.SubredditWidget">
|
||||
<ContentView.Resources>
|
||||
<converters:IsSelfPostToWidthRequestConverter WidthRequest="120"
|
||||
x:Key="IsSelfPostToWidthRequestConverter" />
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче