Merge pull request #18 from Data-Tech-International/develop

Dynamic Translate, UI change

src/SecureElementReader.App/App.axaml

@@ -12,11 +12,14 @@
     <viewModels:MainWindowViewModel />
   </Design.DataContext>
 
-  <NativeMenu.Menu>
-    <NativeMenu>
-      <NativeMenuItem Header="AboutCamelotTitle" Command="{Binding MenuViewModel.AboutCommand}" />
-    </NativeMenu>
-  </NativeMenu.Menu>
+	<Application.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceInclude Source="/Properties/Translations.EN.axaml"/>
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+
+	</Application.Resources>
 
     <Application.Styles>
         <FluentTheme Mode="Light"/>

src/SecureElementReader.App/App.axaml.cs

@@ -37,14 +37,8 @@ public override void OnFrameworkInitializationCompleted()
 
         private static void LoadLanguage()
         {
-            var localizationService = GetRequiredService<ILocalizationService>();
-            var savedLanguage = localizationService.GetSavedLanguage();
-            if (savedLanguage != null)
-            {
-                var languageManager = GetRequiredService<ILanguageManager>();
-
-                languageManager.SetLanguage(savedLanguage.Code);
-            }
+            var menuView = GetRequiredService<IMenuViewModel>();
+            menuView.StartUpTranslate();
         }
     }
 }

src/SecureElementReader.App/DependencyInjection/Bootstrapper.cs

@@ -1,9 +1,4 @@
 using Splat;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SecureElementReader.App.DependencyInjection
 {
@@ -13,5 +8,5 @@ public static void Register(IMutableDependencyResolver services, IReadonlyDepend
         {
             ServicesBootstrapper.RegisterServices(services, resolver);
         }
-    }   
+    }
 }

src/SecureElementReader.App/DependencyInjection/ServicesBootstrapper.cs

@@ -1,20 +1,20 @@
+using Microsoft.Extensions.Configuration;
+using PCSC;
+using PCSC.Iso7816;
+using PCSC.Monitoring;
 using SecureElementReader.App.Interfaces;
+using SecureElementReader.App.Models.Configurations;
+using SecureElementReader.App.Proxies;
 using SecureElementReader.App.Services;
 using SecureElementReader.App.ViewModels;
 using SecureElementReader.App.ViewModels.Interfaces;
 using SecureElementReader.App.ViewModels.Services;
-using Splat;
-using Microsoft.Extensions.Configuration;
-using SecureElementReader.App.Models.Configurations;
-using System.IO;
 using Serilog;
 using Serilog.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
+using Splat;
 using Splat.Microsoft.Extensions.Logging;
