Preparing Import Dialog

Taiizor · Oct 20, 2023 · f8e5ac1 · f8e5ac1
1 parent 4da2d6c
commit f8e5ac1
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 38 deletions.
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml b/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml
@@ -17,27 +17,13 @@
         <Style BasedOn="{StaticResource {x:Type ui:ContentDialog}}" TargetType="{x:Type local:DisplayPreferences}" />
     </ui:ContentDialog.Resources>
 
-    <StackPanel x:Name="Panel" HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinWidth="400">
+    <StackPanel x:Name="Panel" HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinHeight="9999" MinWidth="400">
         <Border Background="{DynamicResource ControlFillColorDefaultBrush}" CornerRadius="5" Margin="0 10 0 10" MinHeight="150">
             <ScrollViewer VerticalScrollBarVisibility="Auto">
                 <WrapPanel x:Name="Contents" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10" />
             </ScrollViewer>
         </Border>
 
-        <vcontrols:ExpanderCard x:Name="Expander" LeftIconSymbol="DualScreenSpan24" IsExpand="True" Expandable="True">
-            <vcontrols:ExpanderCard.FooterCard>
-                <StackPanel>
-                    <RadioButton />
-                    <RadioButton />
-                    <RadioButton />
-
-                    <ui:NavigationViewItemSeparator Margin="0 10 0 10" />
-
-                    <ui:TextBlock Margin="0 0 0 10" />
-
-                    <RadioButton />
-                </StackPanel>
-            </vcontrols:ExpanderCard.FooterCard>
-        </vcontrols:ExpanderCard>
+        <vcontrols:ExpanderCard x:Name="Expander" LeftIconSymbol="DualScreenSpan24" IsExpand="True" Expandable="True" />
     </StackPanel>
 </ui:ContentDialog>
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/DisplayPreferences.xaml.cs
@@ -214,7 +214,7 @@ private void DuplicateScreenTypeChecked(SEDST Type)
             }
         }
 
-        private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
+        private async void ContentDialog_Loaded(object sender, RoutedEventArgs e)
         {
             Expander.Title.Text = SSRER.GetValue("Portal", "DisplayPreferences", "Expander");
             Expander.Description.Text = SSRER.GetValue("Portal", "DisplayPreferences", "Expander", "Description");
@@ -329,6 +329,10 @@ private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
             ExpanderContent.Children.Add(ExpanderDuplicateContent);
 
             Expander.FooterCard = ExpanderContent;
+
+            await Task.Delay(10);
+
+            Panel.MinHeight = 0;
         }
 
         public void Dispose()

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/OtherAbout.xaml b/src/Portal/Sucrose.Portal/Views/Controls/OtherAbout.xaml
@@ -38,8 +38,7 @@
                             CornerRadius="15"
                             Appearance="Transparent"
                             BorderBrush="Transparent"
-                            NavigateUri="https://www.youtube.com/@iTaiizor"
-                            Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}">
+                            NavigateUri="https://www.youtube.com/@iTaiizor">
                             <ui:Image
                                 Height="32"
                                 CornerRadius="16"
@@ -50,8 +49,7 @@
                             CornerRadius="15"
                             Appearance="Transparent"
                             BorderBrush="Transparent"
-                            NavigateUri="https://www.facebook.com/iTaiizor"
-                            Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}">
+                            NavigateUri="https://www.facebook.com/iTaiizor">
                             <ui:Image
                                 Height="32"
                                 CornerRadius="16"
@@ -62,8 +60,7 @@
                             CornerRadius="15"
                             Appearance="Transparent"
                             BorderBrush="Transparent"
-                            NavigateUri="https://www.instagram.com/Taiizor"
-                            Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}">
+                            NavigateUri="https://www.instagram.com/Taiizor">
                             <ui:Image
                                 Height="32"
                                 CornerRadius="16"
@@ -74,8 +71,7 @@
                             CornerRadius="15"
                             Appearance="Transparent"
                             BorderBrush="Transparent"
-                            NavigateUri="https://www.twitter.com/iTaiizor"
-                            Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}">
+                            NavigateUri="https://www.twitter.com/iTaiizor">
                             <ui:Image
                                 Height="32"
                                 CornerRadius="16"
@@ -86,8 +82,7 @@
                             CornerRadius="15"
                             Appearance="Transparent"
                             BorderBrush="Transparent"
