Merge pull request #88 from BoiHanny/Pre-Master

New feature and UI enhancement
BoiHanny · Nov 16, 2024 · 144b351 · 144b351
2 parents 01dcf44 + 056806a
commit 144b351
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/vrcosc-magicchatbox/Classes/DataAndSecurity/DataController.cs b/vrcosc-magicchatbox/Classes/DataAndSecurity/DataController.cs
@@ -381,6 +381,8 @@ public static void LoadComponentStats()
         { "PauseIconMusic", (typeof(bool), "Icons") },
         { "PrefixIconSoundpad", (typeof(bool), "Icons") },
         { "EmojiCollection", (typeof(ObservableCollection<string>), "Icons") },
+        { "EnableEmojiShuffleInChats", (typeof(bool), "Icons") },
+        { "EnableEmojiShuffle", (typeof(bool), "Icons") },
 
         { "PrefixChat", (typeof(bool), "Chat") },
         { "ChatFX", (typeof(bool), "Chat") },

diff --git a/vrcosc-magicchatbox/MagicChatbox.csproj b/vrcosc-magicchatbox/MagicChatbox.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-	<Version>0.9.050</Version>
+	<Version>0.9.052</Version>
     <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
     <RootNamespace>vrcosc_magicchatbox</RootNamespace>
     <Nullable>enable</Nullable>

diff --git a/vrcosc-magicchatbox/MainWindow.xaml b/vrcosc-magicchatbox/MainWindow.xaml
@@ -8678,16 +8678,20 @@
                                                 Color="LightSeaGreen" />
                                         </Border.Effect>
                                     </Border>
-                                    <TextBlock
-                                        Margin="5,0,0,0"
-                                        VerticalAlignment="Center"
-                                        Effect="{StaticResource TextBlockShadowEffect}"
-                                        FontFamily="Comfortaa Light"
-                                        FontSize="12"
-                                        Foreground="#ABA4B8"
-                                        RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                        Text="{Binding HeartRateConnector.HeartRateLastUpdate, StringFormat='{}{0:T}'}"
-                                        Visibility="{Binding IntgrHeartRate, Converter={StaticResource InverseBoolToHiddenConverter}, UpdateSourceTrigger=PropertyChanged}" />
+                                    <Border Visibility="{Binding HeartRateConnector.PulsoidAccessError, Converter={StaticResource InverseBoolToVisibilityConverter}, UpdateSourceTrigger=PropertyChanged}">
+                                        <TextBlock
+                                            Margin="5,0,0,0"
+                                            VerticalAlignment="Center"
+                                            Effect="{StaticResource TextBlockShadowEffect}"
+                                            FontFamily="Comfortaa Light"
+                                            FontSize="12"
+                                            Foreground="#ABA4B8"
+                                            RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                            Text="{Binding HeartRateConnector.HeartRateLastUpdate, StringFormat='{}{0:T}'}"
+                                            Visibility="{Binding IntgrHeartRate, Converter={StaticResource InverseBoolToHiddenConverter}, UpdateSourceTrigger=PropertyChanged}" />
+                                    </Border>
+
+
                                     <TextBlock
                                         Margin="5,0,0,0"
                                         VerticalAlignment="Center"