Skip to content

Commit

Permalink
Variety of Fixes to themes, additional features and new name
Browse files Browse the repository at this point in the history
- Fixes to Theme displaying incorrectly on Light System theme
- Fixes to UI Elements
- Added some basic user settings
- File associations with supported files
- Rebranding from MarkdownUWP
  • Loading branch information
Empyreal96 committed Sep 9, 2022
1 parent 18fdd18 commit 99277de
Show file tree
Hide file tree
Showing 10 changed files with 927 additions and 153 deletions.
2 changes: 1 addition & 1 deletion MarkdownUWP/MarkdownUWP.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.32126.315
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkdownUWP", "MarkdownUWP\MarkdownUWP.csproj", "{3E79B9F8-4D67-41E8-8483-4C68026231D1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universal Markup Editor", "MarkdownUWP\Universal Markup Editor.csproj", "{3E79B9F8-4D67-41E8-8483-4C68026231D1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCompress", "..\..\..\Downloads\SharpCompressUWP\SharpCompressUWP-main\src\SharpCompress.csproj", "{8F9BB3EE-E365-4FE0-B5EE-FB45D7E7FE41}"
EndProject
Expand Down
43 changes: 43 additions & 0 deletions MarkdownUWP/MarkdownUWP/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Windows.ApplicationModel.Activation;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.Storage;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
Expand Down Expand Up @@ -66,13 +67,55 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
// When the navigation stack isn't restored navigate to the first page,
// configuring the new page by passing required information as a navigation
// parameter




rootFrame.Navigate(typeof(MainPage), e.Arguments);
}
// Ensure the current window is active
Window.Current.Activate();
}
}

protected override void OnFileActivated(FileActivatedEventArgs args)
{
if (args.Files.Count != 0)
{
var file = args.Files[0];
if (file is StorageFile)
{
OpenFileHelper.activatedFile = file as StorageFile;
}

}
// The number of files received is args.Files.Count
// The name of the first file is args.Files[0].Name
Frame rootFrame = Window.Current.Content as Frame;
if (rootFrame == null)
{
// Create a Frame to act as the navigation context and navigate to the first page
rootFrame = new Frame();

rootFrame.NavigationFailed += OnNavigationFailed;



// Place the frame in the current Window
Window.Current.Content = rootFrame;
}
if (rootFrame.Content == null)
{
// When the navigation stack isn't restored navigate to the first page,
// configuring the new page by passing required information as a navigation
// parameter

rootFrame.Navigate(typeof(MainPage));
}
// Ensure the current window is active
Window.Current.Activate();
}

/// <summary>
/// Invoked when Navigation to a certain page fails
/// </summary>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
215 changes: 140 additions & 75 deletions MarkdownUWP/MarkdownUWP/MainPage.xaml

Large diffs are not rendered by default.

Loading

0 comments on commit 99277de

Please sign in to comment.