No commit message

Quantumzhao · Aug 24, 2020 · 16d200d · 16d200d
1 parent fe82f3f
commit 16d200d
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 24 deletions.
diff --git a/GUESS/App.axaml b/GUESS/App.axaml
@@ -59,11 +59,6 @@
       <Style Selector="Border[Tag=MainSection]">
         <Setter Property="BoxShadow" Value="0 5 30 0 #33000000"/>
       </Style>
-      <Style Selector="TextBlock.Comment">
-        <Setter Property="FontFamily" Value="Segoe UI"/>
-        <Setter Property="FontSize" Value="12"/>
-        <Setter Property="Foreground" Value="#ff000000"/>
-      </Style>
       <Style Selector="ripple|RippleEffect">
         <Setter Property="RippleFill" Value="#fff0f0f0"/>
         <Setter Property="RippleOpacity" Value="0.25"/>
@@ -82,5 +77,6 @@
     </Application.Styles>
 
   <Application.Resources>
+    <FontFamily x:Key="PierSans">resm:GUESS.Assets.Fonts.PIER-REGULAR.OTF</FontFamily>
   </Application.Resources>
 </Application>
diff --git a/GUESS/Fonts/PIER-BOLD.OTF → GUESS/Assets/Fonts/PIER-BOLD.OTF b/GUESS/Fonts/PIER-BOLD.OTF → GUESS/Assets/Fonts/PIER-BOLD.OTF
diff --git a/GUESS/Fonts/PIER-REGULAR.OTF → GUESS/Assets/Fonts/PIER-REGULAR.OTF b/GUESS/Fonts/PIER-REGULAR.OTF → GUESS/Assets/Fonts/PIER-REGULAR.OTF
diff --git a/GUESS/Assets/GUESS_Design.png b/GUESS/Assets/GUESS_Design.png
diff --git a/GUESS/Assets/screenshot.jpg b/GUESS/Assets/screenshot.jpg
diff --git a/GUESS/Fonts/PIER-BOLD-ITALIC.OTF b/GUESS/Fonts/PIER-BOLD-ITALIC.OTF
diff --git a/GUESS/Fonts/PIER-ITALIC.OTF b/GUESS/Fonts/PIER-ITALIC.OTF
diff --git a/GUESS/GUESS.csproj b/GUESS/GUESS.csproj
@@ -1,37 +1,39 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
+   <AvaloniaResource Include="Assets\Fonts\*" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="Assets\ball.png" />
     <None Remove="Assets\header.png" />
     <None Remove="Assets\highlight.png" />
     <None Remove="Assets\info_bar.png" />
     <None Remove="Assets\peg.png" />
-    <None Remove="Assets\submit.png" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.10.0-preview3" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview3" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
-    <PackageReference Include="Dotnet.Bundle" Version="*" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview3" />
+    <PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ripple\Ripple.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\Fonts\PIER-BOLD.OTF" />
+    <EmbeddedResource Include="Assets\Fonts\PIER-REGULAR.OTF" />
+  </ItemGroup>
   <PropertyGroup>
     <CFBundleName>Guess</CFBundleName>
-    <!-- Also defines .app file name -->
+    <CFBundleExecutable>GUESS</CFBundleExecutable>
     <CFBundleDisplayName>Guess</CFBundleDisplayName>
-    <CFBundleIdentifier>com.example</CFBundleIdentifier>
+    <CFBundleIdentifier>com.guess</CFBundleIdentifier>
     <CFBundleVersion>1.0.0</CFBundleVersion>
     <CFBundlePackageType>AAPL</CFBundlePackageType>
-    <!-- Will be copied from output directory -->
     <NSPrincipalClass>NSApplication</NSPrincipalClass>
     <NSHighResolutionCapable>true</NSHighResolutionCapable>
     <CFBundleShortVersionString>1.0.0</CFBundleShortVersionString>

diff --git a/GUESS/Views/MainWindow.axaml b/GUESS/Views/MainWindow.axaml
@@ -13,10 +13,10 @@
         Icon="/Assets/avalonia-logo.ico"
         Title="GUESS"
         SizeToContent="WidthAndHeight"
-        WindowStartupLocation="CenterScreen"
+        ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="NoChrome"
         ExtendClientAreaTitleBarHeightHint="40"
-        ExtendClientAreaToDecorationsHint="True">
+        WindowStartupLocation="CenterScreen">
 
     <Design.DataContext>
         <vm:MainWindowViewModel/>
@@ -48,8 +48,8 @@
       <Grid>
         <TextBlock
           FontFamily="Pier Sans"
-          FontSize="40"
           FontWeight="Bold"
+          FontSize="40"
           Margin="32 32 0 0"
           DockPanel.Dock="Top"
           HorizontalAlignment="Left"
@@ -166,15 +166,15 @@
         </Border>
       </ripple:RippleEffect>
       <TextBlock
+        FontFamily="Pier Sans"
+        FontWeight="Regular"
         Text="{Binding TrialsRemainingCount}"
         DockPanel.Dock="Right"
         TextAlignment="Right"
         HorizontalAlignment="Right"
         VerticalAlignment="Center"
         Margin="0 20 21 0"
-        FontFamily="Pier Sans"
         FontSize="25"
-        FontWeight="Regular"
         Foreground="{Binding TrialsRemainingCount, Converter={x:Static 
           converters:RemainingTrialsToBrushConverter.Singleton}}">
       </TextBlock>
@@ -186,8 +186,8 @@
         HorizontalAlignment="Right"
         VerticalAlignment="Center"
         FontFamily="Pier Sans"
-        FontSize="25"
         FontWeight="Regular"
+        FontSize="25"
         Foreground="#353535">
       </TextBlock>
       <ripple:RippleEffect

diff --git a/README.md b/README.md
@@ -2,11 +2,7 @@
 
 It is a reproduction of the simple game *Guess*, being developed using Avalonia UI. Which also means it's cross-platform. 
 
-## Artistic Illustration
-
-![GUESS_Design](GUESS_Design.png)
-
-> Note this is only a concept, which might differ from the final outcome
+## ## Screenshot<img src="GUESS/Assets/screenshot.jpg" alt="screenshot" style="zoom:50%;" />
 
 ## Game Rules