Merge branch 'v0.7-changes' of https://github.com/duke7553/files-uwp into v0.7-changes

Author: jeffsieu

Files.Launcher/Program.cs

@@ -18,6 +18,7 @@ static void Main(string[] args)
                     ApplicationData.Current.LocalSettings.Values["DetectedPicturesLocation"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "My Pictures", null);
                     ApplicationData.Current.LocalSettings.Values["DetectedMusicLocation"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "My Music", null);
                     ApplicationData.Current.LocalSettings.Values["DetectedVideosLocation"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders", "My Video", null);
+                    ApplicationData.Current.LocalSettings.Values["DetectedOneDriveLocation"] = Microsoft.Win32.Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\OneDrive", "UserFolder", null);
                 }
                 else
                 {

Files/App.xaml.cs

@@ -189,6 +189,7 @@ private async void DetectCustomLocations(ApplicationDataContainer localSettings)
             App.PicturesPath = localSettings.Values["DetectedPicturesLocation"] as string;
             App.MusicPath = localSettings.Values["DetectedMusicLocation"] as string;
             App.VideosPath = localSettings.Values["DetectedVideosLocation"] as string;
+            App.OneDrivePath = localSettings.Values["DetectedOneDriveLocation"] as string;
 
             // Overwrite paths for common locations if Custom Locations setting is enabled
             if (localSettings.Values["customLocationsSetting"] != null)
@@ -201,6 +202,7 @@ private async void DetectCustomLocations(ApplicationDataContainer localSettings)
                     App.PicturesPath = localSettings.Values["PicturesLocation"] as string;
                     App.MusicPath = localSettings.Values["MusicLocation"] as string;
                     App.VideosPath = localSettings.Values["VideosLocation"] as string;
+                    App.OneDrivePath = localSettings.Values["DetectedOneDriveLocation"] as string;
                 }
             }
         }

Files/SettingsPages/Preferences.xaml

@@ -40,6 +40,10 @@
                             <TextBlock Text="Videos" VerticalAlignment="Center" Margin="0,0,25,0" HorizontalAlignment="Left"/>
                             <TextBox CornerRadius="2" Name="VideosL" PlaceholderText="Set Custom Videos Location" HorizontalAlignment="Left" Margin="125,0,0,0" Width="500"/>
                         </Grid>
+                        <Grid Margin="0, 0, 0, 12.5">
+                            <TextBlock Text="OneDrive" VerticalAlignment="Center" Margin="0,0,25,0" HorizontalAlignment="Left"/>
+                            <TextBox CornerRadius="2" Name="OneDriveL" PlaceholderText="Set Custom OneDrive Location" HorizontalAlignment="Left" Margin="125,0,0,0" Width="500"/>
+                        </Grid>
                         <StackPanel Orientation="Horizontal">
                             <Button CornerRadius="2" Content="Save Locations" x:Name="SaveCustomL" HorizontalAlignment="Left" Click="SaveCustomL_Click" />
                             <StackPanel x:Name="SuccessMark" Orientation="Horizontal" Spacing="15">

Files/SettingsPages/Preferences.xaml.cs

@@ -41,6 +41,9 @@ public Preferences()
                     VideosL.IsEnabled = true;
                     VideosL.Text = localSettings.Values["VideosLocation"].ToString();
 
+                    OneDriveL.IsEnabled = true;
+                    OneDriveL.Text = localSettings.Values["OneDriveLocation"].ToString();
+
                     SaveCustomL.IsEnabled = true;
                 }
                 else
@@ -53,6 +56,7 @@ public Preferences()
                     MusicL.IsEnabled = false;
                     VideosL.IsEnabled = false;
                     SaveCustomL.IsEnabled = false;
+                    OneDriveL.IsEnabled = false;
                 }
             }
             else
@@ -65,6 +69,7 @@ public Preferences()
                 MusicL.IsEnabled = false;
                 VideosL.IsEnabled = false;
                 SaveCustomL.IsEnabled = false;
+                OneDriveL.IsEnabled = false;
             }
             SuccessMark.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
         }
@@ -93,12 +98,16 @@ private void ToggleSwitch_Toggled(object sender, Windows.UI.Xaml.RoutedEventArgs
                 VideosL.IsEnabled = true;
                 localSettings.Values["VideosLocation"] = App.VideosPath;
 
+                OneDriveL.IsEnabled = true;
+                localSettings.Values["OneDriveLocation"] = App.OneDrivePath;
+
                 DesktopL.Text = localSettings.Values["DesktopLocation"].ToString();
                 DownloadsL.Text = localSettings.Values["DownloadsLocation"].ToString();
                 DocumentsL.Text = localSettings.Values["DocumentsLocation"].ToString();
                 PictureL.Text = localSettings.Values["PicturesLocation"].ToString();
                 MusicL.Text = localSettings.Values["MusicLocation"].ToString();
                 VideosL.Text = localSettings.Values["VideosLocation"].ToString();
+                OneDriveL.Text = localSettings.Values["OneDriveLocation"].ToString();
 
                 SaveCustomL.IsEnabled = true;
             }
@@ -111,6 +120,7 @@ private void ToggleSwitch_Toggled(object sender, Windows.UI.Xaml.RoutedEventArgs
                 PictureL.IsEnabled = false;
                 MusicL.IsEnabled = false;
                 VideosL.IsEnabled = false;
+                OneDriveL.IsEnabled = false;
                 SaveCustomL.IsEnabled = false;
             }
         }
@@ -241,6 +251,26 @@ private async void SaveCustomL_Click(object sender, Windows.UI.Xaml.RoutedEventA
                 }
             }
 
+            if (!string.IsNullOrEmpty(OneDriveL.Text))
+            {
+                try
+                {
+                    newLocationSetting = await StorageFolder.GetFolderFromPathAsync(OneDriveL.Text);
+                    localSettings.Values["OneDriveLocation"] = OneDriveL.Text;
+                    OneDriveL.BorderBrush = new SolidColorBrush(Colors.Black);
+                }
+                catch (ArgumentException)
+                {
+                    OneDriveL.BorderBrush = new SolidColorBrush(Color.FromArgb(255, 255, 0, 0));
+                    isFlawless = false;
+                }
+                catch (FileNotFoundException)
+                {
+                    OneDriveL.BorderBrush = new SolidColorBrush(Color.FromArgb(255, 255, 0, 0));
+                    isFlawless = false;
+                }
+            }
+
             if (isFlawless)
             {
                 SuccessMark.Visibility = Windows.UI.Xaml.Visibility.Visible;

Files/YourHome.xaml.cs

@@ -40,6 +40,7 @@ public YourHome()
                     App.PicturesPath = localSettings.Values["PicturesLocation"].ToString();
                     App.MusicPath = localSettings.Values["MusicLocation"].ToString();
                     App.VideosPath = localSettings.Values["VideosLocation"].ToString();
+                    App.OneDrivePath = localSettings.Values["OneDriveLocation"].ToString();
                 }
             }