Skip to content

Commit

Permalink
Merge pull request #68 from BoiHanny/Pre-Master
Browse files Browse the repository at this point in the history 
UI enhancements and event handling for promotional content.
  • Loading branch information
@BoiHanny
BoiHanny authored Aug 9, 2024
2 parents f841fba + d9dd037 commit ca7717c
Show file tree
Hide file tree
Showing 5 changed files with 256 additions and 3 deletions.
Binary file added vrcosc-magicchatbox/Img/Icons/Apply_ico.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added vrcosc-magicchatbox/Img/Icons/Info_ico.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion vrcosc-magicchatbox/MagicChatbox.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<Version>0.9.003</Version>
<Version>0.9.004</Version>
<TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
<RootNamespace>vrcosc_magicchatbox</RootNamespace>
<Nullable>enable</Nullable>
Expand Down Expand Up @@ -41,6 +41,7 @@
<None Remove="Img\Icons\ActivateStatus_ico.png" />
<None Remove="Img\Icons\Add.png" />
<None Remove="Img\Icons\admin.png" />
<None Remove="Img\Icons\Apply_ico.png" />
<None Remove="Img\Icons\Close_ico.png" />
<None Remove="Img\Icons\ComponentStats_ico.png" />
<None Remove="Img\Icons\Copy_ico.png" />
Expand All @@ -55,6 +56,7 @@
<None Remove="Img\Icons\Favorite_ico.png" />
<None Remove="Img\Icons\GitHub.png" />
<None Remove="Img\Icons\HeartRate_ico.png" />
<None Remove="Img\Icons\Info_ico.png" />
<None Remove="Img\Icons\Load_ico.png" />
<None Remove="Img\Icons\Log.png" />
<None Remove="Img\Icons\MagicChatbox_ico.png" />
Expand Down Expand Up @@ -102,6 +104,7 @@
</Resource>
<Resource Include="Img\Icons\Add.png" />
<Resource Include="Img\Icons\admin.png" />
<Resource Include="Img\Icons\Apply_ico.png" />
<Resource Include="Img\Icons\Close_ico.png">
<CopyToOutputDirectory></CopyToOutputDirectory>
</Resource>
Expand All @@ -121,6 +124,7 @@
<CopyToOutputDirectory></CopyToOutputDirectory>
</Resource>
<Resource Include="Img\Icons\GitHub.png" />
<Resource Include="Img\Icons\Info_ico.png" />
<Resource Include="Img\Icons\Load_ico.png" />
<Resource Include="Img\Icons\Log.png" />
<Resource Include="Img\Icons\MagicChatbox_ico.png" />
Expand Down
228 changes: 226 additions & 2 deletions vrcosc-magicchatbox/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,7 @@
</LinearGradientBrush>
</Grid.Background>
<Grid Grid.Row="0">

<ToggleButton
Width="Auto"
Height="30"
Expand Down Expand Up @@ -1366,6 +1367,167 @@
d:Visibility="Collapsed"
Visibility="{Binding Settings_HeartRate, Converter={StaticResource InverseBoolToHiddenConverter}, UpdateSourceTrigger=PropertyChanged}">
<StackPanel>
<Border
Width="500"
Height="auto"
Margin="0,0,10,15"
HorizontalAlignment="Left"
CornerRadius="5">
<Border.Background>
<LinearGradientBrush StartPoint="0.3,0" EndPoint="0.5,1">
<GradientStop Color="#05B4A8" />
<GradientStop Offset="1" Color="#403670" />
</LinearGradientBrush>
</Border.Background>
<Border.Effect>
<DropShadowEffect
BlurRadius="25"
Direction="-90"
Opacity="0.9"
RenderingBias="Performance"
ShadowDepth="5"
Color="#05B4A8" />
</Border.Effect>
<Grid Margin="3">

<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock
Width="auto"
Padding="5,5,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Background="Transparent"
FontFamily="Albert Sans Thin"
FontSize="20"
FontWeight="Bold"
Foreground="Gold"
RenderOptions.BitmapScalingMode="NearestNeighbor"
Text="15% OFF"
TextWrapping="Wrap">
<TextBlock.Effect>
<DropShadowEffect
BlurRadius="20"
Opacity="1"
RenderingBias="Performance"
ShadowDepth="0"
Color="BlueViolet" />
</TextBlock.Effect>
</TextBlock>
<TextBlock
Width="auto"
Padding="5,5,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Background="Transparent"
FontFamily="Albert Sans Thin"
FontSize="20"
FontWeight="Bold"
Foreground="#FF240E55"
RenderOptions.BitmapScalingMode="NearestNeighbor"
Text="every month on your"
TextWrapping="Wrap">
<TextBlock.Effect>
<DropShadowEffect
BlurRadius="20"
Opacity="1"
RenderingBias="Performance"
ShadowDepth="0"
Color="Purple" />
</TextBlock.Effect>
</TextBlock>
<TextBlock
Width="auto"
Padding="5,5,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Background="Transparent"
FontFamily="Albert Sans Thin"
FontSize="20"
FontWeight="Bold"
Foreground="Gold"
RenderOptions.BitmapScalingMode="NearestNeighbor"
Text="BRO PLAN"
TextWrapping="Wrap">
<TextBlock.Effect>
<DropShadowEffect
BlurRadius="20"
Opacity="1"
RenderingBias="Performance"
ShadowDepth="0"
Color="Gold" />
</TextBlock.Effect>
</TextBlock>
</StackPanel>
<TextBlock
Width="auto"
Padding="7,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Background="Transparent"
FontFamily="Albert Sans Thin"
FontSize="13"
FontStyle="Italic"
FontWeight="Medium"
Foreground="DarkGoldenrod"
RenderOptions.BitmapScalingMode="NearestNeighbor"
Text="Discount applies to new subscriptions only (cancel possible)"
TextWrapping="Wrap">
<TextBlock.Effect>
<DropShadowEffect
BlurRadius="7"
Opacity="1"
RenderingBias="Performance"
ShadowDepth="0"
Color="Purple" />
</TextBlock.Effect>
</TextBlock>


