Preparing Theme Delete Dialog

Taiizor · Oct 4, 2023 · 2b0bd74 · 2b0bd74
1 parent ec05821
commit 2b0bd74
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 11 deletions.
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/ThemeDelete.xaml b/src/Portal/Sucrose.Portal/Views/Controls/ThemeDelete.xaml
@@ -18,7 +18,7 @@
     </ui:ContentDialog.Resources>
 
     <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinWidth="400">
-        <ui:Image x:Name="ThemeThumbnail" Stretch="UniformToFill" CornerRadius="25" Width="Auto" Height="300" Margin="0 0 0 10" />
+        <ui:Image x:Name="ThemeThumbnail" Stretch="UniformToFill" CornerRadius="25" Width="Auto" Height="300" Margin="0 0 0 12" />
 
         <TextBlock x:Name="ThemeTitle" Text="{DynamicResource Portal.ThemeDelete.ThemeTitle}" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
         <TextBlock x:Name="ThemeDescription" Text="{DynamicResource Portal.ThemeDelete.ThemeDescription}" TextWrapping="WrapWithOverflow" FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/ThemeEdit.xaml b/src/Portal/Sucrose.Portal/Views/Controls/ThemeEdit.xaml
@@ -21,20 +21,20 @@
     <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinWidth="400">
         <ui:Image x:Name="ThemeThumbnail" Stretch="UniformToFill" CornerRadius="25" Width="Auto" Height="300" />
 
-        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeTitle}" Margin="0 10 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeTitle}" Margin="0 12 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
         <ui:TextBox x:Name="ThemeTitle" Margin="0 3 0 0" MaxLength="50" AcceptsReturn="False" AcceptsTab="False" />
 
-        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeDescription}" Margin="0 10 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeDescription}" Margin="0 12 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
         <ui:TextBox x:Name="ThemeDescription" Margin="0 3 0 0" MaxLength="500" MaxLines="10" TextWrapping="WrapWithOverflow" MinLines="5" AcceptsReturn="True" AcceptsTab="False" />
 
-        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeAuthor}" Margin="0 10 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeAuthor}" Margin="0 12 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
         <ui:TextBox x:Name="ThemeAuthor" Margin="0 3 0 0" MaxLength="50" AcceptsReturn="False" AcceptsTab="False" />
 
-        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeContact}" Margin="0 10 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="{DynamicResource Portal.ThemeEdit.ThemeContact}" Margin="0 12 0 0" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
         <ui:TextBox x:Name="ThemeContact" Margin="0 3 0 0" MaxLength="250" AcceptsReturn="False" AcceptsTab="False" Cursor="IBeam" />
 
         <StackPanel x:Name="Arguments">
-            <TextBlock Margin="0 10 0 0" Text="{DynamicResource Portal.ThemeEdit.ThemeArguments}" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+            <TextBlock Margin="0 12 0 0" Text="{DynamicResource Portal.ThemeEdit.ThemeArguments}" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
             <ui:TextBox x:Name="ThemeArguments" Margin="0 3 0 0" MaxLength="250" AcceptsReturn="False" AcceptsTab="False" />
         </StackPanel>
     </StackPanel>

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/ThemeEdit.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/ThemeEdit.xaml.cs
@@ -6,6 +6,7 @@
 using SPEIL = Sucrose.Portal.Extension.ImageLoader;
 using SPMI = Sucrose.Portal.Manage.Internal;
 using SSDEWT = Sucrose.Shared.Dependency.Enum.WallpaperType;
+using SSSHV = Sucrose.Shared.Space.Helper.Versionly;
 using SSTHI = Sucrose.Shared.Theme.Helper.Info;
 
 namespace Sucrose.Portal.Views.Controls
@@ -87,6 +88,7 @@ protected override void OnButtonClick(ContentDialogButton Button)
                     Info.Author = ThemeAuthor.Text;
                     Info.Contact = ThemeContact.Text;
                     Info.Description = ThemeDescription.Text;
+                    Info.Version = SSSHV.Increment(Info.Version);
 
                     if (string.IsNullOrEmpty(ThemeArguments.Text))
                     {

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/ThemeReview.xaml b/src/Portal/Sucrose.Portal/Views/Controls/ThemeReview.xaml
@@ -17,6 +17,8 @@
     </ui:ContentDialog.Resources>
 
     <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinWidth="400">
+        <ui:Image x:Name="ThemeThumbnail" Stretch="UniformToFill" CornerRadius="25" Width="Auto" Height="300" Margin="0 0 0 12" />
+
         <TextBlock x:Name="ThemeTitle" Text="{DynamicResource Portal.ThemeReview.ThemeTitle}" TextWrapping="WrapWithOverflow" FontSize="16" Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
         <TextBlock x:Name="ThemeDescription" Text="{DynamicResource Portal.ThemeReview.ThemeDescription}" TextWrapping="WrapWithOverflow" FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/ThemeReview.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/ThemeReview.xaml.cs
@@ -6,6 +6,7 @@
 using SEST = Skylark.Enum.StorageType;
 using SHC = Skylark.Helper.Culture;
 using SHN = Skylark.Helper.Numeric;
+using SPEIL = Sucrose.Portal.Extension.ImageLoader;
 using SPMI = Sucrose.Portal.Manage.Internal;
 using SSESSE = Skylark.Standard.Extension.Storage.StorageExtension;
 using SSSHS = Sucrose.Shared.Space.Helper.Size;
@@ -20,6 +21,7 @@ namespace Sucrose.Portal.Views.Controls
     /// </summary>
     public partial class ThemeReview : ContentDialog, IDisposable
     {
+        private readonly SPEIL Loader = new();
         internal string Theme = string.Empty;
         internal SSTHI Info = new();
 
@@ -65,6 +67,13 @@ private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
 
                 ThemeContact.NavigateUri = Info.Contact;
             }
+
+            string ImagePath = Path.Combine(Theme, Info.Thumbnail);
+
+            if (File.Exists(ImagePath))
+            {
+                ThemeThumbnail.Source = Loader.LoadOptimal(ImagePath);
+            }
         }
 
         public void Dispose()

