Skip to content

Commit

Permalink
Merge pull request #1 from SuiMachine/RedemptionPointsRework
Browse files Browse the repository at this point in the history
Redemption points rework
  • Loading branch information
SuiMachine authored May 21, 2021
2 parents f0499ad + 164ec88 commit 12d914f
Show file tree
Hide file tree
Showing 43 changed files with 5,258 additions and 4,814 deletions.
16 changes: 8 additions & 8 deletions App.config
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.40.3.0" newVersion="1.40.3.0"/>
<assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.40.3.0" newVersion="1.40.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.40.3.0" newVersion="1.40.3.0"/>
<assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.40.3.0" newVersion="1.40.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
114 changes: 57 additions & 57 deletions Extensions/ColorExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,72 @@

namespace BasicTwitchSoundPlayer.Extensions
{
class ColorExtension
{
public static Color ParseColor(string ColorAsText, Color colorRef)
{
if (ColorAsText != String.Empty)
{
if (int.TryParse(ColorAsText, out int color))
{
return Color.FromArgb(color);
}
}
return colorRef;
}
}
class ColorExtension
{
public static Color ParseColor(string ColorAsText, Color colorRef)
{
if (ColorAsText != String.Empty)
{
if (int.TryParse(ColorAsText, out int color))
{
return Color.FromArgb(color);
}
}
return colorRef;
}
}

public class OverridenColorTable : ProfessionalColorTable
{
public Color ColorMenuBorder { get; set; }
public Color ColorMenuBarBackground { get; set; }
public Color ColorMenuBarSelected { get; set; }
public Color ColorMenuBackground { get; set; }
public Color ColorMenuItemSelected { get; set; }
public Color TextColor { get; set; }
public class OverridenColorTable : ProfessionalColorTable
{
public Color ColorMenuBorder { get; set; }
public Color ColorMenuBarBackground { get; set; }
public Color ColorMenuBarSelected { get; set; }
public Color ColorMenuBackground { get; set; }
public Color ColorMenuItemSelected { get; set; }
public Color TextColor { get; set; }

public OverridenColorTable()
{
ColorMenuBorder = base.MenuBorder;
ColorMenuBarBackground = base.MenuStripGradientBegin;
ColorMenuItemSelected = base.MenuItemSelected;
ColorMenuBackground = base.ToolStripDropDownBackground;
TextColor = base.MenuBorder;
}
public OverridenColorTable()
{
ColorMenuBorder = base.MenuBorder;
ColorMenuBarBackground = base.MenuStripGradientBegin;
ColorMenuItemSelected = base.MenuItemSelected;
ColorMenuBackground = base.ToolStripDropDownBackground;
TextColor = base.MenuBorder;
}

public override Color MenuBorder => ColorMenuBorder;
public override Color MenuBorder => ColorMenuBorder;

public override Color CheckSelectedBackground => Transparent(ColorMenuItemSelected, 40);
public override Color CheckBackground => Transparent(ColorMenuItemSelected, 40);
public override Color CheckPressedBackground => Transparent(ColorMenuItemSelected, 40);
public override Color CheckSelectedBackground => Transparent(ColorMenuItemSelected, 40);
public override Color CheckBackground => Transparent(ColorMenuItemSelected, 40);
public override Color CheckPressedBackground => Transparent(ColorMenuItemSelected, 40);

private Color Transparent(Color originalColor, int Opacity)
{
int opacity = 255 * Opacity / 100;
return Color.FromArgb(opacity, originalColor.R, originalColor.G, originalColor.B);
}
private Color Transparent(Color originalColor, int Opacity)
{
int opacity = 255 * Opacity / 100;
return Color.FromArgb(opacity, originalColor.R, originalColor.G, originalColor.B);
}

#region Menus
public override Color MenuItemBorder => ColorMenuBorder;
#region Menus
public override Color MenuItemBorder => ColorMenuBorder;

//MenuStrip Background
public override Color MenuStripGradientBegin => ColorMenuBarBackground;
public override Color MenuStripGradientEnd => ColorMenuBarBackground;
//MenuStrip Background
public override Color MenuStripGradientBegin => ColorMenuBarBackground;
public override Color MenuStripGradientEnd => ColorMenuBarBackground;

//Menu Item Pressed
public override Color MenuItemPressedGradientBegin => ColorMenuBarSelected;
public override Color MenuItemPressedGradientMiddle => ColorMenuBarSelected;
public override Color MenuItemPressedGradientEnd => ColorMenuBarSelected;
//Menu Item Pressed
public override Color MenuItemPressedGradientBegin => ColorMenuBarSelected;
public override Color MenuItemPressedGradientMiddle => ColorMenuBarSelected;
public override Color MenuItemPressedGradientEnd => ColorMenuBarSelected;

//Menu Item Selected
public override Color MenuItemSelected => ColorMenuItemSelected;
public override Color MenuItemSelectedGradientBegin => ColorMenuItemSelected;
public override Color MenuItemSelectedGradientEnd => ColorMenuItemSelected;
#endregion
//Menu Item Selected
public override Color MenuItemSelected => ColorMenuItemSelected;
public override Color MenuItemSelectedGradientBegin => ColorMenuItemSelected;
public override Color MenuItemSelectedGradientEnd => ColorMenuItemSelected;
#endregion

//Toolstrip
public override Color ToolStripBorder => ColorMenuBorder;
//Toolstrip
public override Color ToolStripBorder => ColorMenuBorder;

public override Color ToolStripDropDownBackground => ColorMenuBackground;
}
public override Color ToolStripDropDownBackground => ColorMenuBackground;
}
}
61 changes: 28 additions & 33 deletions Extensions/ColorWrapper.cs
Original file line number Diff line number Diff line change
@@ -1,43 +1,38 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Drawing;
using System.Xml.Serialization;