-                            NavigateUri="https://www.linkedin.com/in/Taiizor"
-                            Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}">
+                            NavigateUri="https://www.linkedin.com/in/Taiizor">
                             <ui:Image
                                 Height="32"
                                 CornerRadius="16"
@@ -128,7 +123,7 @@
                     TextWrapping="WrapWithOverflow"
                     Text="{DynamicResource Portal.OtherAbout.Contributors}" />
 
-                <WrapPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 10 0 0" Cursor="">
+                <WrapPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 10 0 0">
                     <ui:HyperlinkButton
                         Cursor="Hand"
                         CornerRadius="15"

diff --git a/src/Portal/Sucrose.Portal/Views/Controls/ThemeImport.xaml b/src/Portal/Sucrose.Portal/Views/Controls/ThemeImport.xaml
@@ -16,7 +16,31 @@
         <Style BasedOn="{StaticResource {x:Type ui:ContentDialog}}" TargetType="{x:Type local:ThemeImport}" />
     </ui:ContentDialog.Resources>
 
-    <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinHeight="250" MinWidth="400">
-        <TextBlock x:Name="ThemeImportInfo" Text="{DynamicResource Portal.ThemeImport.Info}" TextWrapping="WrapWithOverflow" FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+    <StackPanel x:Name="Panel" HorizontalAlignment="Stretch" VerticalAlignment="Center" Orientation="Vertical" MinHeight="9999" MinWidth="500">
+        <ui:Card Background="{DynamicResource CardStrokeColorDefaultBrush}">
+            <Grid>
+                <TextBlock x:Name="ThemeImportInfo" Text="{DynamicResource Portal.ThemeImport.Info}" TextWrapping="WrapWithOverflow" FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+            </Grid>
+        </ui:Card>
+
+        <ui:Card x:Name="TypeCard" Background="{DynamicResource CardStrokeColorDefaultBrush}" Margin="0 3 0 0" Visibility="Collapsed">
+            <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <ui:TextBlock
+                    Grid.Row="0"
+                    TextAlignment="Center"
+                    VerticalAlignment="Center"
+                    HorizontalAlignment="Center"
+                    TextWrapping="WrapWithOverflow"
+                    Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
+                    Text="Neden Açıklamaları" />
+
+                <WrapPanel x:Name="ThemeImportType" Grid.Row="1" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="0 10 0 0" />
+            </Grid>
+        </ui:Card>
     </StackPanel>
 </ui:ContentDialog>
diff --git a/src/Portal/Sucrose.Portal/Views/Controls/ThemeImport.xaml.cs b/src/Portal/Sucrose.Portal/Views/Controls/ThemeImport.xaml.cs
@@ -1,6 +1,8 @@
 using System.Windows;
+using System.Windows.Media;
 using Wpf.Ui.Controls;
 using SPMI = Sucrose.Portal.Manage.Internal;
+using SSRER = Sucrose.Shared.Resources.Extension.Resources;
 using SSDECT = Sucrose.Shared.Dependency.Enum.CompatibilityType;
 
 namespace Sucrose.Portal.Views.Controls
@@ -18,17 +20,31 @@ public ThemeImport() : base(SPMI.ContentDialogService.GetContentPresenter())
             InitializeComponent();
         }
 
-        private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
+        private async void ContentDialog_Loaded(object sender, RoutedEventArgs e)
         {
             ThemeImportInfo.Text = Info;
 
             if (Types.Any())
             {
-                //Legends (hata kodlarının anlamını burada kısaca ya da basitçe açıkla)
+                TypeCard.Visibility = Visibility.Visible;
 
-                //Test: Test açıklaması
-                //Test2: Test2 açıklaması
+                Types.ForEach(Type =>
+                {
+                    ThemeImportType.Children.Add(new TextBlock
+                    {
+                        Text = $"{Type}: Bu şu anlama geliyor",
+                        TextAlignment = TextAlignment.Left,
+                        TextWrapping = TextWrapping.WrapWithOverflow,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        HorizontalAlignment = HorizontalAlignment.Center,
+                        Foreground = SSRER.GetResource<Brush>("SystemFillColorCriticalBrush")
+                    });
+                });
             }
+
+            await Task.Delay(10);
+
+            Panel.MinHeight = 0;
         }
 
         public void Dispose()