diff --git a/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.DE.xaml b/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.DE.xaml
@@ -3,7 +3,8 @@
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 >
-    <system:String x:Key="Portal.ThemeDelete.Title">Themenbewertung</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Title">Thema Löschen</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Delete">Löschen</system:String>
     <system:String x:Key="Portal.ThemeDelete.Close">Schließen</system:String>
 
     <system:String x:Key="Portal.ThemeDelete.ThemeTitle">Titel</system:String>

diff --git a/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.EN.xaml b/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.EN.xaml
@@ -3,7 +3,8 @@
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 >
-    <system:String x:Key="Portal.ThemeDelete.Title">Theme Review</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Title">Delete Theme</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Delete">Delete</system:String>
     <system:String x:Key="Portal.ThemeDelete.Close">Close</system:String>
 
     <system:String x:Key="Portal.ThemeDelete.ThemeTitle">Title</system:String>

diff --git a/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.ES.xaml b/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.ES.xaml
@@ -3,7 +3,8 @@
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 >
-    <system:String x:Key="Portal.ThemeDelete.Title">Reseña del Tema</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Title">Eliminar Tema</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Delete">Eliminar</system:String>
     <system:String x:Key="Portal.ThemeDelete.Close">Cerrar</system:String>
 
     <system:String x:Key="Portal.ThemeDelete.ThemeTitle">Título</system:String>

diff --git a/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.FR.xaml b/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.FR.xaml
@@ -3,7 +3,8 @@
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 >
-    <system:String x:Key="Portal.ThemeDelete.Title">Critique du Thème</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Title">Supprimer le Thème</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Delete">Supprimer</system:String>
     <system:String x:Key="Portal.ThemeDelete.Close">Fermer</system:String>
 
     <system:String x:Key="Portal.ThemeDelete.ThemeTitle">Titre</system:String>

diff --git a/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.PL.xaml b/...d/Sucrose.Shared.Resources/Locales/Portal/Controls/ThemeDelete/Portal.ThemeDelete.PL.xaml
@@ -3,7 +3,8 @@
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 >
-    <system:String x:Key="Portal.ThemeDelete.Title">Recenzja Tematu</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Title">Usuń Temat</system:String>
+    <system:String x:Key="Portal.ThemeDelete.Delete">Usuń</system:String>
     <system:String x:Key="Portal.ThemeDelete.Close">Zamknij</system:String>
 
     <system:String x:Key="Portal.ThemeDelete.ThemeTitle">Tytuł</system:String>

diff --git a/src/Shared/Sucrose.Shared.Space/Helper/Versionly.cs b/src/Shared/Sucrose.Shared.Space/Helper/Versionly.cs
@@ -0,0 +1,75 @@
+namespace Sucrose.Shared.Space.Helper
+{
+    internal static class Versionly
+    {
+        public static Version Increment(Version Version)
+        {
+            try
+            {
+                int Major = Version.Major;
+                int Minor = Version.Minor;
+                int Build = Version.Build;
+                int Revision = Version.Revision + 1;
+
+                if (Revision > 9)
+                {
+                    Revision = 0;
+                    Build++;
+                }
+
+                if (Build > 9)
+                {
+                    Build = 0;
+                    Minor++;
+                }
+
+                if (Minor > 9)
+                {
+                    Minor = 0;
+                    Major++;
+                }
+
+                return new Version(Major, Minor, Build, Revision);
+            }
+            catch
+            {
+                return new Version(0, 0, 0, 0);
+            }
+        }
+
+        public static Version Decrement(Version Version)
+        {
+            try
+            {
+                int Major = Version.Major;
+                int Minor = Version.Minor;
+                int Build = Version.Build;
+                int Revision = Version.Revision - 1;
+
+                if (Revision < 0)
+                {
+                    Revision = 9;
+                    Build--;
+                }
+
+                if (Build < 0)
+                {
+                    Build = 9;
+                    Minor--;
+                }
+
+                if (Minor < 0)
+                {
+                    Minor = 9;
+                    Major--;
+                }
+
+                return new Version(Major, Minor, Build, Revision);
+            }
+            catch
+            {
+                return new Version(0, 0, 0, 0);
+            }
+        }
+    }
+}
diff --git a/src/Shared/Sucrose.Shared.Space/Sucrose.Shared.Space.projitems b/src/Shared/Sucrose.Shared.Space/Sucrose.Shared.Space.projitems
@@ -14,6 +14,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Reset.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Graphic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Management.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helper\Versionly.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Virtual.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Remote.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helper\Network.cs" />