New styles for buttons and textboxes and context menus.

Khernet.App.Container nuget package updated to 1.0.7 version. Removed unused folders of vlc library. Version marked as RC (Release Candidate)
lemalcs · Jul 6, 2020 · a7ce2e2 · a7ce2e2
1 parent a6fa616
commit a7ce2e2
Show file tree

Hide file tree

Showing 37 changed files with 603 additions and 1,812 deletions.
diff --git a/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj b/Khernet.Core/Engine/Khernet.Core.Container/Khernet.Core.Container.csproj
@@ -69,11 +69,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets" Condition="Exists('..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets')" />
+  <Import Project="..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets" Condition="Exists('..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Khernet.App.Container.1.0.6\build\Khernet.App.Container.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Khernet.App.Container.1.0.7\build\Khernet.App.Container.targets'))" />
   </Target>
 </Project>
diff --git a/Khernet.Core/Engine/Khernet.Core.Container/packages.config b/Khernet.Core/Engine/Khernet.Core.Container/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Khernet.App.Container" version="1.0.6" targetFramework="net40" />
+  <package id="Khernet.App.Container" version="1.0.7" targetFramework="net40" />
 </packages>
diff --git a/Khernet.UI/Khernet.UI.Presentation/App.xaml b/Khernet.UI/Khernet.UI.Presentation/App.xaml
@@ -17,14 +17,14 @@
                 <ResourceDictionary Source="/Khernet;component/Styles/Colors.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/ScrollBar.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/FontStyles.xaml"/>
+                <ResourceDictionary Source="/Khernet;component/Styles/Textblocks.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/Buttons.xaml"/>
+                <ResourceDictionary Source="/Khernet;component/Resources/ObjectModels.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/Textboxes.xaml"/>
-                <ResourceDictionary Source="/Khernet;component/Styles/Textblocks.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/Sliders.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/ListBoxStyles.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Styles/MarkdownStyles.xaml"/>
                 <ResourceDictionary Source="/Khernet;component/Resources/DataTemplates.xaml"/>
-                <ResourceDictionary Source="/Khernet;component/Resources/ObjectModels.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="{x:Type Controls:MetroWindow}" x:Key="WinStyle" BasedOn="{StaticResource CleanWindowStyleKey}"/>
         </ResourceDictionary>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/FileMessageControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/FileMessageControl.xaml
@@ -92,6 +92,7 @@
                     <!-- File name-->
                     <TextBlock Text="{Binding FileName}"
                                FontFamily="{StaticResource RobotoBoldFont}"
+                               Style="{StaticResource TextblockItemStyle}"
                                Grid.Row="0"
                                Margin="0"/>
 
@@ -105,7 +106,7 @@
                         </TextBlock>
 
                         <!--File size-->
-                        <TextBlock>
+                        <TextBlock Style="{StaticResource TextblockItemStyle}">
                         <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>
                         <Run Text="{Binding FileSize,Converter={conv:SizeToUnitNameConverter}}"/>
                         </TextBlock>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/ReplyMessageControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/ReplyMessageControl.xaml
@@ -145,15 +145,17 @@
                     <TextBlock Grid.Column="2"
                                Grid.Row="1"
                                depend:InlineSourceProperty.Value="{Binding TextContent}"
-                               Margin="8 5 0 5"/>
+                               Margin="8 5 0 5"
+                               Style="{StaticResource TextblockItemStyle}"/>
 
                     <!--File name-->
                     <TextBlock Grid.Column="2"
                                Grid.Row="1"
                                Text="{Binding FileName}"
                                Visibility="{Binding FileName,Converter={conv:StringToVisibilityConverter}}"
                                VerticalAlignment="Center"
-                               Margin="0"/>
+                               Margin="0"
+                               Style="{StaticResource TextblockItemStyle}"/>
                 </Grid>
             </Grid>
         </Border>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/VideoMessageControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Chat/VideoMessageControl.xaml
@@ -93,7 +93,8 @@
                            HorizontalAlignment="Left"
                            Text="{Binding Duration,Converter={conv:TimeSpanToStringConverter}}"
                            Foreground="White"
-                           Padding="8 0 0 8"/>
+                           Padding="8 0 0 8"
+                           Style="{StaticResource TextblockItemStyle}"/>
             </Grid>
 
             <!--Video Name-->
