Code cleanup and additional information

Author: rabanti-github

Changelog.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## v1.5.0
+
+Release Date: **30.09.2020**
+
+- Introduced dark mode
+- Added language option
+- Translations: English and German
+- Renewed UI
+- Added drag&drop area to open files
+- Added option to save selected files (picked from list of embedded files)
+- Added more file types that are displayed as preview
+- Added user settings (application restores options on startup)
+- Code cleanup
+
+---
+
 ## v1.4.1
 
 Release Date: **14.08.2018**

MediaExtractor/App.config

@@ -48,7 +48,7 @@
                 <value>False</value>
             </setting>
             <setting name="ImageExtensions" serializeAs="String">
-                <value>jpg,jpeg,png,wmf,emf,gif,bmp,ico,wdp</value>
+                <value>jpg,jpeg,png,wmf,emf,gif,bmp,ico</value>
             </setting>
             <setting name="TextExtensions" serializeAs="String">
                 <value>asc,bas,bat,c,cfg,cmd,cpp,cs,css,csv,h,hex,htm,html,inc,inf,info,ini,java,js,json,kt,ktm,kts,latex,less,lisp,log,lst,lua,markdown,md,me,meta,mf,p,pas,php,pl,pp,ps,ps1,psm1,py,r,rb,readme,reg,rs,rst,sh,sln,sql,sty,tcl,tex,ts,tsx,txt,vb,vba,vbs,yaml,yml</value>

MediaExtractor/CommandHandler.cs

@@ -16,8 +16,8 @@ namespace MediaExtractor
     /// </summary>
     public class CommandHandler : ICommand
     {
-        private Action action;
-        private Func<bool> canExecute;
+        private readonly Action action;
+        private readonly Func<bool> canExecute;
 
         /// <summary>
         /// Constructor with parameters

MediaExtractor/ExistingFileDialog.xaml.cs

@@ -46,7 +46,7 @@ public enum Result
         /// <summary>
         /// Static dialog result
         /// </summary>
-        public new static Result DialogResult = Result.None;
+        public static new Result DialogResult = Result.None;
         /// <summary>
         /// Boolean indicates whether the dialog shall be reoccurring (false) or be skipped with the last decision as default result (true)
         /// </summary>

MediaExtractor/Extractor.cs

@@ -21,7 +21,7 @@ public class Extractor
         private string lastError;
         private bool hasErrors;
         private List<ExtractorItem> embeddedFiles;
-        private ViewModel currentModel;
+        private readonly ViewModel currentModel;
 
         /// <summary>
         /// List of all embedded items (usually embeddedFiles)

MediaExtractor/ExtractorItem.cs

@@ -28,7 +28,7 @@ public class ExtractorItem
         /// <summary>
         /// Default file endings that are previewed as image
         /// </summary>
-        public const string FALLBACK_IMAGE_EXTENTIONS = "jpg,jpeg,png,wmf,emf,gif,bmp,ico,wdp";
+        public const string FALLBACK_IMAGE_EXTENTIONS = "jpg,jpeg,png,wmf,emf,gif,bmp,ico";
         /// <summary>
         /// Default file endings that are previewed as XML
         /// </summary>
@@ -183,7 +183,7 @@ public ExtractorItem(string fileName, MemoryStream stream, bool createFile, stri
             Stream = stream;
             ErrorMessage = String.Empty;
 
-            if (createFile == true)
+            if (createFile)
             {
                 switch (ItemType)
                 {
@@ -285,7 +285,7 @@ public void CreateImage(bool retry)
         {
             List<ImageFormat> formats = new List<ImageFormat>();
             formats.Add(ImageFormat.Png);
-            if (retry == true)
+            if (retry)
             {
                 formats.Add(ImageFormat.Jpeg);
                 formats.Add(ImageFormat.Emf);
@@ -305,8 +305,10 @@ public void CreateImage(bool retry)
                     }
                     else
                     {
-                        System.Drawing.Image img = System.Drawing.Image.FromStream(Stream);
-                        img.Save(ms2, format);
+                        using (System.Drawing.Image img = System.Drawing.Image.FromStream(Stream))
+                        {
+                            img.Save(ms2, format);
+                        }                       
                     }
 
                     ms2.Flush();

MediaExtractor/I18N.cs

@@ -106,6 +106,7 @@ public enum Key
             StatusLoading,
             StatusLoadingEmbedded,
             StatusNotLoaded,
+            StatusReady,
             StatusSaveCanceled,
             StatusSaveErrorSummary,
             StatusSaveFailure,
@@ -205,7 +206,6 @@ public static string R(Key key, params string[] parameters)
         /// <returns>Translated term with replaced text</returns>
         public static string R(Key key, params int[] parameters)
         {
-            string localized = T(key);
             string[] numbers = parameters.Select(x => x.ToString()).ToArray();
             return R(key, numbers);
         }

MediaExtractor/MainWindow.xaml

@@ -33,13 +33,6 @@
             </Setter>
         </Style>
     </Window.Resources>
-    <adonisControls:AdonisWindow.TitleBarContent>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="?"  Style="{DynamicResource {x:Static adonisUi:Styles.WindowButton}}"
-                    FontFamily="Segoe UI"
-                    FontSize="14"/>
-        </StackPanel>
-    </adonisControls:AdonisWindow.TitleBarContent>
 
     <Grid UseLayoutRounding="False" Margin="0,26,0,0">
         <Grid.ColumnDefinitions>