diff --git a/App.xaml.cs b/App.xaml.cs
index 0e199a4..6231dc8 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -6,7 +6,9 @@
{
InitializeComponent();
- MainPage = new AppShell();
- }
+
+
+ MainPage = new MainPage();
+ }
}
}
diff --git a/BuyPage.xaml b/BuyPage.xaml
index 8abf486..effdf67 100644
--- a/BuyPage.xaml
+++ b/BuyPage.xaml
@@ -1,11 +1,58 @@
-
-
-
-
-
+ xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+ x:Class="MyDiplom.BuyPage"
+ Color="Transparent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BuyPage.xaml.cs b/BuyPage.xaml.cs
index 2bacdfa..f5543d9 100644
--- a/BuyPage.xaml.cs
+++ b/BuyPage.xaml.cs
@@ -1,9 +1,20 @@
+using CommunityToolkit.Maui.Views;
+
namespace MyDiplom;
-public partial class BuyPage : ContentView
+public partial class BuyPage : Popup
{
- public BuyPage()
- {
- InitializeComponent();
- }
-}
\ No newline at end of file
+ public BuyPage()
+ {
+ InitializeComponent();
+ }
+
+ private void CloseButtonClicked(object sender, EventArgs e)
+ {
+ Close();
+ }
+ private void BuyButtonCliked(object sender, EventArgs e)
+ {
+
+ }
+}
diff --git a/MainPage.xaml b/MainPage.xaml
index 3362a34..503abd2 100644
--- a/MainPage.xaml
+++ b/MainPage.xaml
@@ -34,7 +34,8 @@
TextColor="Black"
HorizontalOptions="EndAndExpand"
WidthRequest="110"
- HeightRequest="20"/>
+ HeightRequest="20"
+ Clicked="OnButtonClicked" />
@@ -78,16 +79,12 @@
-
+
-
-
-
-
-
-
-
+
+
+
@@ -119,7 +116,7 @@
-
+
@@ -143,9 +140,16 @@
+
+
+
+
+
+
+
@@ -173,7 +177,7 @@
-
+
diff --git a/MainPage.xaml.cs b/MainPage.xaml.cs
index 5d16e7d..7595a6c 100644
--- a/MainPage.xaml.cs
+++ b/MainPage.xaml.cs
@@ -1,4 +1,9 @@
-using MyDiplom.ViewModels;
+using CommunityToolkit.Maui.Views;
+
+using MyDiplom.ViewModels;
+
+
+
namespace MyDiplom
{
@@ -13,7 +18,10 @@ namespace MyDiplom
this.BindingContext = new UserViewModels();
}
-
+ private void OnButtonClicked(object sender, EventArgs e)
+ {
+ var buyPopup = new BuyPage();
+ this.ShowPopup(buyPopup);
+ }
}
-
}
diff --git a/MauiProgram.cs b/MauiProgram.cs
index 3964b95..1e5e1bd 100644
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@@ -1,4 +1,6 @@
-using Microsoft.Extensions.Logging;
+using CommunityToolkit.Maui;
+
+using Microsoft.Extensions.Logging;
namespace MyDiplom
{
@@ -9,7 +11,8 @@ namespace MyDiplom
var builder = MauiApp.CreateBuilder();
builder
.UseMauiApp()
- .ConfigureFonts(fonts =>
+ .UseMauiCommunityToolkit()
+ .ConfigureFonts(fonts =>
{
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
diff --git a/MyDiplom.csproj b/MyDiplom.csproj
index ed9a8ab..f481f5e 100644
--- a/MyDiplom.csproj
+++ b/MyDiplom.csproj
@@ -58,7 +58,8 @@
-
+
+