namespace BasicTwitchSoundPlayer
{
public class ColorWrapper
{
[XmlIgnore]
public Color color;
public class ColorWrapper
{
[XmlIgnore]
public Color color;

public ColorWrapper()
{
color = Color.Black;
}
public ColorWrapper()
{
color = Color.Black;
}

public static implicit operator ColorWrapper(Color c)
{
return new ColorWrapper() { color = c };
}
public static implicit operator ColorWrapper(Color c)
{
return new ColorWrapper() { color = c };
}

public static implicit operator Color(ColorWrapper cw)
{
return cw.color;
}
public static implicit operator Color(ColorWrapper cw)
{
return cw.color;
}

public override string ToString()
{
return color.ToArgb().ToString();
}
public override string ToString()
{
return color.ToArgb().ToString();
}

[XmlElement]
public int ColorXML
{
get { return color.ToArgb(); }
set { color = Color.FromArgb(value); }
}
}
[XmlElement]
public int ColorXML
{
get { return color.ToArgb(); }
set { color = Color.FromArgb(value); }
}
}
}
46 changes: 21 additions & 25 deletions Extensions/DateTimeExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,31 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BasicTwitchSoundPlayer.Extensions
{
static class DateTimeExtensions
{
public static DateTime ToDateTimeSafe(this string Text)
{
if (Text == null || Text == String.Empty)
{
return DateTime.UtcNow;
}
else
{
if (DateTime.TryParse(Text, out DateTime result))
{
return result;
}
else
{
return DateTime.MinValue;
}
static class DateTimeExtensions
{
public static DateTime ToDateTimeSafe(this string Text)
{
if (Text == null || Text == String.Empty)
{
return DateTime.UtcNow;
}
else
{
if (DateTime.TryParse(Text, out DateTime result))
{
return result;
}
else
{
return DateTime.MinValue;
}

}
}
}
}
}
}
}
52 changes: 26 additions & 26 deletions Extensions/Numbers.cs
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
namespace BasicTwitchSoundPlayer.Extensions
{
static class NumberTypesExtension
{
public static float ToFloat(this string Text, float DEFAULT_VALUE)
{
if (float.TryParse(Text, out float res))
return res;
else
return DEFAULT_VALUE;
}
static class NumberTypesExtension
{
public static float ToFloat(this string Text, float DEFAULT_VALUE)
{
if (float.TryParse(Text, out float res))
return res;
else
return DEFAULT_VALUE;
}

public static int ToInt(this string Text, int DEFAULT_VALUE)
{
if (int.TryParse(Text, out int res))
return res;
else
return DEFAULT_VALUE;
}
public static int ToInt(this string Text, int DEFAULT_VALUE)
{
if (int.TryParse(Text, out int res))
return res;
else
return DEFAULT_VALUE;
}

public static bool ToBoolean(this string Text, bool DEFAULT_VALUE)
{
if (bool.TryParse(Text, out bool val))
{
return val;
}
else
return DEFAULT_VALUE;
}
}
public static bool ToBoolean(this string Text, bool DEFAULT_VALUE)
{
if (bool.TryParse(Text, out bool val))
{
return val;
}
else
return DEFAULT_VALUE;
}
}
}
21 changes: 9 additions & 12 deletions Extensions/StringExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BasicTwitchSoundPlayer.Extensions
{
public static class StringExtensions
{
public static string RemoveWhitespaces(this string Text)
{
return new string(Text.ToCharArray()
.Where(c => !Char.IsWhiteSpace(c))
.ToArray());
}
}
public static class StringExtensions
{
public static string RemoveWhitespaces(this string Text)
{
return new string(Text.ToCharArray()
.Where(c => !Char.IsWhiteSpace(c))
.ToArray());
}
}
}
Loading

0 comments on commit 12d914f

Please sign in to comment.