Updated the main page layout to fit the Windows 11 guideline. (#38)

* Improved the layout of DevToys * layout v2 * cleaning * removed back button * refactoring
DevToys-app · Oct 22, 2021 · 86598e3 · 86598e3
1 parent 9af9e4a
commit 86598e3
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 131 deletions.
diff --git a/src/dev/impl/DevToys.MonacoEditor/CodeEditorControl/CodeEditorCore.cs b/src/dev/impl/DevToys.MonacoEditor/CodeEditorControl/CodeEditorCore.cs
@@ -19,6 +19,7 @@
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
@@ -649,7 +650,13 @@ protected override void OnApplyTemplate()
                 _view.DOMContentLoaded += WebView_DOMContentLoaded;
                 _view.NavigationCompleted += WebView_NavigationCompleted;
                 _view.NewWindowRequested += WebView_NewWindowRequested;
-                _view.Source = new System.Uri("ms-appx-web:///DevToys.MonacoEditor/CodeEditorControl/CodeEditorCore.html");
+                Task.Delay(250).ContinueWith(async _ =>
+                {
+                    await _view.Dispatcher.RunIdleAsync((IdleDispatchedHandlerArgs e) =>
+                    {
+                        _view.Source = new System.Uri("ms-appx-web:///DevToys.MonacoEditor/CodeEditorControl/CodeEditorCore.html");
+                    });
+                });
             }
 
             base.OnApplyTemplate();

diff --git a/src/dev/impl/DevToys/App.xaml.cs b/src/dev/impl/DevToys/App.xaml.cs
@@ -105,36 +105,14 @@ protected override async void OnLaunched(LaunchActivatedEventArgs e)
                 // On Windows 10 version 1607 or later, this code signals that this app wants to participate in prelaunch
                 CoreApplication.EnablePrelaunch(true);
 
-                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),
-                        new NavigationParameter(
-                            mefComposer.ExportProvider.GetExport<IMefProvider>(),
-                            query: e.Arguments),
-                        new SuppressNavigationTransitionInfo());
-                }
+                await NavigateToMainPageAsync(rootFrame, e.Arguments);
 
                 // Ensure the current window is active
                 Window.Current.Activate();
             }
             else
             {
-                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),
-                        new NavigationParameter(
-                            mefComposer.ExportProvider.GetExport<IMefProvider>(),
-                            query: e.Arguments),
-                        new SuppressNavigationTransitionInfo());
-                }
+                await NavigateToMainPageAsync(rootFrame, e.Arguments);
             }
 
             // Setup the title bar.
@@ -239,6 +217,24 @@ private async Task<Frame> EnsureWindowIsInitializedAsync()
             return rootFrame;
         }
 
+        private async Task NavigateToMainPageAsync(Frame rootFrame, string arguments)
+        {
+            if (rootFrame.Content == null)
+            {
+                var mefComposer = await _mefComposer;
+
+                // 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),
+                    new NavigationParameter(
+                        mefComposer.ExportProvider.GetExport<IMefProvider>(),
+                        query: arguments),
+                    new SuppressNavigationTransitionInfo());
+            }
+        }
+
         private async Task ValidateDefaultTextEditorFontAsync()
         {
             await TaskScheduler.Default;

diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csproj
@@ -236,7 +236,6 @@
     <Compile Include="UI\Controls\HighlightSpan.cs" />
     <Compile Include="UI\Controls\ICustomTextBox.cs" />
     <Compile Include="UI\Converters\BooleanToGridLengthConverter.cs" />
-    <Compile Include="UI\Converters\BooleanToScrollBarVisibilityConverter.cs" />
     <Compile Include="UI\Converters\BooleanToScrollModeConverter.cs" />
     <Compile Include="UI\Converters\BooleanToTextWrappingConverter.cs" />
     <Compile Include="UI\Converters\BooleanToVisibilityConverter.cs" />

diff --git a/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CodeEditor.xaml.cs
@@ -14,7 +14,7 @@
 
 namespace DevToys.UI.Controls
 {
-    public sealed partial class CodeEditor : UserControl
+    public sealed partial class CodeEditor : UserControl, IDisposable
     {
         public static readonly DependencyProperty SettingsProviderProperty
             = DependencyProperty.Register(
@@ -170,6 +170,11 @@ public CodeEditor()
             UpdateUI();
         }
 
+        public void Dispose()
+        {
+            CodeEditorCore.Dispose();
+        }
+
         private void CodeEditorCore_InternalException(MonacoEditor.CodeEditorControl.CodeEditorCore sender, Exception args)
         {
             ErrorMessage = $"{args.Message}\r\n{args.InnerException?.Message}";

diff --git a/src/dev/impl/DevToys/UI/Converters/BooleanToScrollBarVisibilityConverter.cs b/src/dev/impl/DevToys/UI/Converters/BooleanToScrollBarVisibilityConverter.cs
diff --git a/src/dev/impl/DevToys/UI/Converters/EnumToBooleanConverter.cs b/src/dev/impl/DevToys/UI/Converters/EnumToBooleanConverter.cs
@@ -11,11 +11,13 @@ namespace DevToys.UI.Converters
     /// </summary>
     public sealed class EnumToBooleanConverter : IValueConverter
     {
+        public bool IsInverted { get; set; }
+
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is null || parameter is null || !(value is Enum))
             {
-                return false;
+                return IsInverted;
             }
 
             var currentState = value.ToString();
@@ -26,11 +28,11 @@ public object Convert(object value, Type targetType, object parameter, string la
             {
                 if (string.Equals(currentState, stateStringsSplitted[i].Trim(), StringComparison.Ordinal))
                 {
-                    return true;
+                    return !IsInverted;
                 }
             }
 
-            return false;
+            return IsInverted;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)

diff --git a/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevToys/ViewModels/MainPageViewModel.cs
@@ -84,11 +84,6 @@ internal string? HeaderText
         {
             get
             {
-                if (IsInCompactOverlayMode)
-                {
-                    return null;
-                }
-
                 return SelectedMenuItem?.ToolProvider.DisplayName;
             }
         }
@@ -147,7 +142,7 @@ private set
         /// <summary>
         /// Gets or sets in what mode the navigation view is displayed.
         /// </summary>
-        public NavigationViewDisplayMode NavigationViewDisplayMode // Important to keep this property Public to bind it to ChangePropertyAction in the XAML.
+        internal NavigationViewDisplayMode NavigationViewDisplayMode
         {
             get => _navigationViewDisplayMode;
             set
@@ -161,7 +156,7 @@ public NavigationViewDisplayMode NavigationViewDisplayMode // Important to keep
         /// <summary>
         /// Gets or sets whether the pane is opened.
         /// </summary>
-        public bool IsNavigationViewPaneOpened // Important to keep this property Public to bind it to ChangePropertyAction in the XAML.
+        internal bool IsNavigationViewPaneOpened
         {
             get => _isNavigationViewPaneOpened;
             set
@@ -179,16 +174,9 @@ public NavigationViewDisplayMode ActualNavigationViewDisplayMode
         {
             get
             {
-                if (NavigationViewDisplayMode == NavigationViewDisplayMode.Expanded)
+                if (IsNavigationViewPaneOpened)
                 {
-                    if (IsNavigationViewPaneOpened)
-                    {
-                        return NavigationViewDisplayMode.Expanded;
-                    }
-                    else
-                    {
-                        return NavigationViewDisplayMode.Compact;
-                    }
+                    return NavigationViewDisplayMode.Expanded;
                 }
                 else
                 {