Merge pull request #52 from mateuszskoczek/features/dialog_string_resources

hardcoded dialog buttons texts changed to string resources

VDownload.Core/VDownload.Core.Strings/Strings/en-US/DialogButtonsResources.resw

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="No" xml:space="preserve">
+    <value>No</value>
+  </data>
+  <data name="OK" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="Yes" xml:space="preserve">
+    <value>Yes</value>
+  </data>
+</root>

VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+using VDownload.Services.UI.StringResources;
 
 namespace VDownload.Services.UI.Dialogs
 {
@@ -37,6 +38,26 @@ namespace VDownload.Services.UI.Dialogs
 
     public class DialogsService : IDialogsService
     {
+        #region SERVICES
+
+        protected readonly IStringResourcesService _stringResourcesService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected string _okString;
+        protected string _closeString;
+        protected string _cancelString;
+        protected string _yesString;
+        protected string _noString;
+
+        #endregion
+
+
+
         #region PROPERTIES
 
         public XamlRoot DefaultRoot { get; set; }
@@ -45,10 +66,26 @@ namespace VDownload.Services.UI.Dialogs
 
 
 
+        #region CONSTRUCTORS
+
+        public DialogsService(IStringResourcesService stringResourcesService) 
+        { 
+            _stringResourcesService = stringResourcesService;
+            _okString = _stringResourcesService.DialogButtonsResources.Get("OK");
+            _closeString = _stringResourcesService.DialogButtonsResources.Get("Close");
+            _cancelString = _stringResourcesService.DialogButtonsResources.Get("Cancel");
+            _yesString = _stringResourcesService.DialogButtonsResources.Get("Yes");
+            _noString = _stringResourcesService.DialogButtonsResources.Get("No");
+        }
+
+        #endregion
+
+
+
         #region PUBLIC METHODS
 
-        public async Task ShowOk(string title, string message) => await ShowSingle(title, message, "OK");
+        public async Task ShowOk(string title, string message) => await ShowSingle(title, message, _okString);
-        public async Task ShowClose(string title, string message) => await ShowSingle(title, message, "Close");
+        public async Task ShowClose(string title, string message) => await ShowSingle(title, message, _closeString);
         public async Task ShowSingle(string title, string message, string buttonText)
         {
             ContentDialog contentDialog = BuildDialog(title, message);
@@ -56,12 +93,12 @@ namespace VDownload.Services.UI.Dialogs
             await ShowDialog(contentDialog);
         }
 
-        public async Task<DialogResultOkCancel> ShowOkCancel(string title, string message) => await ShowDouble(title, message, "OK", "Cancel") switch
+        public async Task<DialogResultOkCancel> ShowOkCancel(string title, string message) => await ShowDouble(title, message, _okString, _cancelString) switch
         {
             DialogResult.Primary => DialogResultOkCancel.Ok,
             _ => DialogResultOkCancel.Cancel
         };
-        public async Task<DialogResultYesNo> ShowYesNo(string title, string message) => await ShowDouble(title, message, "Yes", "No") switch
+        public async Task<DialogResultYesNo> ShowYesNo(string title, string message) => await ShowDouble(title, message, _yesString, _noString) switch
         {
             DialogResult.Primary => DialogResultYesNo.Yes,
             _ => DialogResultYesNo.No
@@ -74,7 +111,7 @@ namespace VDownload.Services.UI.Dialogs
             return await ShowDialog(contentDialog);
         }
 
-        public async Task<DialogResultYesNoCancel> ShowYesNoCancel(string title, string message) => await ShowTriple(title, message, "Yes", "No", "Cancel") switch
+        public async Task<DialogResultYesNoCancel> ShowYesNoCancel(string title, string message) => await ShowTriple(title, message, _yesString, _noString, _cancelString) switch
         {
             DialogResult.Primary => DialogResultYesNoCancel.Yes,
             DialogResult.Secondary => DialogResultYesNoCancel.Yes,

VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj

@@ -13,4 +13,8 @@
       <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\VDownload.Services.UI.StringResources\VDownload.Services.UI.StringResources.csproj" />
+  </ItemGroup>
 </Project>

VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs

@@ -14,6 +14,7 @@ namespace VDownload.Services.UI.StringResources
         StringResources NotificationsResources { get; }
         StringResources SearchResources { get; }
         StringResources CommonResources { get; }
+        StringResources DialogButtonsResources { get; }
     }
 
 
@@ -39,6 +40,7 @@ namespace VDownload.Services.UI.StringResources
         public StringResources NotificationsResources { get; protected set; }
         public StringResources SearchResources { get; protected set; }
         public StringResources CommonResources { get; protected set; }
+        public StringResources DialogButtonsResources { get; protected set; }
 
         #endregion
 
@@ -59,6 +61,7 @@ namespace VDownload.Services.UI.StringResources
             NotificationsResources = BuildResource("NotificationsResources");
             SearchResources = BuildResource("SearchResources");
             CommonResources = BuildResource("CommonResources");
+            DialogButtonsResources = BuildResource("DialogButtonsResources");
         }
 
         #endregion

VDownload/App.xaml.cs

@@ -108,12 +108,12 @@ namespace VDownload
 
         protected void BuildUIServices(IServiceCollection services)
         {
-            services.AddSingleton<IWebViewService, WebViewService>();
-            services.AddSingleton<IStoragePickerService, StoragePickerService>();
-            services.AddSingleton<IDialogsService, DialogsService>();
-            services.AddSingleton<INotificationsService, NotificationsService>();
             services.AddSingleton<IStringResourcesService, StringResourcesService>();
             services.AddSingleton<IDictionaryResourcesService, DictionaryResourcesService>();
+            services.AddSingleton<IWebViewService, WebViewService>();
+            services.AddSingleton<IStoragePickerService, StoragePickerService>();
+            services.AddSingleton<INotificationsService, NotificationsService>();
+            services.AddSingleton<IDialogsService, DialogsService>();
         }
 
         protected void BuildUtilityServices(IServiceCollection services)