@@ -103,7 +104,8 @@
                        VerticalAlignment="Top"
                        HorizontalAlignment="Stretch"
                        Padding="8 8 8 0"
-                       MaxWidth="{Binding Path=ActualWidth,ElementName=img}"/>
+                       MaxWidth="{Binding Path=ActualWidth,ElementName=img}"
+                       Style="{StaticResource TextblockItemStyle}"/>
 
         </Grid>
     </Grid>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/CacheCleanerControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/CacheCleanerControl.xaml
@@ -20,7 +20,8 @@
         <TextBlock Grid.Row="0"
                    Text="{Binding TextProgress}"
                    VerticalAlignment="Center"
-                   Margin="20 20 0 15"/>
+                   Margin="20 20 0 15"
+                   Style="{StaticResource TextblockItemStyle}"/>
 
         <!-- Progress ring to show load progress -->
         <Controls:ProgressRing Grid.Row="1"
@@ -31,11 +32,12 @@
                                VerticalAlignment="Center"
                                        />
         <!--Accept button-->
-        <Button Content="Accept"
+        <Button Content="OK"
                 Visibility="{Binding IsCleaning,Converter={conv:InverseBoolToVisibilityConverter}}"
-                    Click="Button_Click_1"
-                    HorizontalAlignment="Center"
-                    Margin="0 0 0 10"
-                    Width="100"/>
+                Click="Button_Click_1"
+                HorizontalAlignment="Center"
+                Margin="0 0 0 10"
+                Width="100"
+                Style="{StaticResource HexagonalButtonStyle}"/>
     </StackPanel>
 </local:BasePopUpControl>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/FieldEditorControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/FieldEditorControl.xaml
@@ -84,18 +84,20 @@
                     Margin="15">
 
             <!--Accept button-->
-            <Button Content="Accept"
+            <Button Content="OK"
                     Command="{Binding UpdateFieldCommand}"
                     CommandParameter="{Binding ElementName=nameEditor}"
+                    Style="{StaticResource HexagonalButtonStyle}"
                     Click="Button_Click_1"
                     HorizontalAlignment="Left"
                     Margin="10 0 0 0"
                     Width="100"/>
 
             <!--Cancel button-->
-            <Button Content="Cancel"
+            <Button Content="CANCEL"
                     Click="Button_Click_1"
                     HorizontalAlignment="Right"
+                    Style="{StaticResource LightHexagonalButtonStyle}"
                     Margin="10 0 0 0"
                     Width="100"/>
 

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/NotificationControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Dialogs/NotificationControl.xaml
@@ -65,8 +65,7 @@
                                VerticalAlignment="Center"
                                Foreground="{StaticResource LightBrush}"
                                FontSize="{StaticResource LargeFontSize}"
-                               FontFamily="{StaticResource RobotoBoldFont}"
-                               />
+                               FontFamily="{StaticResource RobotoBoldFont}"/>
                 </Border>
 
                 <!-- Profile picture-->
@@ -90,12 +89,13 @@
 
                     <!--User name-->
                     <RichTextBox depend:DocumentSourceProperty.Value="{Binding User.DisplayName}"
-                               IsReadOnly="True"
+                                 IsReadOnly="True"
                                  BorderThickness="0"
-                                             IsReadOnlyCaretVisible="True"/>
+                                 IsReadOnlyCaretVisible="True"/>
 
                     <!--Message type description-->
                     <TextBlock Text="{Binding MessageType,Converter={conv:MessageTypeToFriendlyName}}"
+                               Style="{StaticResource TextblockItemStyle}"
                                Margin="0 10 0 0"/>
                 </StackPanel>
             </Grid>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/AudioItemControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/AudioItemControl.xaml
@@ -118,6 +118,7 @@
             <TextBlock Text="{Binding FileName}"
                        Grid.Row="0"
                        FontFamily="{StaticResource RobotoBoldFont}"
+                       Style="{StaticResource TextblockItemStyle}"
                        TextWrapping="WrapWithOverflow"
                        Width="250"
                        HorizontalAlignment="Left"/>
@@ -127,7 +128,7 @@
                         Visibility="{Binding IsReadingFile, Converter={conv:BoolToVisibilityGoneConverter}, FallbackValue=Collapsed}">
 
                 <!--File size-->