-using PCSC.Iso7816;
-using PCSC;
-using PCSC.Monitoring;
-using SecureElementReader.App.Proxies;
+using System.IO;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace SecureElementReader.App.DependencyInjection
 {
@@ -27,7 +27,6 @@ public static void RegisterServices(IMutableDependencyResolver services, IReadon
             var configuration = BuildConfiguration();
             RegisterDefaultThemeConfiguration(services, configuration);
             RegisterThemesNamesConfiguration(services, configuration);
-            RegisterLanguagesConfiguration(services, configuration);
             RegisterLoggingConfiguration(services, configuration);
             RegisterSelectedLanguagesConfiguration(services, configuration);
 
@@ -50,58 +49,53 @@ public static void RegisterServices(IMutableDependencyResolver services, IReadon
             services.RegisterLazySingleton<IMainWindowProvider>(() => new MainWindowProvider());
             services.RegisterLazySingleton<IApduCommandService>(() => new ApduCommandService());
             services.RegisterLazySingleton<ITaxCoreApiProxy>(() => new TaxCoreApiProxy());
-            services.RegisterLazySingleton<ICardReaderService>(() => new CardReaderService(                   
+            services.RegisterLazySingleton<ICardReaderService>(() => new CardReaderService(
                 resolver.GetRequiredService<IApduCommandService>(),
                 resolver.GetRequiredService<ILogger>(),
                  resolver.GetRequiredService<IContextFactory>()
+
                 ));
             services.RegisterLazySingleton<IDialogService>(() => new DialogService(
                     resolver.GetRequiredService<IMainWindowProvider>()
                 ));
             services.RegisterLazySingleton<IApplicationDispatcher>(() => new AvaloniaDispatcher());
             services.RegisterLazySingleton<IContextFactory>(() => new ContextFactory());
             services.RegisterLazySingleton<IMonitorFactory>(() => new MonitorFactory(
-                resolver.GetRequiredService<IContextFactory>())); 
+                resolver.GetRequiredService<IContextFactory>()));
             services.RegisterLazySingleton<IMainWindowViewModel>(() => new MainWindowViewModel(
                 resolver.GetRequiredService<IDialogService>(),
                 resolver.GetRequiredService<ICardReaderService>(),
                 resolver.GetRequiredService<IMenuViewModel>(),
                 resolver.GetRequiredService<ICertDetailsViewModel>(),
-                resolver.GetRequiredService<ITopLanguageViewModel>(),
                 resolver.GetRequiredService<IMonitorFactory>(),
                 resolver.GetRequiredService<IApplicationDispatcher>(),
                 resolver.GetRequiredService<IMainWindowProvider>(),
                 resolver.GetRequiredService<ITaxCoreApiProxy>()
                 ));
             services.RegisterLazySingleton<IApplicationCloser>(() => new ApplicationCloser());
-            
+
             services.RegisterLazySingleton<IMenuViewModel>(() => new MenuViewModel(
                     resolver.GetRequiredService<IApplicationCloser>(),
-                    resolver.GetRequiredService<IDialogService>()
+                    resolver.GetRequiredService<IDialogService>(),
+                    resolver.GetRequiredService<ILocalizationService>(),
+                    resolver.GetRequiredService<SelectedLanguageConfiguration>()
                 ));
             services.RegisterLazySingleton<ICertDetailsViewModel>(() => new CertDetailsViewModel(
                     resolver.GetRequiredService<IDialogService>()
                 ));
 
-            services.RegisterLazySingleton<ILanguageManager>(() => new LanguageManager(
-                    resolver.GetRequiredService<LanguagesConfiguration>()
-                ));
+
             services.RegisterLazySingleton<ILocalizationService>(() => new LocalizationService(
                     resolver.GetRequiredService<SelectedLanguageConfiguration>()
                 ));
-            services.RegisterLazySingleton<ITopLanguageViewModel>(() => new TopLanguageViewModel(
-                    resolver.GetRequiredService<ILanguageManager>(),
-                    resolver.GetRequiredService<ILocalizationService>(),
-                    resolver.GetRequiredService<IMainWindowProvider>()
-                ));            
         }
 
-        public static void RegisterLogging(IMutableDependencyResolver services, IReadonlyDependencyResolver resolver)
+        private static void RegisterLogging(IMutableDependencyResolver services, IReadonlyDependencyResolver resolver)
         {
             services.RegisterLazySingleton(() =>
             {
                 var config = resolver.GetRequiredService<LoggingConfiguration>();
-                var logFilePath = GetLogFileName(config, resolver);
+                var logFilePath = GetLogFileName(config);
                 var logger = new LoggerConfiguration()
                     .MinimumLevel.Override("Default", config.DefaultLogLevel)
                     .MinimumLevel.Override("Microsoft", config.MicrosoftLogLevel)
@@ -116,8 +110,7 @@ public static void RegisterLogging(IMutableDependencyResolver services, IReadonl
             });
         }
 
-        private static string GetLogFileName(LoggingConfiguration config,
-            IReadonlyDependencyResolver resolver)
+        private static string GetLogFileName(LoggingConfiguration config)
         {
             string logDirectory = Directory.GetCurrentDirectory();
 
@@ -160,14 +153,6 @@ private static void RegisterThemesNamesConfiguration(IMutableDependencyResolver
             services.RegisterConstant(config);
         }
 
-        private static void RegisterLanguagesConfiguration(IMutableDependencyResolver services,
-            IConfiguration configuration)
-        {
-            var config = new LanguagesConfiguration();
-            configuration.GetSection("Languages").Bind(config);
-            services.RegisterConstant(config);
-        }
-
         private static void RegisterSelectedLanguagesConfiguration(IMutableDependencyResolver services,
             IConfiguration configuration)
         {

src/SecureElementReader.App/Enpoints/EndpointUrls.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureElementReader.App.Enpoints
+namespace SecureElementReader.App.Enpoints
 {
     public class EndpointUrls
     {

src/SecureElementReader.App/Enums/ApduClasses.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureElementReader.App.Enums
+namespace SecureElementReader.App.Enums
 {
     public enum ApduClasses : byte
     {

src/SecureElementReader.App/Enums/ApduInstructions.cs

@@ -1,5 +1,4 @@
-
-namespace SecureElementReader.App.Enums
+namespace SecureElementReader.App.Enums
 {
     public enum ApduInstructions : byte
     {

src/SecureElementReader.App/Enums/ApduP1.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureElementReader.App.Enums
+namespace SecureElementReader.App.Enums
 {
     public enum ApduP1
     {
@@ -17,7 +11,7 @@ public enum ApduP1
         /// P1 used for Get Response if there is more then 256 bytes for T0 protocol
         /// </summary>
         GetResponse = 0x00,
-        
+
         PKIExport = 0xA0
     }
 }

src/SecureElementReader.App/Enums/ApduP2.cs

@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureElementReader.App.Enums
+namespace SecureElementReader.App.Enums
 {
     public enum ApduP2
-    {        
+    {
         Default = 0x00,
         PKIExport = 0x10,
     }

src/SecureElementReader.App/Enums/CommandsMessages.cs

@@ -0,0 +1,12 @@
+namespace SecureElementReader.App.Enums
+{
+    public enum CommandsMessages
+    {
+        CannotGetPendingCommands,
+        AllCommandsExecutedSuccessfully,
+        AllCommandsExecutedButFailedToNotifyTaxCoreSystem,
+        NotAllCommandExecutedSuccessfully,
+        CommandsNotExecuted,
+        ThereIsNoPendingCommandsForThisCard
+    }
+}

src/SecureElementReader.App/Enums/CommandsType.cs

@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureElementReader.App.Enums
+namespace SecureElementReader.App.Enums
 {
     public enum CommandsType
-    {        
-        ForwardProofOfAudit = 5,     
+    {
+        ForwardProofOfAudit = 5,
         ForwardSecureElementDirective = 8
     }
 }

src/SecureElementReader.App/Enums/SubmitMessages.cs

@@ -0,0 +1,9 @@
+namespace SecureElementReader.App.Enums
+{
+    public enum SubmitMessages
+    {
+        SuccessSubmit,
+        UnableToSubmit,
+        CantReadInternal
+    }
+}

src/SecureElementReader.App/Enums/Theme.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureElementReader.App.Enums
+namespace SecureElementReader.App.Enums
 {
     public enum Theme : byte
     {

src/SecureElementReader.App/Extensions/StringExtensions.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SecureElementReader.App.Extensions
+namespace SecureElementReader.App.Extensions
 {
     public static class StringExtensions
     {

src/SecureElementReader.App/Interfaces/IApplicationCloser.cs

@@ -1,5 +1,4 @@
-
-namespace SecureElementReader.App.Interfaces
+namespace SecureElementReader.App.Interfaces
 {
     public interface IApplicationCloser
     {

src/SecureElementReader.App/Interfaces/ICardReaderService.cs

@@ -8,8 +8,8 @@ public interface ICardReaderService
         IEnumerable<string> LoadReaders();
         CertDetailsModel GetCertDetails();
         VerifyPinModel VerifyPin(string pin);
-        byte[]? GetInternalData();
-        byte[]? GetAmountStatus();
+        byte[] GetInternalData();
+        byte[] GetAmountStatus();
         List<CommandsStatusResult> ProcessingCommand(List<Command> commands);
         void Disconnect();
     }

src/SecureElementReader.App/Interfaces/ILocalizationService.cs

@@ -1,11 +1,7 @@
-using SecureElementReader.App.Models;
-
-namespace SecureElementReader.App.Interfaces
+namespace SecureElementReader.App.Interfaces
 {
     public interface ILocalizationService
     {
-        LanguageModel GetSavedLanguage();
-
-        void SaveLanguage(LanguageModel language);
+        void SetAppSettingValue(string key, string value, string appSettingsJsonFilePath = null);
     }
 }