Merge pull request DevChatter#84 from DevChatter/benrick/flashback-sa…

…feties

Safeties During Flashback Gameplay; Some Package Updates

.github/workflows/dotnet.yml

@@ -0,0 +1,25 @@
+name: .NET
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Restore dependencies
+      run: dotnet restore .\src
+    - name: Build
+      run: dotnet build .\src --no-restore --configuration Release
+    - name: Test
+      run: dotnet test .\src\UnitTests --no-build --verbosity normal --configuration Release

.gitignore

@@ -330,3 +330,4 @@ ASALocalRun/
 .mfractor/
 
 src/InteractiveSeven\.UI/App\.config
+*.CT

src/.editorconfig

@@ -0,0 +1,123 @@
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+###############################
+# Core EditorConfig Options   #
+###############################
+# All files
+[*]
+indent_style = space
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8-bom
+###############################
+# .NET Coding Conventions     #
+###############################
+[*.{cs,vb}]
+# Organize usings
+dotnet_sort_system_directives_first = true
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:warning
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+###############################
+# Naming Conventions          #
+###############################
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+# Use PascalCase for constant fields  
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+###############################
+# C# Coding Conventions       #
+###############################
+[*.cs]
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+###############################
+# C# Formatting Rules         #
+###############################
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+###############################
+# VB Coding Conventions       #
+###############################
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

src/InteractiveSeven.Core/Data/CharNames.cs

@@ -10,15 +10,15 @@ namespace InteractiveSeven.Core.Data
     public class CharNames
     {
         private readonly Func<CommandSettings, IList<string>> _wordsSelector;
-        public int Id { get; }
+        public byte Id { get; }
         public string DefaultName { get; }
         public int SaveMapRecordOffset { get; }
         public string SanitizedDefaultName => DefaultName.ToLower().Replace(' ', '-');
         public IList<string> Words => _wordsSelector(ApplicationSettings.Instance.CommandSettings);
 
         public GameMoments AllowNamingAfter { get; }
 
-        private CharNames(int id, string defaultName, Func<CommandSettings, IList<string>> wordsSelector,
+        private CharNames(byte id, string defaultName, Func<CommandSettings, IList<string>> wordsSelector,
             int saveMapRecordOffset,
             GameMoments allowNamingAfter = GameMoments.AfterBarretNamed,
             bool included = true)

src/InteractiveSeven.Core/FinalFantasy/FF7SaveMap.cs

@@ -159,7 +159,7 @@ public static bool VerifyMapIntegrity(byte[] map)
                 if (map[0xBA3] != 0x0)
                     consistencyCheck = false;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 consistencyCheck = false;
             }
@@ -184,4 +184,4 @@ private static CharacterRecord CreateCharacterRecord(byte charId, byte[] map)
             return record;
         }
     }
-}
+}

src/InteractiveSeven.Core/InteractiveSeven.Core.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.9.4" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Include="Autofac" Version="6.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <PackageReference Include="TwitchLib" Version="3.1.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+    <PackageReference Include="TwitchLib" Version="3.2.0" />
     <PackageReference Include="Shojy.FF7.Elena" Version="0.2-dev" />
   </ItemGroup>
 

src/InteractiveSeven.Core/MvvmCommands/BaseCommand.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Windows.Input;
+
+namespace InteractiveSeven.Core.MvvmCommands
+{
+    public class BaseCommand<T> : ICommand
+    {
+        private readonly Action<T> _executeAction;
+
+        public BaseCommand(Action<T> executeAction) => _executeAction = executeAction;
+
+        public bool CanExecute(object parameter) => parameter is T;
+
+        public void Execute(object parameter) => _executeAction?.Invoke((T)parameter);
+
+        public event EventHandler CanExecuteChanged;
+    }
+}

src/InteractiveSeven.Core/MvvmCommands/SimpleCommand.cs

@@ -1,18 +1,11 @@
 using System;
-using System.Windows.Input;
 
 namespace InteractiveSeven.Core.MvvmCommands
 {
-    public class SimpleCommand : ICommand
+    public class SimpleCommand : BaseCommand<object>
     {
-        private readonly Action<object> _executeAction;
-
-        public SimpleCommand(Action<object> executeAction) => _executeAction = executeAction;
-
-        public bool CanExecute(object parameter) => true;
-
-        public void Execute(object parameter) => _executeAction?.Invoke(parameter);
-
-        public event EventHandler CanExecuteChanged;
+        public SimpleCommand(Action<object> executeAction) : base(executeAction)
+        {
+        }
     }
 }

src/InteractiveSeven.Core/MvvmCommands/StringCommand.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace InteractiveSeven.Core.MvvmCommands
+{
+    public class StringCommand : BaseCommand<string>
+    {
+        public StringCommand(Action<string> executeAction) : base(executeAction)
+        {
+        }
+    }
+}