diff --git a/src/Portal/Sucrose.Portal/Views/Pages/LibraryPage.xaml.cs b/src/Portal/Sucrose.Portal/Views/Pages/LibraryPage.xaml.cs
@@ -185,7 +185,7 @@ private async void GridLibrary_Drop(object sender, DragEventArgs e)
                                 Name = SHG.GenerateString(SMMM.Chars, 25, SMR.Randomise);
                             } while (File.Exists(Path.Combine(SMMM.LibraryLocation, Name)));
 
-                            Result = SSZEZ.Extract(Record, Path.Combine(SMMM.LibraryLocation, Name));
+                            Result = await Task.Run(() => SSZEZ.Extract(Record, Path.Combine(SMMM.LibraryLocation, Name)));
 
                             if (Result == SSDECT.Pass)
                             {
@@ -194,12 +194,16 @@ private async void GridLibrary_Drop(object sender, DragEventArgs e)
                             }
                             else
                             {
-                                Types.Add(Result);
-                                Messages.Add($"{Path.GetFileNameWithoutExtension(Record)} adlı tema kütüphaneye eklenemedi. Nedeni: {Result}");
+                                Messages.Add($"{Path.GetFileNameWithoutExtension(Record)} adlı tema kütüphaneye eklenemedi. Nedeni bilinmiyor.");
                             }
                         }
                         else
                         {
+                            if (!Types.Contains(Result))
+                            {
+                                Types.Add(Result);
+                            }
+
                             Messages.Add($"{Path.GetFileNameWithoutExtension(Record)} adlı tema kütüphaneye eklenemedi. Nedeni: {Result}");
                         }
                     }

diff --git a/src/Shared/Sucrose.Shared.Dependency/Enum/CompatibilityType.cs b/src/Shared/Sucrose.Shared.Dependency/Enum/CompatibilityType.cs
@@ -42,6 +42,10 @@ public enum CompatibilityType
         /// </summary>
         Preview,
         /// <summary>
+        /// Seçilen ZIP dosyası şifreli!
+        /// </summary>
+        Encrypt,
+        /// <summary>
         /// Seçilen dosya gerçekten ZIP dosyası değil!
         /// </summary>
         ZipType,

diff --git a/src/Shared/Sucrose.Shared.Zip/Helper/Archive.cs b/src/Shared/Sucrose.Shared.Zip/Helper/Archive.cs
@@ -36,6 +36,12 @@ public static SSDECT Check(string Archive)
                     return SSDECT.ZipType;
                 }
 
+                //// Seçilen ZIP dosyası şifreli mi?
+                //if (SSZHZ.EncryptedArchive(Archive))
+                //{
+                //    return SSDECT.Encrypt;
+                //}
+
                 // Arşivde SucroseInfo.json dosyası var mı?
                 if (!SSZHZ.CheckFile(Archive, SMR.SucroseInfo))
                 {

diff --git a/src/Shared/Sucrose.Shared.Zip/Helper/Zip.cs b/src/Shared/Sucrose.Shared.Zip/Helper/Zip.cs
@@ -76,5 +76,24 @@ public static bool CheckArchive(string Archive)
                 return false;
             }
         }
+
+        public static bool EncryptedArchive(string Archive)
+        {
+            try
+            {
+                using FileStream Stream = new(Archive, FileMode.Open, FileAccess.Read, FileShare.Read);
+
+                byte[] ArchiveHeader = new byte[4];
+                Stream.Read(ArchiveHeader, 0, 4);
+
+                byte[] ZipHeader = new byte[] { 0x50, 0x4B, 0x03, 0x07 };
+
+                return ArchiveHeader.SequenceEqual(ZipHeader);
+            }
+            catch
+            {
+                return false;
+            }
+        }
     }
 }
diff --git a/src/Update/Sucrose.Update/App.xaml.cs b/src/Update/Sucrose.Update/App.xaml.cs
@@ -203,7 +203,7 @@ protected async void Configure()
 
                 if (Releases.Any())
                 {
-                    SSIIR Release = Release = Releases.FirstOrDefault();
+                    SSIIR Release = Releases.FirstOrDefault();
 
                     if (SUMM.ChannelType == SSCECT.Release)
                     {