From 9cc2481f563e792b82ecd37d340f2aae02d13803 Mon Sep 17 00:00:00 2001 From: Jaloliddin | Jm7Uz <87977243+jm7uz@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:54:42 +0500 Subject: [PATCH] A new User interface window has been created. Fixed MainWindow bugs. Added nav bar. --- src/Shamsheer.Messenger.Desktop/App.xaml | 3 +- src/Shamsheer.Messenger.Desktop/App.xaml.cs | 22 +- .../MainWindow.xaml | 114 +++++-- .../MainWindow.xaml.cs | 37 ++ .../Pages/Home.xaml | 113 ------- .../Pages/RegistrPage.xaml | 316 +++++++++--------- .../Pages/RegistrPage.xaml.cs | 7 +- .../Windows/Home.xaml | 165 +++++++++ .../{Pages => Windows}/Home.xaml.cs | 42 +-- 9 files changed, 477 insertions(+), 342 deletions(-) delete mode 100644 src/Shamsheer.Messenger.Desktop/Pages/Home.xaml create mode 100644 src/Shamsheer.Messenger.Desktop/Windows/Home.xaml rename src/Shamsheer.Messenger.Desktop/{Pages => Windows}/Home.xaml.cs (78%) diff --git a/src/Shamsheer.Messenger.Desktop/App.xaml b/src/Shamsheer.Messenger.Desktop/App.xaml index d622705..c53426d 100644 --- a/src/Shamsheer.Messenger.Desktop/App.xaml +++ b/src/Shamsheer.Messenger.Desktop/App.xaml @@ -1,8 +1,7 @@  + xmlns:local="clr-namespace:Shamsheer.Messenger.Desktop"> diff --git a/src/Shamsheer.Messenger.Desktop/App.xaml.cs b/src/Shamsheer.Messenger.Desktop/App.xaml.cs index 7d40007..d6a5925 100644 --- a/src/Shamsheer.Messenger.Desktop/App.xaml.cs +++ b/src/Shamsheer.Messenger.Desktop/App.xaml.cs @@ -1,4 +1,5 @@ -using System; +using Shamsheer.Messenger.Desktop.Windows; +using System; using System.Collections.Generic; using System.Configuration; using System.Data; @@ -13,5 +14,24 @@ namespace Shamsheer.Messenger.Desktop /// public partial class App : Application { + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + + this.ShutdownMode = ShutdownMode.OnLastWindowClose; + + bool userSignin = true; + + if (userSignin) + { + var mainWindow = new MainWindow(); + mainWindow.Show(); + } + else + { + var userWindow = new Home(); + userWindow.Show(); + } + } } } diff --git a/src/Shamsheer.Messenger.Desktop/MainWindow.xaml b/src/Shamsheer.Messenger.Desktop/MainWindow.xaml index c45bd64..c02044f 100644 --- a/src/Shamsheer.Messenger.Desktop/MainWindow.xaml +++ b/src/Shamsheer.Messenger.Desktop/MainWindow.xaml @@ -2,64 +2,106 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:Shamsheer.Messenger.Desktop" mc:Ignorable="d" - Title="Shamsheer" - MinHeight="540" MinWidth="430"> + Background="#17212B" + WindowStyle="None" + Title="Shamsheer Desktop" + Height="550" Width="700" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + VerticalAlignment="Center"> + FontSize="25" + HorizontalAlignment="Center" + FontWeight="Bold" + Foreground="Snow" + Margin="0,30,0,0"/> + FontSize="14" + HorizontalAlignment="Center" + Foreground="Gray" + Margin="0,10,0,0"/> + FontSize="14" + HorizontalAlignment="Center" + Foreground="Gray" + Margin="0,10,0,0"/> - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shamsheer.Messenger.Desktop/Pages/RegistrPage.xaml.cs b/src/Shamsheer.Messenger.Desktop/Pages/RegistrPage.xaml.cs index a13d9f0..cfa93cd 100644 --- a/src/Shamsheer.Messenger.Desktop/Pages/RegistrPage.xaml.cs +++ b/src/Shamsheer.Messenger.Desktop/Pages/RegistrPage.xaml.cs @@ -1,4 +1,5 @@ -using System; +using Shamsheer.Messenger.Desktop.Windows; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -32,7 +33,9 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e) private void SignUpButton_Click(object sender, RoutedEventArgs e) { - + var homeWindow = new Home(); + homeWindow.Show(); + Window.GetWindow(this)?.Close(); } } } diff --git a/src/Shamsheer.Messenger.Desktop/Windows/Home.xaml b/src/Shamsheer.Messenger.Desktop/Windows/Home.xaml new file mode 100644 index 0000000..1bbc443 --- /dev/null +++ b/src/Shamsheer.Messenger.Desktop/Windows/Home.xaml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shamsheer.Messenger.Desktop/Pages/Home.xaml.cs b/src/Shamsheer.Messenger.Desktop/Windows/Home.xaml.cs similarity index 78% rename from src/Shamsheer.Messenger.Desktop/Pages/Home.xaml.cs rename to src/Shamsheer.Messenger.Desktop/Windows/Home.xaml.cs index 6b85aeb..bd0fed0 100644 --- a/src/Shamsheer.Messenger.Desktop/Pages/Home.xaml.cs +++ b/src/Shamsheer.Messenger.Desktop/Windows/Home.xaml.cs @@ -1,5 +1,6 @@ using Shamsheer.Messenger.Desktop.Components; using Shamsheer.Messenger.Desktop.Models; +using Shamsheer.Messenger.Desktop.Pages; using System; using System.Collections.Generic; using System.Linq; @@ -14,22 +15,21 @@ using System.Windows.Media; using System.Windows.Media.Animation; using System.Windows.Media.Imaging; -using System.Windows.Navigation; using System.Windows.Shapes; -namespace Shamsheer.Messenger.Desktop.Pages +namespace Shamsheer.Messenger.Desktop.Windows { /// /// Interaction logic for Home.xaml /// - public partial class Home : Page + public partial class Home : Window { - private Window ParentWindow => Window.GetWindow(this); public Home() { InitializeComponent(); } + List GLOBAL_USERS = new List(); private void drag_grid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { if (e.ClickCount == 2) @@ -38,34 +38,34 @@ private void drag_grid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e } else { - ParentWindow?.DragMove(); + this.DragMove(); } } private void minimize_btn_Click(object sender, RoutedEventArgs e) { - ParentWindow.WindowState = WindowState.Minimized; + this.WindowState = WindowState.Minimized; } private void maximize_btn_Click(object sender, RoutedEventArgs e) { - if (ParentWindow.WindowState == WindowState.Normal) + if (this.WindowState == WindowState.Normal) { windowGrid.Margin = new Thickness(8, 10, 10, 10); - ParentWindow.WindowStyle = WindowStyle.SingleBorderWindow; - ParentWindow.WindowState = WindowState.Maximized; - ParentWindow.WindowStyle = WindowStyle.None; + WindowStyle = WindowStyle.SingleBorderWindow; + WindowState = WindowState.Maximized; + WindowStyle = WindowStyle.None; } else { - ParentWindow.WindowState = WindowState.Normal; + this.WindowState = WindowState.Normal; windowGrid.Margin = new Thickness(0); } } private void close_btn_Click(object sender, RoutedEventArgs e) { - ParentWindow.Close(); + this.Close(); } private void OpenMenu_Btn_Click(object sender, RoutedEventArgs e) @@ -139,7 +139,6 @@ await Task.Run(() => }); }); thread.Start(); - } public void menuClose() @@ -159,23 +158,6 @@ public void menuClose() private async void searchTxt_TextChanged(object sender, TextChangedEventArgs e) { string text = searchTxt.Text.ToLower(); - - - //foreach (var user in all) - //{ - // await Task.Run(() => - // { - // this.Dispatcher.Invoke(() => - // { - // var pri = new Private(); - // pri.username.Text = user.firstname + " " + user.lastname; - // pri.friend_name.Text = user.friend_name; - // pri.friend_message.Text = user.friend_message; - // pri.updated_at.Text = user.updated_at.ToString(); - // usersPanel.Items.Add(pri); - // }); - // }); - //} } } }