Moved AboutPage navigation to CommandBar

Author: Avid29

src/Quarrel.ViewModels/ViewModels/CurrentUserViewModel.cs

@@ -48,7 +48,6 @@ public CurrentUserViewModel(IMessenger messenger, IDiscordService discordService
         [ICommand]
         public void NavigateToSettings()
         {
-            _messenger.Send(new NavigateToSubPageMessage(typeof(AboutPageViewModel)));
         }
     }
 }

src/Quarrel/Controls/Shell/CurrentUserButton.xaml

@@ -85,6 +85,7 @@
                 </StackPanel>
 
                 <Button
+                    IsEnabled="False"
                     Grid.Column="2"
                     Margin="0,0,16,0"
                     Padding="0"

src/Quarrel/Controls/Shell/QuarrelCommandBar.xaml

@@ -8,29 +8,29 @@
     mc:Ignorable="d"
     d:DesignHeight="56"
     d:DesignWidth="800">
-    
+
     <CommandBar.Content>
         <Grid Height="40">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="72"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            
+
             <!--Hamburger button-->
-                <AppBarButton Height="40"
+            <AppBarButton Height="40"
                               Canvas.ZIndex="1"
                               Background="Transparent"
                               HorizontalAlignment="Stretch"
                               Click="HamburgerClicked">
-                    <AppBarButton.Content>
-                        <FontIcon Glyph="&#xE700;"
+                <AppBarButton.Content>
+                    <FontIcon Glyph="&#xE700;"
                                   FontSize="24"
                                   Margin="0,4,0,0"/>
-                    </AppBarButton.Content>
-                </AppBarButton>
+                </AppBarButton.Content>
+            </AppBarButton>
         </Grid>
     </CommandBar.Content>
-    
+
     <CommandBar.PrimaryCommands>
         <AppBarButton x:Uid="CommandBar/CallABB"
                       Label="Call"
@@ -39,7 +39,7 @@
                 <FontIcon Glyph="&#xE13A;" FontSize="24" Margin="0,4,0,0"/>
             </AppBarButton.Content>
         </AppBarButton>
-        
+
         <AppBarButton x:Uid="CommandBar/ToggleMembersABB"
                       Label="Toggle Member List"
                       Background="Transparent"
@@ -49,11 +49,24 @@
             </AppBarButton.Content>
         </AppBarButton>
     </CommandBar.PrimaryCommands>
-    
+
     <CommandBar.SecondaryCommands>
         <AppBarButton x:Uid="CommandBar/DiscordStatusABB"
                       Label="Discord Status"
                       Background="Transparent"
-                      Click="GoToDiscordStatus"/>
+                      Click="GoToDiscordStatus">
+            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xECAD;"/>
+        </AppBarButton>
+        <AppBarButton x:Uid="CommandBar/SettingsABB"
+                      Label="Settings"
+                      Icon="Setting"
+                      Background="Transparent"
+                      IsEnabled="False"/>
+        <AppBarButton x:Uid="CommandBar/AboutABB"
+                      Label="About"
+                      Background="Transparent"
+                      Click="GoToAbout">
+            <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xF142;" />
+        </AppBarButton>
     </CommandBar.SecondaryCommands>
 </CommandBar>

src/Quarrel/Controls/Shell/QuarrelCommandBar.xaml.cs

@@ -6,6 +6,7 @@
 using Quarrel.Messages.Navigation.SubPages;
 using Quarrel.Messages.Panel;
 using Quarrel.ViewModels.SubPages.DiscordStatus;
+using Quarrel.ViewModels.SubPages.Meta;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -29,5 +30,8 @@ private void HamburgerClicked(object sender, RoutedEventArgs e)
 
         private void GoToDiscordStatus(object sender, RoutedEventArgs e)
             => _messenger.Send(new NavigateToSubPageMessage(typeof(DiscordStatusViewModel)));
+
+        private void GoToAbout(object sender, RoutedEventArgs e)
+            => _messenger.Send(new NavigateToSubPageMessage(typeof(AboutPageViewModel)));
     }
 }