Путь к Магазину. Работа с авторизацией

MilkRen · May 15, 2024 · 4d0db5f · 4d0db5f
1 parent e17d6a0
commit 4d0db5f
Show file tree

Hide file tree

Showing 36 changed files with 563 additions and 183 deletions.
diff --git a/LauncherDM/App.config b/LauncherDM/App.config
@@ -17,6 +17,9 @@
             <setting name="Token" serializeAs="String">
                 <value />
             </setting>
+            <setting name="OfflineMode" serializeAs="String">
+                <value>False</value>
+            </setting>
         </LauncherDM.Properties.SettingsApp>
         <LauncherDM.Source.Settings.SettingsApp>
             <setting name="AccessToken" serializeAs="String">

diff --git a/LauncherDM/App.xaml b/LauncherDM/App.xaml
@@ -8,6 +8,8 @@
 
                 <ResourceDictionary Source="Styles/Other/DockPanelStyles.xaml"/>
                 <ResourceDictionary Source="Styles/Other/LabelStyle.xaml"/>
+                <ResourceDictionary Source="Styles/Other/TextBoxStyle.xaml"/>
+                <ResourceDictionary Source="Styles/Other/TextBlockStyle.xaml"/>
                 <ResourceDictionary Source="Styles/Other/BorderStyle.xaml"/>
                 <ResourceDictionary Source="Styles/Other/ButtonStyle.xaml"/>
                 <ResourceDictionary Source="Styles/Other/ContextMenuStyle.xaml"/>

diff --git a/LauncherDM/Models/StaticFields.cs b/LauncherDM/Models/StaticFields.cs
@@ -0,0 +1,9 @@
+using System.Reflection;
+
+namespace LauncherDM.Models
+{
+    class StaticFields
+    {
+        public static string VersionPatch => Assembly.GetExecutingAssembly().GetName().Version?.ToString();
+    }
+}
diff --git a/LauncherDM/Properties/Resources.Designer.cs b/LauncherDM/Properties/Resources.Designer.cs
diff --git a/LauncherDM/Properties/Resources.en.resx b/LauncherDM/Properties/Resources.en.resx
@@ -59,4 +59,16 @@
 	<data name="Email" xml:space="preserve">
 		<value>Email</value>
 	</data>
+	<data name="Version" xml:space="preserve">
+		<value>Version:</value>
+	</data>
+	<data name="Settings" xml:space="preserve">
+		<value>Settings</value>
+	</data>
+	<data name="SettingsSmall" xml:space="preserve">
+		<value>Small settings</value>
+	</data>
+	<data name="AboutSmallText" xml:space="preserve">
+		<value>This program was created by a small enthusiast!</value>
+	</data>
 </root>
diff --git a/LauncherDM/Properties/Resources.resx b/LauncherDM/Properties/Resources.resx
@@ -146,4 +146,16 @@
 	<data name="Email" xml:space="preserve">
 		<value>Почта</value>
 	</data>
+	<data name="Version" xml:space="preserve">
+		<value>Версия:</value>
+	</data>
+	<data name="Settings" xml:space="preserve">
+		<value>Настройки</value>
+	</data>
+	<data name="SettingsSmall" xml:space="preserve">
+		<value>Маленькие настройки</value>
+	</data>
+	<data name="AboutSmallText" xml:space="preserve">
+		<value>Данная программа была создана маленьким энтузиастом!</value>
+	</data>
 </root>
diff --git a/LauncherDM/Properties/SettingsApp.Designer.cs b/LauncherDM/Properties/SettingsApp.Designer.cs
diff --git a/LauncherDM/Properties/SettingsApp.settings b/LauncherDM/Properties/SettingsApp.settings
@@ -11,5 +11,8 @@
     <Setting Name="Token" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="OfflineMode" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/LauncherDM/Services/DialogWindowService.cs b/LauncherDM/Services/DialogWindowService.cs
@@ -23,7 +23,8 @@ public void OpenWindow(object viewModel)
             {
                 var authorization = new AuthorizationWindow();
                 authorization.DataContext = new AuthorizationWindowViewModel(authorization.DragMove ,authorization.Close,
-                    new ToolbarToWindowViewModel(new WindowService(authorization), visibilitySettings: Visibility.Visible)); 
+                    new ToolbarToWindowViewModel(new WindowService(authorization), visibilitySettings: Visibility.Visible));
+                authorization.Owner = Application.Current.MainWindow;
                 authorization.Show();
                 return;
             }
@@ -35,6 +36,15 @@ public void OpenWindow(object viewModel)
                 regAndLogWindow.Show();
                 return;
             }