</StackPanel>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<Button
Name="PulsoidLearnMoreAboutDiscount_btn"
Height="auto"
Margin="2,0,0,0"
VerticalAlignment="Stretch"
Click="PulsoidLearnMoreAboutDiscount_btn_Click"
Opacity="0.8"
Style="{DynamicResource Status_Button_style}">
<Image
Width="18"
Margin="2"
RenderOptions.BitmapScalingMode="HighQuality"
Source="/Img/Icons/Info_ico.png" />
</Button>
<Button
Name="ApplyLinkPulsoid_btn"
Width="auto"
Height="auto"
Margin="2,0,0,0"
HorizontalAlignment="Right"
VerticalAlignment="Stretch"
Click="ApplyLinkPulsoid_btn_Click"
Opacity="0.8"
Style="{DynamicResource Status_Button_style}">
<Image
Width="25"
Margin="2"
RenderOptions.BitmapScalingMode="HighQuality"
Source="/Img/Icons/Apply_ico.png" />
</Button>
</StackPanel>








</Grid>

</Border>
<Border
Margin="0,0,0,5"
Background="#FF3B3054"
Expand Down Expand Up @@ -1472,8 +1634,6 @@
Visibility="{Binding PulsoidAccessError, Converter={StaticResource InverseBoolToHiddenConverter}, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
</Border>


<Border
Margin="0,0,0,5"
Background="#FF3B3054"
Expand Down Expand Up @@ -8090,6 +8250,69 @@
Color="#251153" />
</Button.Effect>
</Button>
<Border
x:Name="MainDiscoundButton_grid"
Width="auto"
Height="20"
Margin="8,0,0,0"
CornerRadius="5"
Cursor="Hand"
MouseUp="MainDiscoundButton_grid_MouseUp">
<Border.Background>
<LinearGradientBrush StartPoint="0.4,0" EndPoint="0.5,1">
<GradientStop Color="LightSeaGreen" />
<GradientStop Offset="1" Color="#FF302573" />
</LinearGradientBrush>
</Border.Background>
<StackPanel Orientation="Horizontal">
<TextBlock
Padding="5,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="15"
FontWeight="DemiBold"
Foreground="AliceBlue"
Opacity="0.9"
Text="-15%">
<TextBlock.Effect>
<DropShadowEffect
BlurRadius="5"
Direction="0"
Opacity="0.5"
ShadowDepth="0"
Color="Black" />
</TextBlock.Effect>
</TextBlock>
<TextBlock
Padding="1,0,3,0"
HorizontalAlignment="Center"
VerticalAlignment="Top"
FontSize="10"
FontWeight="DemiBold"
Foreground="AliceBlue"
Opacity="0.8"
Text="always">
<TextBlock.Effect>
<DropShadowEffect
BlurRadius="5"
Direction="0"
Opacity="0.5"
ShadowDepth="0"
Color="Black" />
</TextBlock.Effect>
</TextBlock>
</StackPanel>


<Border.Effect>
<DropShadowEffect
BlurRadius="10"
Direction="0"
Opacity="0.9"
ShadowDepth="0"
Color="LightSeaGreen" />
</Border.Effect>
</Border>
<TextBlock
Margin="5,0,0,0"
VerticalAlignment="Center"
Expand Down Expand Up @@ -8358,6 +8581,7 @@
ShadowDepth="0"
Color="#251153" />
</Button.Effect>

</Button>

<TextBlock
Expand Down
25 changes: 25 additions & 0 deletions vrcosc-magicchatbox/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,31 @@ private void ResetOSCPortOut_btn_Click(object sender, RoutedEventArgs e)
{
ViewModel.Instance.OSCPortOut = 9000;
}

private void ApplyLinkPulsoid_btn_Click(object sender, RoutedEventArgs e)
{
Process.Start(new ProcessStartInfo
{
FileName = "https://pulsoid.net/pricing?promo_campaign_id=613e3915-a6ba-40f1-a8d4-9ae68c433c6e",
UseShellExecute = true
});

}

private void PulsoidLearnMoreAboutDiscount_btn_Click(object sender, RoutedEventArgs e)
{
Process.Start(new ProcessStartInfo
{
FileName = "https://github.com/BoiHanny/vrcosc-magicchatbox/wiki/Unlock-a-15%25-Discount-on-Pulsoid's-BRO-Plan",
UseShellExecute = true
});

}

private void MainDiscoundButton_grid_MouseUp(object sender, MouseButtonEventArgs e)
{
ViewModel.Instance.ActivateSetting("Settings_HeartRate");
}
}


Expand Down

0 comments on commit ca7717c

Please sign in to comment.