Updated icons and images.

Khernet.App.UI nuget package updated to version 1.0.1
lemalcs · Apr 25, 2021 · d02333a · d02333a
1 parent 27bbff5
commit d02333a
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 42 deletions.
diff --git a/Khernet.Installer/Khernet.Installer.Launcher/Logo.png b/Khernet.Installer/Khernet.Installer.Launcher/Logo.png
diff --git a/Khernet.Installer/Khernet.Installer.Launcher/TitleLogo.png b/Khernet.Installer/Khernet.Installer.Launcher/TitleLogo.png
diff --git a/Khernet.Installer/installer/src/main.rs b/Khernet.Installer/installer/src/main.rs
@@ -13,7 +13,7 @@ mod logger;
 mod dotnet_installer;
 mod repository;
 
-const APP_VERSION:&str="0.15.2";
+const APP_VERSION:&str="0.15.3";
 const APP_DIR:&str="khernet-app";
 const INNER_APP_DIR_PREFIX:&str="app-";
 const LAUNCHER_FILE:&str="khernetlauncher.exe";

diff --git a/Khernet.UI/Khernet.UI.Container/Khernet.UI.Container.csproj b/Khernet.UI/Khernet.UI.Container/Khernet.UI.Container.csproj
@@ -93,11 +93,11 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Khernet.App.UI.1.0.0\build\Khernet.App.UI.targets" Condition="Exists('..\packages\Khernet.App.UI.1.0.0\build\Khernet.App.UI.targets')" />
+  <Import Project="..\packages\Khernet.App.UI.1.0.1\build\Khernet.App.UI.targets" Condition="Exists('..\packages\Khernet.App.UI.1.0.1\build\Khernet.App.UI.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.UI.1.0.0\build\Khernet.App.UI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Khernet.App.UI.1.0.0\build\Khernet.App.UI.targets'))" />
+    <Error Condition="!Exists('..\packages\Khernet.App.UI.1.0.1\build\Khernet.App.UI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Khernet.App.UI.1.0.1\build\Khernet.App.UI.targets'))" />
   </Target>
 </Project>
diff --git a/Khernet.UI/Khernet.UI.Container/packages.config b/Khernet.UI/Khernet.UI.Container/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Khernet.App.UI" version="1.0.0" targetFramework="net40" />
+  <package id="Khernet.App.UI" version="1.0.1" targetFramework="net40" />
 </packages>
diff --git a/Khernet.UI/Khernet.UI.Presentation/Converters/NullToStretchImageConverter.cs b/Khernet.UI/Khernet.UI.Presentation/Converters/NullToStretchImageConverter.cs
diff --git a/Khernet.UI/Khernet.UI.Presentation/Khernet.UI.Presentation.csproj b/Khernet.UI/Khernet.UI.Presentation/Khernet.UI.Presentation.csproj
@@ -68,9 +68,7 @@
   <PropertyGroup>
     <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <StartupObject>Khernet.UI.Program</StartupObject>
   </PropertyGroup>
@@ -97,6 +95,12 @@
   <PropertyGroup>
     <ApplicationIcon>LogoIcon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <Win32Resource>
+    </Win32Resource>
+  </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup />
   <Choose>
     <When Condition=" '$(Configuration)'=='Debug' " />
     <Otherwise>
@@ -239,7 +243,6 @@
     <Compile Include="Converters\InverseBoolConverter.cs" />
     <Compile Include="Converters\BoolToHeightConverter.cs" />
     <Compile Include="Converters\VolumeToStringConverter.cs" />
-    <Compile Include="Converters\NullToStretchImageConverter.cs" />
     <Compile Include="Converters\BoolToStringConverter.cs" />
     <Compile Include="Converters\NullToVisibilityGoneConverter.cs" />
     <Compile Include="Converters\Emojis\EmojiConverter.cs" />

diff --git a/Khernet.UI/Khernet.UI.Presentation/LogoIcon.ico b/Khernet.UI/Khernet.UI.Presentation/LogoIcon.ico
diff --git a/Khernet.UI/Khernet.UI.Presentation/MainWindow.xaml b/Khernet.UI/Khernet.UI.Presentation/MainWindow.xaml
@@ -10,7 +10,6 @@
                       x:Class="Khernet.UI.MainWindow"
                       mc:Ignorable="d"
                       x:Name="MainWin"
-                      Title="(RC)"
                       ShowIconOnTitleBar="True"
                       WindowTransitionsEnabled="False"
                       WindowStartupLocation="CenterScreen"
@@ -30,7 +29,7 @@
     <Controls:MetroWindow.LeftWindowCommands>
         <Controls:WindowCommands>
             <Image Source="{StaticResource HeaderLogo}"
-                   Height="12.5"
+                   Height="9"
                    Margin="10 0 0 0"/>
         </Controls:WindowCommands>
     </Controls:MetroWindow.LeftWindowCommands>

diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/ProfilePage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/ProfilePage.xaml
@@ -61,7 +61,7 @@
                                         Margin="10 10 10 10"
                                         Cursor="Hand">
                                     <Border.Background>
-                                        <ImageBrush Stretch="{Binding User.Avatar,Converter={conv:NullToStretchImageConverter}}"
+                                        <ImageBrush Stretch="UniformToFill"
                                                     ImageSource="{Binding User.Avatar,
                                                                     Converter={conv:BytesToImageConverter},
                                                                     FallbackValue={StaticResource DefaultAvatar},

diff --git a/Khernet.UI/Khernet.UI.Presentation/Pages/ProfileViewerPage.xaml b/Khernet.UI/Khernet.UI.Presentation/Pages/ProfileViewerPage.xaml
@@ -46,12 +46,12 @@
                         <Border CornerRadius="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
                                 Grid.Column="0"
                                 Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}"
-                                Height="120"
-                                Margin="20 20 20 20"
+                                Height="100"
+                                Margin="20"
                                 Cursor="Hand"
                                 >
                             <Border.Background>
-                                <ImageBrush Stretch="{Binding User.Avatar,Converter={conv:NullToStretchImageConverter}}"
+                                <ImageBrush Stretch="UniformToFill"
                                             ImageSource="{Binding User.Avatar, 
                                                             Converter={conv:BytesToImageConverter}, 
                                                             FallbackValue={StaticResource DefaultAvatar},

diff --git a/Khernet.UI/Khernet.UI.Presentation/Properties/AssemblyInfo.cs b/Khernet.UI/Khernet.UI.Presentation/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Khernet")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -49,5 +49,5 @@
 // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión 
 // mediante el carácter '*', como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.15.2.0")]
-[assembly: AssemblyFileVersion("0.15.2.0")]
+[assembly: AssemblyVersion("0.15.3.0")]
+[assembly: AssemblyFileVersion("0.15.3.0")]
diff --git a/Khernet.UI/Khernet.UI.Presentation/Resources/newMessageIcon.ico b/Khernet.UI/Khernet.UI.Presentation/Resources/newMessageIcon.ico