src/InteractiveSeven.Core/Services/IThemeChanger.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace InteractiveSeven.Core.Services
+{
+    public interface IThemeChanger
+    {
+        void ChangeTheme(string themeName);
+        void ChangeBaseColor(string baseColor);
+        void ChangeAccentColor(string accentColor);
+        List<string> GetAccentColors();
+    }
+}

src/InteractiveSeven.Core/ViewModels/MainWindowViewModel.cs

@@ -9,11 +9,13 @@ public MainWindowViewModel(MenuColorViewModel menuColorViewModel,
             StreamOverlayViewModel streamOverlayViewModel,
             NameBiddingViewModel nameBiddingViewModel,
             SettingsViewModel settingsViewModel,
+            ThemeViewModel themeViewModel,
             IChatBot chatBot)
         {
             MenuColorViewModel = menuColorViewModel;
             NameBiddingViewModel = nameBiddingViewModel;
             SettingsViewModel = settingsViewModel;
+            ThemeViewModel = themeViewModel;
             StreamOverlayViewModel = streamOverlayViewModel;
             ChatBot = chatBot;
             ConnectBotCommand = new SimpleCommand(x => ChatBot.Connect());
@@ -27,6 +29,7 @@ public MainWindowViewModel(MenuColorViewModel menuColorViewModel,
         public NameBiddingViewModel NameBiddingViewModel { get; }
         public StreamOverlayViewModel StreamOverlayViewModel { get; }
         public SettingsViewModel SettingsViewModel { get; }
+        public ThemeViewModel ThemeViewModel { get; }
         public IChatBot ChatBot { get; }
     }
 }

src/InteractiveSeven.Core/ViewModels/ThemeViewModel.cs

@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+using InteractiveSeven.Core.MvvmCommands;
+using InteractiveSeven.Core.Services;
+
+namespace InteractiveSeven.Core.ViewModels
+{
+    public class ThemeViewModel : INotifyPropertyChanged
+    {
+        private KeyValuePair<string, string> _selectedAccentColor;
+
+        public KeyValuePair<string, string> SelectedAccentColor
+        {
+            get => _selectedAccentColor;
+            set
+            {
+                _selectedAccentColor = value;
+                OnPropertyChanged(nameof(SelectedAccentColor));
+            }
+        }
+
+        public ICommand ChangeTheme { get; }
+        public ICommand ChangeBaseColor { get; }
+        public ICommand ChangeAccentColor { get; }
+
+        public List<KeyValuePair<string, string>> Colors { get; set; }
+
+        public ThemeViewModel(IThemeChanger themeChanger)
+        {
+            ChangeTheme = new StringCommand(themeChanger.ChangeTheme);
+
+            ChangeBaseColor = new StringCommand(themeChanger.ChangeBaseColor);
+
+            ChangeAccentColor = new StringCommand(themeChanger.ChangeAccentColor);
+
+            //SelectedAccentColor.Subscribe()
+
+            Colors = themeChanger.GetAccentColors()
+                .Select(x => new KeyValuePair<string, string>(x, x))
+                .ToList();
+
+            this.PropertyChanged += (_, args) =>
+            {
+                if (args.PropertyName == nameof(SelectedAccentColor))
+                {
+                    themeChanger.ChangeAccentColor(SelectedAccentColor.Key);
+                }
+            };
+        }
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}

src/InteractiveSeven.Twitch/Commands/AccessoryCommand.cs

@@ -3,6 +3,7 @@
 using InteractiveSeven.Core.Diagnostics.Memory;
 using InteractiveSeven.Core.Emitters;
 using InteractiveSeven.Core.Payments;
+using InteractiveSeven.Core.ViewModels;
 using InteractiveSeven.Twitch.Payments;
 using TwitchLib.Client.Interfaces;
 
@@ -12,11 +13,11 @@ public class AccessoryCommand : EquipmentCommand<Accessory>
     {
         public AccessoryCommand(IEquipmentAccessor equipmentAccessor,
             IInventoryAccessor inventoryAccessor, IMateriaAccessor materiaAccessor,
-            IStatusHubEmitter statusHubEmitter,
+            IStatusHubEmitter statusHubEmitter, PartyStatusViewModel partyStatusViewModel,
             GameDatabase gameDatabase, GilBank gilBank, ITwitchClient twitchClient,
             EquipmentData<Accessory> equipmentData, PaymentProcessor paymentProcessor)
             : base(equipmentAccessor, inventoryAccessor, materiaAccessor, statusHubEmitter,
-                gameDatabase, gilBank, twitchClient, equipmentData,
+                partyStatusViewModel, gameDatabase, gilBank, twitchClient, equipmentData,
                 x => x.AccessoryCommandWords, paymentProcessor)
         {
         }