+            else if (viewModel is ToolbarToWindowViewModel)
+            {
+                var settingsMini = new SettingsMiniWindow();
+                settingsMini.DataContext = new SettingsMiniWindowViewModel(settingsMini.DragMove, 
+                    new ToolbarToWindowViewModel(new WindowService(settingsMini), settingsMini.Close, visibilityMinBut:Visibility.Hidden),
+                    new ResourcesHelperService());
+                settingsMini.ShowDialog();
+                return;
+            }
             else if (viewModel is RegAndLogWindowViewModel)
             {
                 var mainWindow = new MainWindow(); 

diff --git a/LauncherDM/Services/Interfaces/IWindowAnimationsService.cs b/LauncherDM/Services/Interfaces/IWindowAnimationsService.cs
diff --git a/LauncherDM/Services/LoadingWindowService.cs b/LauncherDM/Services/LoadingWindowService.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using LauncherDM.Models;
 using LauncherDM.Services.Interfaces;
 using ServerTCP;
 
@@ -27,7 +28,7 @@ public string GetTitle()
 
         public bool CheckUpdate()
         {
-            var version = Assembly.GetExecutingAssembly().GetName().Version?.ToString();
+            var version = StaticFields.VersionPatch;
             var requestMessageServer = _serverRequest.SendMessageRequest(MessageHeader.MessageType.Version);
             return requestMessageServer?.Message.ToString() == version;
         }

diff --git a/LauncherDM/Services/ResourcesHelperService.cs b/LauncherDM/Services/ResourcesHelperService.cs
@@ -2,12 +2,11 @@
 using LauncherDM.Services.Interfaces;
 using ServerTCP;
 using System.Globalization;
-using System.Threading;
 using LauncherDM.Properties;
 
 namespace LauncherDM.Services
 {
-    class ResourcesHelperService : IResourcesHelperService
+    internal class ResourcesHelperService : IResourcesHelperService
     {
         public string LocalizationGet(string resource)
         {

diff --git a/LauncherDM/Services/WindowAnimationsService.cs b/LauncherDM/Services/WindowAnimationsService.cs
diff --git a/LauncherDM/Styles/Other/ButtonStyle.xaml b/LauncherDM/Styles/Other/ButtonStyle.xaml
@@ -57,7 +57,28 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ButtonLanguages" TargetType="Button">
+        <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <StackPanel Orientation="Horizontal" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+                        <Label FontSize="{TemplateBinding FontSize}" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Ellipse Fill="White" Width="15" Height="15" />
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+    </Style>
+
     <Style x:Key="ButtonRegistrationAccount" TargetType="Button">
+        <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
         <Setter Property="Height" Value="30"/>
         <Setter Property="Width" Value="125"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
@@ -286,6 +307,7 @@
     </Style>
 
     <Style x:Key="ButtonForgot" TargetType="Button">
+        <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Width" Value="36"/>
         <Setter Property="Height" Value="36"/>

diff --git a/LauncherDM/Styles/Other/TextBlockStyle.xaml b/LauncherDM/Styles/Other/TextBlockStyle.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="ToolTipTextBlock" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+
+</ResourceDictionary>
diff --git a/LauncherDM/Styles/Other/TextBoxStyle.xaml b/LauncherDM/Styles/Other/TextBoxStyle.xaml
@@ -0,0 +1,19 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="DescFont" TargetType="TextBox">
+        <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Style.Triggers>
+            <EventTrigger RoutedEvent="Button.Loaded">
+                <BeginStoryboard>
+                    <Storyboard>
+                        <DoubleAnimation Storyboard.TargetProperty="Opacity" From="1"  To="0.5" Duration="0:0:1" AutoReverse="True"  RepeatBehavior="Forever"/>
+                    </Storyboard>
+                </BeginStoryboard>
+            </EventTrigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
diff --git a/LauncherDM/ViewModels/AuthorizationWindowViewModel.cs b/LauncherDM/ViewModels/AuthorizationWindowViewModel.cs
@@ -89,7 +89,7 @@ private void OnMoveWindowCommandExecuted(object p)
 
         #region Ctor
 
-        public AuthorizationWindowViewModel(Action dragMove, Action closeWindowAction ,ToolbarToWindowViewModel toolbarVM)
+        public AuthorizationWindowViewModel(Action dragMove, Action closeWindowAction, ToolbarToWindowViewModel toolbarVM)
         {
             _dragMoveAction = dragMove;
             _closeAction = closeWindowAction;

diff --git a/LauncherDM/ViewModels/LoadingWindowViewModel.cs b/LauncherDM/ViewModels/LoadingWindowViewModel.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
+using LauncherDM.Properties;
 
 namespace LauncherDM.ViewModels
 {
@@ -116,8 +117,8 @@ private void Loading()
         {
             ICheckNetworkService checkNetwork = new CheckNetworkService();
             ILoadingWindowService server = new LoadingWindowService(new ServerRequestService());
-            OpenWindow();
-            return;
+            SettingsApp.Default.OfflineMode = false;
+            SettingsApp.Default.Save();
 
             Task.Run(() =>
             {
@@ -145,6 +146,8 @@ private void Loading()
                         {
                             IDialogMessageBoxService dialogMessageBox = new DialogMessageBoxService();
                             dialogMessageBox.DialogShow(_resourcesHelper.LocalizationGet("Error"), _resourcesHelper.LocalizationGet("ServerClose"));
+                            SettingsApp.Default.OfflineMode = true;
+                            SettingsApp.Default.Save();
                             OpenWindow();
                             break;
                         }

diff --git a/LauncherDM/ViewModels/RegAndLogWindowViewModel.cs b/LauncherDM/ViewModels/RegAndLogWindowViewModel.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using LauncherDM.Infastructure.Commands.Base;
 using LauncherDM.Infastructure.Commands;
+using LauncherDM.Models;
 
 namespace LauncherDM.ViewModels
 {
@@ -37,7 +38,7 @@ class RegAndLogWindowViewModel : ViewModel.Base.ViewModel
 
         public string ForgotPasswordText => _resourcesHelper.LocalizationGet("ForgotPassword");
 
-        public string VersionText => string.Concat("Version: ", Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? string.Empty);
+        public string VersionText => string.Concat(_resourcesHelper.LocalizationGet("Version"), "", StaticFields.VersionPatch);
 
         #region ToolBar