-                <TextBlock>
+                <TextBlock Style="{StaticResource TextblockItemStyle}">
                     <Run Text="{Binding CurrentReadBytes,Converter={conv:SizeUnitConverter}}"/>
                     <Run Text=" / "/>
                     <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/ImageItemControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/ImageItemControl.xaml
@@ -98,13 +98,15 @@
                        Text="{Binding SendDate,Converter={conv:TimeToStringConverter}}"
                        Foreground="{StaticResource DarkGrayBrush}"
                        FontSize="{StaticResource SmallFontSize}"
+                       FontFamily="{StaticResource RobotoRegularFont}"
                        Margin="5 5 0 0"
                        Visibility="{Binding IsMessageLoaded,Converter={conv:BoolToVisibilityGoneConverter}}"/>
 
             <!-- Image size in bytes -->
             <TextBlock Grid.Row="2"
                        Foreground="{StaticResource DarkGrayBrush}"
                        FontSize="{StaticResource SmallFontSize}"
+                       FontFamily="{StaticResource RobotoRegularFont}"
                        Margin="5 0 0 10"
                        Visibility="{Binding IsMessageLoaded,Converter={conv:BoolToVisibilityGoneConverter}}">
                         <Run Text="{Binding FileSize,Converter={conv:SizeUnitConverter}}"/>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/Media/MediaGalleryControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/Media/MediaGalleryControl.xaml
@@ -61,7 +61,8 @@
             <TextBlock Text="Loading..."
                        Visibility="{Binding IsLoading,Converter={conv:BoolToVisibilityGoneConverter},FallbackValue=Collapsed}"
                        HorizontalAlignment="Center"
-                       VerticalAlignment="Center"/>
+                       VerticalAlignment="Center"
+                       Style="{StaticResource TextblockItemStyle}"/>
         </Grid>
 
     </Border>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/MessageBoxUserControl.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/MessageBoxUserControl.xaml
@@ -12,56 +12,54 @@
                              Height="140"
                              Width="286"
                              d:DataContext="{d:DesignInstance vm:MessageBoxDesignModel,IsDesignTimeCreatable=True}">
-    
+
     <Grid Background="{StaticResource LightBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-            <!-- Text message -->
-            <FlowDocumentScrollViewer 
-                                      Margin="0 20 0 0"
-                                      Grid.Row="0"
-                                      VerticalScrollBarVisibility="Auto">
-                <FlowDocument FontFamily="{StaticResource RobotoRegularFont}"
-                              FontSize="{StaticResource RegularFontSize}">
-                    <Paragraph>
-                        <Run Text="{Binding Message}"/>
-                    </Paragraph>
-                </FlowDocument>
-            </FlowDocumentScrollViewer>
+        <!-- Text message -->
+        <FlowDocumentScrollViewer Margin="0 20 0 0"
+                                  Grid.Row="0"
+                                  VerticalScrollBarVisibility="Auto">
+            <FlowDocument FontFamily="{StaticResource RobotoRegularFont}"
+                          FontSize="{StaticResource RegularFontSize}">
+                <Paragraph>
+                    <Run Text="{Binding Message}"/>
+                </Paragraph>
+            </FlowDocument>
+        </FlowDocumentScrollViewer>
 
         <StackPanel Orientation="Horizontal"
-                        HorizontalAlignment="Right"
-                        Grid.Row="1"
+                    HorizontalAlignment="Right"
+                    Grid.Row="1"
                     Margin="0 15 15 15">
 
-                <!-- Accept button -->
+            <!-- Accept button -->
             <Button Margin="10 0 0 0"
-                        Visibility="{Binding ShowAcceptOption,Converter={conv:BoolToVisibilityGoneConverter}}"
-                        Content="{Binding AcceptOptionLabel}"
-                        MaxWidth="100"
+                    Visibility="{Binding ShowAcceptOption,Converter={conv:BoolToVisibilityGoneConverter}}"
+                    Content="{Binding AcceptOptionLabel}"
+                    MaxWidth="100"
                     MinWidth="80"
