modified theme folder locations

AntonyCorbett · Sep 20, 2018 · fcb6b4a · fcb6b4a
1 parent 37a8f6c
commit fcb6b4a
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 13 deletions.
diff --git a/Installer/OnlyVSetup.iss b/Installer/OnlyVSetup.iss
@@ -67,7 +67,7 @@ Source: "bin\Release\Serilog.Sinks.RollingFile.dll"; DestDir: "{app}"; Flags: ig
 Source: "bin\Release\System.ValueTuple.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bin\Release\System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\OnlyVThemeCreator\bin\Release\Xceed.Wpf.Toolkit.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\ReleaseThemes\*"; DestDir: "{userdocs}\OnlyV\ThemeFiles"; Flags: ignoreversion createallsubdirs recursesubdirs
+Source: "..\ReleaseThemes\*"; DestDir: "{commonappdata}\OnlyV\ThemeFiles"; Flags: ignoreversion createallsubdirs recursesubdirs
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"

diff --git a/OnlyV/Helpers/FileUtils.cs b/OnlyV/Helpers/FileUtils.cs
@@ -33,7 +33,13 @@ public static string GetEpubFolder()
             return folder;
         }
 
-        public static string GetThemeFolder()
+        public static string GetStandardThemeFolder()
+        {
+            var folder = Path.Combine(GetOnlyVCommonAppDataFolder(), @"ThemeFiles");
+            return !Directory.Exists(folder) ? null : folder;
+        }
+
+        public static string GetPrivateThemeFolder()
         {
             string folder = Path.Combine(GetOnlyVMyDocsFolder(), @"ThemeFiles");
             CreateDirectory(folder);
@@ -86,6 +92,15 @@ public static string GetOnlyVMyDocsFolder()
             return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), AppNamePathSegment);
         }
 
+        /// <summary>
+        /// Gets the application's common appData folder.
+        /// </summary>
+        /// <returns>Folder path</returns>
+        public static string GetOnlyVCommonAppDataFolder()
+        {
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), AppNamePathSegment);
+        }
+
         /// <summary>
         /// Gets the file path for storing the user options
         /// </summary>

diff --git a/OnlyV/ViewModel/SettingsViewModel.cs b/OnlyV/ViewModel/SettingsViewModel.cs
@@ -308,10 +308,18 @@ private IReadOnlyCollection<EpubFileItem> GetBibleEpubFiles()
         private IReadOnlyCollection<ThemeFileItem> GetThemeFiles()
         {
             var result = new List<ThemeFileItem>();
+
+            var allThemes = new List<string>();
 
-            var files = Directory.GetFiles(FileUtils.GetThemeFolder(), $"*{ThemeFile.ThemeFileExtension}").ToList();
+            var stdThemeFolder = FileUtils.GetStandardThemeFolder();
+            if (stdThemeFolder != null)
+            {
+                allThemes.AddRange(Directory.GetFiles(stdThemeFolder, $"*{ThemeFile.ThemeFileExtension}"));
+            }
 
-            foreach (var file in files)
+            allThemes.AddRange(Directory.GetFiles(FileUtils.GetPrivateThemeFolder(), $"*{ThemeFile.ThemeFileExtension}"));
+
+            foreach (var file in allThemes)
             {
                 result.Add(new ThemeFileItem
                 {

diff --git a/OnlyVThemeCreator/App.xaml.cs b/OnlyVThemeCreator/App.xaml.cs
@@ -1,11 +1,10 @@
-using System.IO;
-using OnlyVThemeCreator.Helpers;
-
-namespace OnlyVThemeCreator
+namespace OnlyVThemeCreator
 {
+    using System.IO;
     using System.Threading;
     using System.Windows;
     using GalaSoft.MvvmLight.Threading;
+    using Helpers;
     using Serilog;
 
     /// <summary>

diff --git a/OnlyVThemeCreator/Dialogs/ShouldSaveDialog.xaml b/OnlyVThemeCreator/Dialogs/ShouldSaveDialog.xaml
@@ -33,7 +33,7 @@
         <Grid>
             <StackPanel Orientation="Vertical">
                 <TextBlock Style="{StaticResource MaterialDesignDisplay1TextBlock}"
-                   Text="Save Project?"
+                   Text="Save Theme?"
                    Margin="0,0,0,20"/>
 
                 <Grid Margin="0,0,0,40">

diff --git a/OnlyVThemeCreator/Helpers/FileUtils.cs b/OnlyVThemeCreator/Helpers/FileUtils.cs
@@ -97,7 +97,7 @@ public static bool DirectoryIsAvailable(string dir)
             return true;
         }
 
-        public static string GetThemeFolder()
+        public static string GetPrivateThemeFolder()
         {
             string folder = Path.Combine(GetOnlyVMyDocsFolder(), @"ThemeFiles");
             CreateDirectory(folder);

diff --git a/OnlyVThemeCreator/ViewModel/MainViewModel.cs b/OnlyVThemeCreator/ViewModel/MainViewModel.cs
@@ -1062,7 +1062,7 @@ private void SaveAsFile()
                 d.OverwritePrompt = true;
                 d.AlwaysAppendDefaultExtension = true;
                 d.IsExpandedMode = true;
-                d.DefaultDirectory = _defaultFileSaveFolder ?? FileUtils.GetThemeFolder();
+                d.DefaultDirectory = _defaultFileSaveFolder ?? FileUtils.GetPrivateThemeFolder();
                 d.DefaultExtension = ThemeFile.ThemeFileExtension;
                 d.Filters.Add(new CommonFileDialogFilter(Properties.Resources.THEME_FILE, $"*{ThemeFile.ThemeFileExtension}"));
                 d.Title = Properties.Resources.SAVE_THEME;
@@ -1128,7 +1128,7 @@ private async void OpenFile()
 
             using (var d = new CommonOpenFileDialog())
             {
-                d.DefaultDirectory = _defaultFileOpenFolder ?? FileUtils.GetThemeFolder();
+                d.DefaultDirectory = _defaultFileOpenFolder ?? FileUtils.GetPrivateThemeFolder();
                 d.DefaultExtension = ThemeFile.ThemeFileExtension;
                 d.Filters.Add(new CommonFileDialogFilter(Properties.Resources.THEME_FILE, $"*{ThemeFile.ThemeFileExtension}"));
                 d.Title = Properties.Resources.OPEN_THEME;

diff --git a/SolutionInfo.cs b/SolutionInfo.cs
@@ -7,4 +7,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.0.6")]