From 41527a95b2c48229e76130f83329e6427c20db6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=9F?= <pbhhbff@list.ru>
Date: Thu, 10 Apr 2025 15:34:02 +0300
Subject: [PATCH] 1

---
 App.xaml.cs      |  6 ++++--
 BuyPage.xaml     | 65 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 BuyPage.xaml.cs  | 23 ++++++++++++++------
 MainPage.xaml    | 28 +++++++++++++-----------
 MainPage.xaml.cs | 14 +++++++++---
 MauiProgram.cs   |  7 ++++--
 MyDiplom.csproj  |  3 ++-
 7 files changed, 111 insertions(+), 35 deletions(-)

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 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<toolkit:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MyDiplom.BuyPage">
-    <VerticalStackLayout>
-        <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
-    </VerticalStackLayout>
-</ContentView>
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             x:Class="MyDiplom.BuyPage"
+               Color="Transparent">
+    
+    <Border Stroke="Gray" >
+        <Border.StrokeShape>
+            <RoundRectangle CornerRadius="25"/>
+        </Border.StrokeShape>
+
+        <VerticalStackLayout Padding="20" BackgroundColor="White" Spacing="15">
+
+           
+            <Label Text="ПОПОЛНЕНИЕ СЧЕТА"
+           FontSize="20"
+           FontAttributes="Bold"
+           HorizontalOptions="Center"
+           TextColor="Black" />
+
+            
+            <HorizontalStackLayout Spacing="10"
+                           BackgroundColor="White"
+                           Padding="10,5,0,0"
+                           HeightRequest="50"
+                           VerticalOptions="Center"
+                           HorizontalOptions="Fill">
+            <Entry WidthRequest="300"/>
+            <Label Text="₽"
+               FontSize="18"
+               VerticalOptions="Center" />
+            
+
+           
+            <Button Text="ПОПОЛНИТЬ"
+            BackgroundColor="Black"
+            TextColor="White"
+            FontAttributes="Bold"
+            CornerRadius="10"
+            Padding="10"
+            HorizontalOptions="End"
+            WidthRequest="120"
+            Clicked="BuyButtonCliked"/>
+        
+            </HorizontalStackLayout>
+
+
+            <Label Text="После нажатия кнопки ОПЛАТИТЬ вы будете перенаправлены на платежную систему"
+           FontSize="12"
+           TextColor="Gray"
+           HorizontalOptions="Start"
+           Margin="0,10,0,0" />
+            <Button Text="Закрыть" Clicked="CloseButtonClicked"/>
+
+        </VerticalStackLayout>
+    </Border>
+</toolkit:Popup>
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"              />
 
                 <Label Text="{Binding User.DisplayName}" TextColor="White" />
 
@@ -78,16 +79,12 @@
                         <RoundRectangle CornerRadius="25"/>
                     </Border.StrokeShape>
 
-                    <StackLayout Background="#F3F3F3" 
-         Spacing="2" >
+                    <StackLayout Background="#6D87D3" 
+         Spacing="2" Padding="0,10,0,0">
                         <Label Text="Боты" HorizontalOptions="Center" Scale="2"/>
-                        <Button Text="1"  TextColor="Black" Background="Transparent"/>
-                        <Button Text="1"  TextColor="Black" Background="Transparent"/>
-                        <Button Text="1"  TextColor="Black" Background="Transparent"/>
-                        <Button Text="1"  TextColor="Black" Background="Transparent"/>
-                        <Button Text="1"  TextColor="Black" Background="Transparent"/>
-                        <Button Text="1"  TextColor="Black" Background="Transparent"/>
-                        <Button Text="1"  TextColor="Black" Background="Transparent"/>
+                        <Button Text="TG FREELANCE ПОМОЩНИК"  TextColor="Black" Background="Transparent"/>
+                        <Button Text="Раскрутка TG Группы"  TextColor="Black" Background="Transparent"/>
+                        <Button Text="Интернет Магазин"  TextColor="Black" Background="Transparent"/>
                     </StackLayout>
 
                 </Border>
@@ -119,7 +116,7 @@
                     <VerticalStackLayout Background="#F3F3F3"  HeightRequest="235"  >
 
                         <StackLayout>
-                            <Label Text="Выберите фриланс биржу, с которой хотите работать:" FontSize="45" Padding="1" />
+                            <Label Text="Выберите фриланс биржу, с которой хотите работать:" FontSize="35" Padding="1" />
                         </StackLayout>
                         <StackLayout VerticalOptions="Center" >
                             <StackLayout Padding="10,0,0,0" Orientation="Horizontal" Spacing="10" >
@@ -143,9 +140,16 @@
                                 <Label Text="Kwork" VerticalOptions= "Center"/>
 
                                 <CheckBox Margin="0,0,-25,0"/>
+                               
                                 <Label Text="FL" VerticalOptions= "Center" />
+                                
+                               
                             </StackLayout>
 
+                            <VerticalStackLayout Padding="10,0,15,0"  Spacing="10" HorizontalOptions="Start">
+                                <Button BackgroundColor="Black" WidthRequest="130"   Text="Сохранить" CornerRadius="20"/>
+                            </VerticalStackLayout>
+
 
                         </StackLayout>
 
@@ -173,7 +177,7 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
-                            <VerticalStackLayout  Grid.ColumnSpan="2" Margin="10" >
+                            <VerticalStackLayout  Grid.ColumnSpan="2" Margin="10"  >
                                 <Label Text="Выберите подходящую категорию:" FontSize="18" />
                                 <StackLayout  Orientation="Horizontal" Spacing="10" >
                                     <Button Text="Выделить всё" WidthRequest="130" TextColor="Black" Background="LightSlateGray"  />
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<App>()
-				.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 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="9.1.1" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.71" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>