Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement of timezone names for better standardization and comprehensiveness #75

Merged
merged 17 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
</div>

1. **Download** the .zip file from the link above.
2. Make sure you have [**.NET 8**](https://dotnet.microsoft.com/en-us/download) installed on your system.
2. Make sure you have [**.NET 8**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.8-windows-x64-installer) installed on your system.
3. **Right-click** the downloaded .zip file and select <strong>Extract All</strong>.
4. Open the extracted folder from your chosen location.
5. Run <code>MagicChatbox.exe</code> to launch the application.
Expand Down
12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
[![downloads](https://img.shields.io/github/downloads/BoiHanny/vrcosc-magicchatbox/total?color=%23512BD4&label=Total%20download&logo=docusign&logoColor=white&style=plastic)](https://tooomm.github.io/github-release-stats/?username=BoiHanny&repository=vrcosc-magicchatbox)
[![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/BoiHanny/vrcosc-magicchatbox?color=%23512BD4&label=Last%20update&style=plastic)](https://github.com/BoiHanny/vrcosc-magicchatbox/releases)
[![GitHub top language](https://img.shields.io/github/languages/top/BoiHanny/vrcosc-magicchatbox?color=%23512BD4&style=plastic)](https://github.com/search?q=repo%3ABoiHanny%2Fvrcosc-magicchatbox++language%3AC%23&type=code)
[![NET](https://img.shields.io/badge/.NET%206-Runtime%20-%23512BD4?style=plastic)](https://dotnet.microsoft.com/en-us/download)
[![NET](https://img.shields.io/badge/.NET%208-Runtime%20-%23512BD4?style=plastic)](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.8-windows-x64-installer)
[![Discord](https://img.shields.io/discord/1078818850218450994?color=%23512BD4&label=VR%20OSC&logo=discord&logoColor=white&style=plastic)](https://discord.gg/ZaSFwBfhvG)
[![Coffee](https://img.shields.io/badge/Send-A%20Coffee-FFDD00?style=plastic&logo=buymeacoffee&logoColor=white)](https://www.buymeacoffee.com/BoiHanny)
--

[![Download zip](https://custom-icon-badges.herokuapp.com/badge/-Download-%23512BD4?style=for-the-badge&logo=download&logoColor=white "Download")](https://github.com/BoiHanny/vrcosc-magicchatbox/releases/download/v0.9.015/MagicChatbox-0.9.015.zip)
[![Download zip](https://custom-icon-badges.herokuapp.com/badge/-Scan%20at%20VirusTotal-blue?style=for-the-badge&logo=virustotal&logoColor=white "virustotal")](https://www.virustotal.com/gui/file/94a77b2e4fa3311aa3c981c12c8f4439953e86a053953dbabd1f5e5fa230e1f6/detection)
[![Download zip](https://custom-icon-badges.herokuapp.com/badge/-Download-%23512BD4?style=for-the-badge&logo=download&logoColor=white "Download")](https://github.com/BoiHanny/vrcosc-magicchatbox/releases/download/v0.9.003/MagicChatbox-0.9.003.zip)
[![Download zip](https://custom-icon-badges.herokuapp.com/badge/-Scan%20at%20VirusTotal-blue?style=for-the-badge&logo=virustotal&logoColor=white "virustotal")](https://www.virustotal.com/gui/file/4f1508955db90fe7d66106cf82d4e21628110b7c442a3386c27aa2a05ab78fbd/detection)
<!-- END LATEST DOWNLOAD BUTTON -->
# MagicChatbox
> **Introducing MagicChatbox: the ultimate companion for all your VRChat needs! Whether you're on desktop or in VR, we've got you covered with our compact and modern UI.**
Expand Down Expand Up @@ -152,7 +152,7 @@ Prototype Features (not implemented)
## Dependencies


> * Make sure you have [.NET 8](https://dotnet.microsoft.com/en-us/download) installed.
> * Make sure you have [.NET 8](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.8-windows-x64-installer) installed.
> * Latest Operating-System Update installed


Expand All @@ -166,6 +166,4 @@ Prototype Features (not implemented)

> - [![](https://dcbadge.vercel.app/api/server/ZaSFwBfhvG)](https://discord.gg/ZaSFwBfhvG)
> - **Github Issues:** [Report a bug or submit a feature request](https://github.com/BoiHanny/vrcosc-magicchatbox/issues)
> - Wiki: [Help & more](https://github.com/BoiHanny/vrcosc-magicchatbox/wiki)


> - Wiki: [Help & more](https://github.com/BoiHanny/vrcosc-magicchatbox/wiki)
15 changes: 12 additions & 3 deletions vrcosc-magicchatbox/Classes/DataAndSecurity/OSCController.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Drawing;
using System.Globalization;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -258,8 +259,10 @@ private static string CreateProgressBar(double percentage, MediaSessionInfo medi
}

int filledBlocks = (int)(percentage / (100.0 / totalBlocks));
string filledBar = new string(style.FilledCharacter[0], filledBlocks);
string emptyBar = new string(style.NonFilledCharacter[0], totalBlocks - filledBlocks);

// Use the entire string for emojis and multi-character strings
string filledBar = string.Concat(Enumerable.Repeat(style.FilledCharacter, filledBlocks));
string emptyBar = string.Concat(Enumerable.Repeat(style.NonFilledCharacter, totalBlocks - filledBlocks));
string progressBar = filledBar + style.MiddleCharacter + emptyBar;

return CreateTimeStamp(currentTime, fullTime, progressBar, style);
Expand All @@ -270,6 +273,7 @@ private static string CreateProgressBar(double percentage, MediaSessionInfo medi
return string.Empty;
}
}

private static string CreateTimeStamp(string currentTime, string fullTime, string progressBar, MediaLinkStyle style)
{
string space = style.SpaceAgainObjects ? " " : string.Empty;
Expand Down Expand Up @@ -678,7 +682,12 @@ public static void CreateChat(bool createItem)
string Complete_msg = null;
if (ViewModel.Instance.PrefixChat == true)
{
Complete_msg = "💬 " + ViewModel.Instance.NewChattingTxt;
string icon = "💬";
if (ViewModel.Instance.IzuruBaeMode && !string.IsNullOrWhiteSpace(ViewModel.Instance.EggPrefixIconStatus))
{
icon = ViewModel.Instance.EggPrefixIconStatus.Substring(0, char.IsSurrogatePair(ViewModel.Instance.EggPrefixIconStatus, 0) ? 2 : 1);
}
Complete_msg = icon + " " + ViewModel.Instance.NewChattingTxt;
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions vrcosc-magicchatbox/Classes/DataAndSecurity/OSCSender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ public static async Task SendOSCMessage(bool FX, int delay = 0)
await SendMessageAsync(PrepareMessage(FX), delay);
}

public static async void SentClearMessage()
public static async Task SentClearMessage(int delay)
{
var clearMessage = new OscMessage(CHATBOX_INPUT, "", true, false);
await SendMessageAsync(clearMessage, 0);
await SendMessageAsync(clearMessage, delay);
}

public static async Task ToggleVoice(bool force = false)
Expand Down
159 changes: 0 additions & 159 deletions vrcosc-magicchatbox/Classes/DataAndSecurity/VRChatOSCQuery.cs

This file was deleted.

Loading
Loading