-                        Command="{Binding AcceptCommand}"
-                        IsDefault="True"
-                        Click="Button_Click"
-                        HorizontalAlignment="Right"
-                        >
-
-                </Button>
+                    Height="30"
+                    Command="{Binding AcceptCommand}"
+                    IsDefault="True"
+                    Click="Button_Click"
+                    HorizontalAlignment="Right"
+                    Style="{StaticResource HexagonalButtonStyle}"/>
 
-                <!-- Cancel button -->
+            <!-- Cancel button -->
             <Button Margin="10 0 0 0"
-                        Visibility="{Binding ShowCancelOption,Converter={conv:BoolToVisibilityGoneConverter}}"
-                        Content="{Binding CancelOptionLabel}"
-                        MaxWidth="100"
+                    Visibility="{Binding ShowCancelOption,Converter={conv:BoolToVisibilityGoneConverter}}"
+                    Content="{Binding CancelOptionLabel}"
+                    MaxWidth="100"
                     MinWidth="80"
-                        Command="{Binding CancelCommand}"
-                        Click="Button_Click"
-                        HorizontalAlignment="Right">
-
-                </Button>
-            </StackPanel>
+                    Height="30"
+                    Command="{Binding CancelCommand}"
+                    Click="Button_Click"
+                    HorizontalAlignment="Right"
+                    Style="{StaticResource LightHexagonalButtonStyle}"/>
+        </StackPanel>
     </Grid>
 </local:BaseDialogUserControl>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Controls/User/UserBrowser.xaml b/Khernet.UI/Khernet.UI.Presentation/Controls/User/UserBrowser.xaml
@@ -37,26 +37,17 @@
                             <Button ToolTip="Settings" 
                                     Grid.Column="0"
                                     Command="{Binding ApplicationViewModel.ViewSettingsCommand,Source={x:Static app:ViewModelLocator.Instance}}"
-                                    Style="{DynamicResource ButtonStyle2}">
+                                    Style="{DynamicResource GlowButtonStyle}">
                                 <iconPacks:PackIconMaterial Width="15" Kind="Settings" />
                             </Button>
 
                             <!-- Update button -->
                             <Button 
                                 Grid.Column="1" 
-                                Style="{DynamicResource ButtonStyle2}"
+                                Style="{DynamicResource GlowButtonStyle}"
                                 Visibility="Hidden">
                                 <iconPacks:PackIconMaterial Kind="Refresh" Width="15" Height="15"/>
                             </Button>
-
-                            <!--Search user textbox-->
-                            <TextBox 
-                                Grid.Column="2"
-                                Visibility="Hidden"
-                                Height="10"
-                                Margin="5 0 5 0"
-                                Controls:TextBoxHelper.Watermark="Search user..."
-                                Style="{StaticResource TextBoxStyle11}"/>
                         </Grid>
                     </Border>
 

diff --git a/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShapeMultiConverter.cs b/Khernet.UI/Khernet.UI.Presentation/Converters/ButtonShapeMultiConverter.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Khernet.UI.Converters
+{
+    /// <summary>
+    /// Returns a <see cref="PointCollection"/> containing a hexagon.
+    /// </summary>
+    public class ButtonShapeMultiConverter : BaseMultiValueConverter<ButtonShapeMultiConverter>
+    {
+        public override object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null)
+                return null;
+
+            if (values[0] == DependencyProperty.UnsetValue ||
+                values[1] == DependencyProperty.UnsetValue)
+                return null;
+
+
+            double width = (double)values[0];
+            double height = (double)values[1] / 2;
+
+            double xFirstCoordinate = height * Math.Tan(Math.PI / 6);
+
+            Point Point4 = new Point(xFirstCoordinate, 0);
+            Point Point5 = new Point(0, height);
+            Point Point6 = new Point(xFirstCoordinate, height * 2);
+            Point Point7 = new Point(width, height * 2);
+            Point Point8 = new Point(width + xFirstCoordinate, height);
+            Point Point9 = new Point(width, 0);
+
+            PointCollection myPointCollection2 = new PointCollection();
+
+            myPointCollection2.Add(Point4);
+            myPointCollection2.Add(Point5);
+            myPointCollection2.Add(Point6);
+            myPointCollection2.Add(Point7);
+            myPointCollection2.Add(Point8);
+            myPointCollection2.Add(Point9);
+
+            return myPointCollection2;
+        }
+
+        public override object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+}