Merge branch 'release/v1-stable'

PatrickHollweck · May 1, 2017 · 8bf2b83 · 8bf2b83
2 parents 2652a4b + 2cbb171
commit 8bf2b83
Show file tree

Hide file tree

Showing 75 changed files with 3,807 additions and 732 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,7 @@
 
 ---
 
-| **`Code Factor`** | **`Travis CI`** | **`Gitter`** | **`Trello`**
-|-----------------|---------------------|------------------|------------------|
-| [![CodeFactor](https://www.codefactor.io/repository/github/fetzenrndy/astrosoundboard/badge)](https://www.codefactor.io/repository/github/fetzenrndy/astrosoundboard) | [![Build Status](https://travis-ci.org/FetzenRndy/AstroSoundboard.svg?branch=master)](https://travis-ci.org/FetzenRndy/AstroSoundboard) | [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/AstroSoundboard/Lobby) | [Todo List](https://trello.com/b/L7tztN1W/astrokittysoundboard)
+[![CodeFactor](https://www.codefactor.io/repository/github/fetzenrndy/astrosoundboard/badge)](https://www.codefactor.io/repository/github/fetzenrndy/astrosoundboard) [![Build Status](https://travis-ci.org/FetzenRndy/AstroSoundboard.svg?branch=master)](https://travis-ci.org/FetzenRndy/AstroSoundboard) [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/AstroSoundboard/Lobby) [![CodeFactor](https://img.shields.io/badge/YouTrack-Online-green.svg)](https://bugline.myjetbrains.com/youtrack/issues/AstroBoard) [![Github All Releases](https://img.shields.io/github/downloads/FetzenRndy/AstroSoundBoard/total.svg)](https://github.com/FetzenRndy/AstroSoundboard/) [![GitHub release](https://img.shields.io/github/release/qubyte/rubidium.svg)](https://github.com/FetzenRndy/AstroSoundboard/)
 
 ## How to get the Soundboard?
 Download the AstroKittySoundBoard.exe [here](https://github.com/FetzenRndy/AstroSoundboard/releases) and run it. - Thats all.
@@ -39,11 +37,13 @@ A little tour of the Code.
             
 ```
 
-#### Librarays
-| AutoUpdater.NET | Fody.Costura | Fody.PropChanged | Fody | log4net | Xaml Material Design Kit | Json.NET | SharpRaven |
-|---------------------------------------------------------|-------------------------------------------|---------------------------------------------------|------------------------------------|---------------------------------------------|--------------------------------------------|------------------------------------------|-----------------------------------------------------|
-| A Updating lib | Dependency embedding | Auto Implements IPropertyChanged | Core Package for Fody Plugins | Logging lib | Xaml MaterialDesign Kit | Json Handling | Sentry Error Handling lib |
-| [Source](https://github.com/ravibpatel/AutoUpdater.NET) | [Source](https://github.com/Fody/Costura) | [Source](https://github.com/Fody/PropertyChanged) | [Source](https://github.com/Fody/) | [Source](https://github.com/apache/log4net) | [Source](http://materialdesigninxaml.net/) | [Source](http://www.newtonsoft.com/json) | [Source](https://github.com/getsentry/raven-csharp) |
+### Building
 
+If you want to fork you need tom register a new Sentry app, and add the API Key in the Credentials class.
 
 
+#### Librarays
+| AutoUpdater.NET                                         | NHotkey                                             | Fody.Costura                              | Fody.Property Changed                              | Fody                               | log4net                                     | Xaml Material Design Kit                   | Json.NET                                 | SharpRaven                                          |
+|---------------------------------------------------------|-----------------------------------------------------|-------------------------------------------|---------------------------------------------------|------------------------------------|---------------------------------------------|--------------------------------------------|------------------------------------------|-----------------------------------------------------|
+| A Updating lib                                          | Easy Global Hotkey Handling                         | Dependency embedding                      | Auto Implements IPropChanged                  | Core Package for Fody Plugins      | Logging lib                                 | Xaml Material Design Kit                    | Json Handling                            | Sentry Error Handling lib                           |
+| [Source](https://github.com/ravibpatel/AutoUpdater.NET) | [Source](https://github.com/thomaslevesque/NHotkey) | [Source](https://github.com/Fody/Costura) | [Source](https://github.com/Fody/PropertyChanged) | [Source](https://github.com/Fody/) | [Source](https://github.com/apache/log4net) | [Source](http://materialdesigninxaml.net/) | [Source](http://www.newtonsoft.com/json) | [Source](https://github.com/getsentry/raven-csharp) |
diff --git a/public/versions/AstroKittySoundBoard.zip b/public/versions/AstroKittySoundBoard.zip
diff --git a/public/versions/releaseNotes.html b/public/versions/releaseNotes.html
@@ -13,9 +13,12 @@ <h3 class="panel-title">v1</h3>
             </div>
             <div style="background-color: #303f9F" class="panel-body">
                 <ul style="color: white">
-                    <li>Reworked Settings</li>
+                    <li><b></b></li>
                     <li>Added Crash Reporting</li>
-                    <li>Code Cleanup and Bug Fixes</li>
+                    <li>Added More sounds</li>
+                    <li>Added Keybinds</li>
+                    <li>Code Cleanup and Bug Fixes</li> 
+                    <li>Reworked Settings</li>               
                 </ul>
             </div>
         </div>

diff --git a/public/versions/updaterInfo.xml b/public/versions/updaterInfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-    <version>0.9.0</version>
+    <version>1</version>
     <url>https://github.com/FetzenRndy/AstroSoundboard/raw/master/public/versions/AstroKittySoundBoard.zip</url>
-    <changelog></changelog>
-</item>
+    <changelog>https://raw.githubusercontent.com/FetzenRndy/AstroSoundboard/master/public/versions/releaseNotes.html</changelog>
+</item>
diff --git a/src/AstroSoundBoard/App.config b/src/AstroSoundBoard/App.config
@@ -54,6 +54,12 @@
       <setting name="Volume" serializeAs="String">
         <value>50</value>
       </setting>
+      <setting name="AllowErrorReporting" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="EnableSoundHotKeys" serializeAs="String">
+        <value>True</value>
+      </setting>
     </AstroSoundBoard.Properties.Settings>
   </userSettings>
   <runtime>

diff --git a/src/AstroSoundBoard/App.xaml b/src/AstroSoundBoard/App.xaml
@@ -6,16 +6,16 @@
 	Exit="Application_Exit"
 	Startup="Application_Startup"
 	StartupUri="/WPF/Windows/MainWindow.xaml">
-	<Application.Resources>
-		<ResourceDictionary>
-			<ResourceDictionary.MergedDictionaries>
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
 
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Indigo.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Red.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Indigo.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Red.xaml" />
 
-			</ResourceDictionary.MergedDictionaries>
-		</ResourceDictionary>
-	</Application.Resources>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>
diff --git a/src/AstroSoundBoard/App.xaml.cs b/src/AstroSoundBoard/App.xaml.cs
@@ -1,8 +1,8 @@
 // ****************************** Module Header ****************************** //
 //
 //
-// Last Modified: 24:04:2017 / 17:46
-// Creation: 23:04:2017
+// Last Modified: 01:05:2017 / 01:21
+// Creation: 29:04:2017
 // Project: AstroSoundBoard
 //
 //
@@ -12,19 +12,21 @@
 namespace AstroSoundBoard
 {
     using System;
+    using System.Collections.Generic;
     using System.Reflection;
     using System.Windows;
 
     using AstroSoundBoard.Core.Components;
     using AstroSoundBoard.Core.Objects;
     using AstroSoundBoard.Core.Utils;
-    using AstroSoundBoard.WPF.Pages.Settings;
 
     using log4net;
     using log4net.Core;
 
     using MaterialDesignThemes.Wpf;
 
+    using SharpRaven;
+
     public partial class App : Application
     {
         private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -35,8 +37,8 @@ private void Application_Startup(object sender, StartupEventArgs e)
             ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Root.Level = Level.Debug;
             ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).RaiseConfigurationChanged(EventArgs.Empty);
 #else
-			((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Root.Level = Level.Info;
-			((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).RaiseConfigurationChanged(EventArgs.Empty);
+            ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Root.Level = Level.Info;
+            ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).RaiseConfigurationChanged(EventArgs.Empty);
 #endif
 
             Log.Info("--- APP START! ---");
@@ -46,8 +48,21 @@ private void Application_Startup(object sender, StartupEventArgs e)
             FileSystem.FolderHelper.CreateIfMissing($"{AppSettings.InstallationFilePath}/");
 
             // Setup error handling to log fatal errors.
-            AppDomain currentDomain = AppDomain.CurrentDomain;
-            currentDomain.UnhandledException += (caller, args) => { Log.Fatal($"Fatal unhanded exception. - {args.ExceptionObject} -- {args.IsTerminating} -> {args}"); };
+            AppDomain.CurrentDomain.UnhandledException += (caller, args) =>
+                {
+                    Log.Fatal($"Fatal unhanded exception. - {args.ExceptionObject} -- {args.IsTerminating} -> {args}");
+
+#if !DEBUG
+                    if (AstroSoundBoard.Properties.Settings.Default.AllowErrorReporting)
+                    {
+                        var ravenClient = new RavenClient(Credentials.SentryApiKey);
+                        ravenClient.Capture(new SharpRaven.Data.SentryEvent((Exception)args.ExceptionObject));
+
+                        Log.Info("Reported error to sentry!");
+                    }
+
+#endif
+                };
 
             ApplyMaterialTheme();
             SoundManager.Init();
@@ -61,9 +76,11 @@ private void Application_Exit(object sender, ExitEventArgs e)
 
         public static void ApplyMaterialTheme()
         {
+            List<string> colorList = new List<string> { "Red", "Pink", "Purple", "Indigo", "Blue", "Cyan", "Teal", "Green", "Lime", "Yellow", "Amber", "Orange", "Brown", "Grey" };
+
             var palette = new PaletteHelper();
             palette.SetLightDark(AstroSoundBoard.Properties.Settings.Default.IsDarkModeEnabled);
-            palette.ReplacePrimaryColor(SettingsView.ColorList[AstroSoundBoard.Properties.Settings.Default.PrimaryColor]);
+            palette.ReplacePrimaryColor(colorList[AstroSoundBoard.Properties.Settings.Default.PrimaryColor]);
         }
     }
 }