From ff2bcbf1e26553c9f7e2c47feae8709ba9e30578 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Tue, 24 Oct 2023 15:10:20 +0100
Subject: [PATCH] Componetize text dropdown and simplify credits

---
 Bloxstrap/Resources/Strings.Designer.cs       |  27 ++++
 Bloxstrap/Resources/Strings.resx              |   9 ++
 Bloxstrap/UI/Elements/Controls/Expander.xaml  |  23 +++
 .../UI/Elements/Controls/Expander.xaml.cs     |  58 ++++++++
 .../UI/Elements/Menu/Pages/AboutPage.xaml     | 133 +++++-------------
 5 files changed, 151 insertions(+), 99 deletions(-)
 create mode 100644 Bloxstrap/UI/Elements/Controls/Expander.xaml
 create mode 100644 Bloxstrap/UI/Elements/Controls/Expander.xaml.cs

diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
index 14531c6..3e4025c 100644
--- a/Bloxstrap/Resources/Strings.Designer.cs
+++ b/Bloxstrap/Resources/Strings.Designer.cs
@@ -1290,6 +1290,15 @@ namespace Bloxstrap.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Code.
+        /// </summary>
+        public static string Menu_About_Contributors_Code {
+            get {
+                return ResourceManager.GetString("Menu.About.Contributors.Code", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to These are the people who have made notable contributions to Bloxstrap, helping make it what it is..
         /// </summary>
@@ -1299,6 +1308,24 @@ namespace Bloxstrap.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Feature Ideas.
+        /// </summary>
+        public static string Menu_About_Contributors_FeatureIdeas {
+            get {
+                return ResourceManager.GetString("Menu.About.Contributors.FeatureIdeas", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Translations.
+        /// </summary>
+        public static string Menu_About_Contributors_Translations {
+            get {
+                return ResourceManager.GetString("Menu.About.Contributors.Translations", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to An open-source, feature-packed alternative bootstrapper for Roblox.
         /// </summary>
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
index c36b3ce..a7cd2a6 100644
--- a/Bloxstrap/Resources/Strings.resx
+++ b/Bloxstrap/Resources/Strings.resx
@@ -531,9 +531,18 @@ Would you like to upgrade your currently installed version?</value>
   <data name="Menu.About.Contributors" xml:space="preserve">
     <value>Contributors</value>
   </data>
+  <data name="Menu.About.Contributors.Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
   <data name="Menu.About.Contributors.Description" xml:space="preserve">
     <value>These are the people who have made notable contributions to Bloxstrap, helping make it what it is.</value>
   </data>
+  <data name="Menu.About.Contributors.FeatureIdeas" xml:space="preserve">
+    <value>Feature Ideas</value>
+  </data>
+  <data name="Menu.About.Contributors.Translations" xml:space="preserve">
+    <value>Translations</value>
+  </data>
   <data name="Menu.About.Description.1" xml:space="preserve">
     <value>An open-source, feature-packed alternative bootstrapper for Roblox</value>
   </data>
diff --git a/Bloxstrap/UI/Elements/Controls/Expander.xaml b/Bloxstrap/UI/Elements/Controls/Expander.xaml
new file mode 100644
index 0000000..7c993b7
--- /dev/null
+++ b/Bloxstrap/UI/Elements/Controls/Expander.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="Bloxstrap.UI.Elements.Controls.Expander"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+             xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800"
+             x:Name="Control">
+  <Expander VerticalAlignment="Top" IsExpanded="True" Content="{Binding InnerContent, ElementName=Control}">
+    <Expander.Header>
+      <Grid>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <ui:SymbolIcon Grid.Column="0" Margin="0,0,8,0" VerticalAlignment="Center" Symbol="{Binding HeaderIcon, ElementName=Control}" />
+        <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding HeaderText, ElementName=Control}" />
+      </Grid>
+    </Expander.Header>
+  </Expander>
+</UserControl>
diff --git a/Bloxstrap/UI/Elements/Controls/Expander.xaml.cs b/Bloxstrap/UI/Elements/Controls/Expander.xaml.cs
new file mode 100644
index 0000000..28c2f09
--- /dev/null
+++ b/Bloxstrap/UI/Elements/Controls/Expander.xaml.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Wpf.Ui.Common;
+
+namespace Bloxstrap.UI.Elements.Controls
+{
+  /// <summary>
+  /// Interaction logic for Expander.xaml
+  /// </summary>
+  [ContentProperty("InnerContent")]
+  public partial class Expander : UserControl
+  {
+    public static readonly DependencyProperty HeaderIconProperty =
+        DependencyProperty.Register(nameof(HeaderIcon), typeof(SymbolRegular), typeof(Expander));
+
+    public static readonly DependencyProperty HeaderTextProperty =
+        DependencyProperty.Register(nameof(HeaderText), typeof(string), typeof(Expander));
+
+    public static readonly DependencyProperty InnerContentProperty =
+        DependencyProperty.Register(nameof(InnerContent), typeof(object), typeof(Expander));
+
+    public string HeaderText
+    {
+      get { return (string)GetValue(HeaderTextProperty); }
+      set { SetValue(HeaderTextProperty, value); }
+    }
+
+    public SymbolRegular HeaderIcon
+    {
+      get { return (SymbolRegular)GetValue(HeaderIconProperty); }
+      set { SetValue(HeaderTextProperty, value); }
+    }
+
+    public object InnerContent
+    {
+      get { return GetValue(InnerContentProperty); }
+      set { SetValue(InnerContentProperty, value); }
+    }
+
+    public Expander()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml
index 55b6a89..d683c94 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml
+++ b/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml
@@ -4,6 +4,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:models="clr-namespace:Bloxstrap.UI.ViewModels"
+      xmlns:controls="clr-namespace:Bloxstrap.UI.Elements.Controls"
       xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
       xmlns:resources="clr-namespace:Bloxstrap.Resources"
       mc:Ignorable="d"
@@ -79,112 +80,46 @@
 
     <TextBlock Text="{x:Static resources:Strings.Menu_About_Contributors}" FontWeight="Medium" FontSize="20" Margin="0,16,0,0" />
     <TextBlock Text="{x:Static resources:Strings.Menu_About_Contributors_Description}" TextWrapping="Wrap" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-    <Grid Column="0" Margin="0,8,0,0">
-      <Grid.RowDefinitions>
-        <!-- bruh -->
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-        <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
+    <Grid Margin="0,8,0,0">
       <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="*" />
+        <ColumnDefinition Width="*" />
         <ColumnDefinition Width="*" />
       </Grid.ColumnDefinitions>
 
-      <TextBlock Grid.Row="0" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://www.roblox.com/users/2485612194/profile">Multako</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="0" Grid.Column="1" Margin="0,0,0,4" VerticalAlignment="Bottom" Text="Designing the Bloxstrap logo" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+      <controls:Expander Grid.Column="0" Margin="0,0,4,0" HeaderIcon="Code24" HeaderText="{x:Static resources:Strings.Menu_About_Contributors_Code}">
+        <StackPanel>
+          <controls:MarkdownTextBlock MarkdownText="[bluepilledgreat](https://github.com/bluepilledgreat)" />
+          <controls:MarkdownTextBlock MarkdownText="[1011025m](https://github.com/1011025m)" />
+          <controls:MarkdownTextBlock MarkdownText="[EasternBloxxer](https://github.com/EasternBloxxer)" />
+          <controls:MarkdownTextBlock MarkdownText="[sitiom](https://github.com/sitiom)" />
+          <controls:MarkdownTextBlock MarkdownText="[Extravi](https://github.com/Extravi)" />
+          <controls:MarkdownTextBlock MarkdownText="[EpixScripts](https://github.com/EpixScripts)" />
+          <controls:MarkdownTextBlock MarkdownText="[swatTurret](https://github.com/swatTurret)" />
+          <controls:MarkdownTextBlock MarkdownText="[fxeP1](https://github.com/fxeP1)" />
+        </StackPanel>
+      </controls:Expander>
 
-      <TextBlock Grid.Row="1" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/bluepilledgreat">bluepilledgreat</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="1" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Helping with bootstrapper functionality and UX" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+      <controls:Expander Grid.Column="1" Margin="4,0,4,0" HeaderIcon="AppsAddIn28" HeaderText="{x:Static resources:Strings.Menu_About_Contributors_FeatureIdeas}">
+        <StackPanel>
+          <controls:MarkdownTextBlock MarkdownText="[he3als](https://github.com/he3als)" />
+          <controls:MarkdownTextBlock MarkdownText="[NikSavchenk0](https://github.com/NikSavchenk0)" />
+          <controls:MarkdownTextBlock MarkdownText="[carter0nline](https://github.com/carter0nline)" />
+          <controls:MarkdownTextBlock MarkdownText="[MehKako](https://github.com/MehKako)" />
+          <controls:MarkdownTextBlock MarkdownText="[EpixScripts](https://github.com/EpixScripts)" />
+          <controls:MarkdownTextBlock MarkdownText="[knivesofeylis](https://github.com/knivesofeylis)" />
+          <controls:MarkdownTextBlock MarkdownText="[sha4owz](https://github.com/sha4owz)" />
+          <controls:MarkdownTextBlock MarkdownText="[DaMlgNoodle](https://github.com/DaMlgNoodle)" />
+          <controls:MarkdownTextBlock MarkdownText="[nakoyasha](https://github.com/nakoyasha)" />
+        </StackPanel>
+      </controls:Expander>
 
-      <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/1011025m">1011025m</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="2" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Helping disable the Roblox desktop app, and adding the fake Byfron bootstrapper style" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="3" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/sitiom">sitiom</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="3" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Setting up GitHub CI workflows and Winget releases" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="4" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/Mantaraix">taskmanager</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="4" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Helping with designing the new menu look and layout" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="5" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/Extravi">Extravi</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="5" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Allowing their ReShade presets to be bundled prior to removal, and helping with improving UX" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="6" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/he3als">he3als</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="6" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Helping add graphics options (rendering modes, exclusive fullscreen, etc)" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="7" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/NikSavchenk0">NikSavchenk0</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="7" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting/helping with the mod preset for emoji selection" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="8" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/EasternBloxxer">EasternBloxxer</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="8" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting/helping with the FastFlag preset for preferred lighting mode" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="9" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/carter0nline">carter0nline</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="9" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting/helping with the FastFlag preset for enabling GUI hiding" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="10" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/MehKako">MehKako</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="10" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting the FastFlag preset for enabling old textures" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="11" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/EpixScripts">EpixScripts</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="11" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting the idea for in-game data communication with rich presence statuses" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="12" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        knivesofeylis
-      </TextBlock>
-      <TextBlock Grid.Row="12" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting the idea for bulk font replacement" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="13" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/sha4owz">sha4owz</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="13" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting/helping with the mod preset for the old avatar editor background" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="14" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://www.roblox.com/users/388534307/profile">DaMlgNoodle</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="14" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Providing FastFlags for fixing DPI scaling" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-
-      <TextBlock Grid.Row="15" Grid.Column="0" Margin="0,4,16,4" FontSize="14" FontWeight="Medium">
-        <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/nakoyasha">nakoyasha</Hyperlink>
-      </TextBlock>
-      <TextBlock Grid.Row="15" Grid.Column="1" Margin="0,4,0,4" VerticalAlignment="Bottom" Text="Suggesting the idea for the notification area context menu" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+      <controls:Expander Grid.Column="2" Margin="4,0,0,0" HeaderIcon="Translate24" HeaderText="{x:Static resources:Strings.Menu_About_Contributors_Translations}">
+        <StackPanel>
+          <TextBlock Text="lol" />
+        </StackPanel>
+      </controls:Expander>
     </Grid>
-    <ui:Anchor Margin="0,16,0,0" Content="See all code contributors" Icon="People48" NavigateUri="https://github.com/pizzaboxer/bloxstrap/graphs/contributors" />
 
     <TextBlock Text="{x:Static resources:Strings.Menu_About_Licenses}" FontWeight="Medium" FontSize="18" Margin="0,16,0,0" />
     <Grid>