Timerix/SharpCalculator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fattakh_version_but_good' into fattakh

Browse Source 
# Conflicts:
#	SharpCalculator.Avalonia/MainWindow.axaml
#	SharpCalculator.Avalonia/MainWindow.axaml.cs
This commit is contained in:
Timerix22 2023-12-25 18:23:16 +06:00
commit 86b9afe02f
3 changed files with 117 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SharpCalculator.Avalonia/App.axaml
View File

@ -3,6 +3,32 @@
x:Class="SharpCalculator.Avalonia.App" x:Class="SharpCalculator.Avalonia.App"
RequestedThemeVariant="Dark"> RequestedThemeVariant="Dark">
<Application.Styles> <Application.Styles>
<SimpleTheme /> <SimpleTheme />
<Style Selector="Control.center">
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style Selector="Button.cirlce">
<Setter Property="Height" Value="60"/>
<Setter Property="Width" Value="60"/>
<Setter Property="CornerRadius" Value="30"/>
<Setter Property="Margin" Value="5"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
</Style>
<Style Selector="Button.gray">
<Setter Property="Background" Value="Gray"/>
</Style>
<Style Selector="Button.orange">
<Setter Property="Background" Value="DarkOrange"/>
</Style>
</Application.Styles> </Application.Styles>
</Application> </Application>

606
SharpCalculator.Avalonia/MainWindow.axaml
View File

@ -1,579 +1,151 @@
<Window <Window
FontFamily="Consolas"
FontSize="24"
Height="750"
Title="SharpCalculator"
Width="600"
mc:Ignorable="d"
x:Class="SharpCalculator.Avalonia.MainWindow"
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Class="SharpCalculator.Avalonia.MainWindow"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> Title="SharpCalculator"
FontFamily="Consolas" FontSize="24"
Width="600" Height="750"
MinWidth="600" MinHeight="750">
<Grid <Grid Classes="center" Margin="20">
HorizontalAlignment="Center"
Margin="20"
VerticalAlignment="Center">
<Grid.ColumnDefinitions>* * * * * * *</Grid.ColumnDefinitions> <Grid.ColumnDefinitions>* * * * * * *</Grid.ColumnDefinitions>
<Grid.RowDefinitions>* * * * * * * * * *</Grid.RowDefinitions> <Grid.RowDefinitions>* * * * * * * * * *</Grid.RowDefinitions>
<!-- 1st row --> <!-- 1st row -->
<TextBlock <TextBlock Name="Input" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7"
FontSize="40"
Grid.Column="0"
Grid.ColumnSpan="7"
Grid.Row="1"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Name="Input" Text=""/>
Text="" />
<!-- 2nd row --> <!-- 2nd row -->
<Button <Button Name="ClearButton" Classes="cirlce gray" Grid.Column="0" Grid.Row="2"
Background="Gray" Click="ClearButton_OnClick" Content="AC"/>
Click="ClearButton_OnClick"
Content="AC"
CornerRadius="30"
Grid.Column="0"
Grid.Row="2"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
Name="ClearButton"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="1" Grid.Row="2"
Background="Gray" Click="MathButton_OnClick" Content="("/>
Click="MathButton_OnClick"
Content="("
CornerRadius="30"
Grid.Column="1"
Grid.Row="2"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button
Background="Gray"
Click="MathButton_OnClick"
Content=")"
CornerRadius="30"
Grid.Column="2"
Grid.Row="2"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button
Background="Orange"
Click="MathButton_OnClick"
Content="/"
CornerRadius="30"
Grid.Column="3"
Grid.Row="2"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="2" Grid.Row="2"
Background="Gray" Click="MathButton_OnClick" Content=")" />
Click="MathButton_OnClick"
Content="^"
CornerRadius="30"
Grid.Column="4"
Grid.Row="2"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce orange" Grid.Column="3" Grid.Row="2"
Background="Gray" Click="MathButton_OnClick" Content="/"/>
Click="MathButton_OnClick"
Content="sin"
CornerRadius="30"
Grid.Column="5"
Grid.Row="2"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="4" Grid.Row="2"
Background="Gray" Click="MathButton_OnClick" Content="^"/>
Click="MathButton_OnClick"
Content="asin" <Button Classes="cirlce gray" Grid.Column="5" Grid.Row="2"
CornerRadius="30" Click="MathButton_OnClick" Content="sin"/>
Grid.Column="6"
Grid.Row="2" <Button Classes="cirlce gray" Grid.Column="6" Grid.Row="2"
Height="60" Click="MathButton_OnClick" Content="asin"/>
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<!-- 3rd row --> <!-- 3rd row -->
<Button <Button Classes="cirlce" Grid.Column="0" Grid.Row="3"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="7"/>
Content="7"
CornerRadius="30"
Grid.Column="0"
Grid.Row="3"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="1" Grid.Row="3"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="8"/>
Content="8"
CornerRadius="30"
Grid.Column="1"
Grid.Row="3"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button
Click="MathButton_OnClick"
Content="9"
CornerRadius="30"
Grid.Column="2"
Grid.Row="3"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button
Background="Orange"
Click="MathButton_OnClick"
Content="*"
CornerRadius="30"
Grid.Column="3"
Grid.Row="3"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="2" Grid.Row="3"
Background="Gray" Click="MathButton_OnClick" Content="9"/>
Click="MathButton_OnClick"
Content="e"
CornerRadius="30"
Grid.Column="4"
Grid.Row="3"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce orange" Grid.Column="3" Grid.Row="3"
Background="Gray" Click="MathButton_OnClick" Content="*"/>
Click="MathButton_OnClick"
Content="cos"
CornerRadius="30"
Grid.Column="5"
Grid.Row="3"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="4" Grid.Row="3"
Background="Gray" Click="MathButton_OnClick" Content="e"/>
Click="MathButton_OnClick"
Content="acos" <Button Classes="cirlce gray" Grid.Column="5" Grid.Row="3"
CornerRadius="30" Click="MathButton_OnClick" Content="cos"/>
Grid.Column="6"
Grid.Row="3" <Button Classes="cirlce gray" Grid.Column="6" Grid.Row="3"
Height="60" Click="MathButton_OnClick" Content="acos"/>
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<!-- 4th row --> <!-- 4th row -->
<Button <Button Classes="cirlce" Grid.Column="0" Grid.Row="4"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="4"/>
Content="4"
CornerRadius="30"
Grid.Column="0"
Grid.Row="4"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="1" Grid.Row="4"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="5"/>
Content="5"
CornerRadius="30"
Grid.Column="1"
Grid.Row="4"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="2" Grid.Row="4"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="6"/>
Content="6"
CornerRadius="30"
Grid.Column="2"
Grid.Row="4"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce orange" Grid.Column="3" Grid.Row="4"
Background="Orange" Click="MathButton_OnClick" Content="-"/>
Click="MathButton_OnClick"
Content="-"
CornerRadius="30"
Grid.Column="3"
Grid.Row="4"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="4" Grid.Row="4"
Background="Gray" Click="MathButton_OnClick" Content="10^x"/>
Click="MathButton_OnClick"
Content="10^x"
CornerRadius="30"
Grid.Column="4"
Grid.Row="4"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="5" Grid.Row="4"
Background="Gray" Click="MathButton_OnClick" Content="tan"/>
Click="MathButton_OnClick"
Content="tan"
CornerRadius="30"
Grid.Column="5"
Grid.Row="4"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="6" Grid.Row="4"
Background="Gray" Click="MathButton_OnClick" Content="atan"/>
Click="MathButton_OnClick"
Content="atan"
CornerRadius="30"
Grid.Column="6"
Grid.Row="4"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<!-- 5th row --> <!-- 5th row -->
<Button <Button Classes="cirlce" Grid.Column="0" Grid.Row="5"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="1"/>
Content="1"
CornerRadius="30"
Grid.Column="0"
Grid.Row="5"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="1" Grid.Row="5"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="2"/>
Content="2"
CornerRadius="30"
Grid.Column="1"
Grid.Row="5"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="2" Grid.Row="5"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="3"/>
Content="3"
CornerRadius="30"
Grid.Column="2"
Grid.Row="5"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce orange" Grid.Column="3" Grid.Row="5"
Background="Orange" Click="MathButton_OnClick" Content="+"/>
Click="MathButton_OnClick"
Content="+"
CornerRadius="30"
Grid.Column="3"
Grid.Row="5"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="4" Grid.Row="5"
Background="Gray" Click="MathButton_OnClick" Content="rand"/>
Click="MathButton_OnClick"
Content="rand"
CornerRadius="30"
Grid.Column="4"
Grid.Row="5"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="5" Grid.Row="5"
Background="Gray" Click="MathButton_OnClick" Content="ctg"/>
Click="MathButton_OnClick"
Content="ctg"
CornerRadius="30"
Grid.Column="5"
Grid.Row="5"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="6" Grid.Row="5"
Background="Gray" Click="MathButton_OnClick" Content="actg"/>
Click="MathButton_OnClick"
Content="actg"
CornerRadius="30"
Grid.Column="6"
Grid.Row="5"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<!-- 6th row --> <!-- 6th row -->
<Button <Button Classes="cirlce" Grid.Column="0" Grid.Row="6"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="0"/>
Content="0"
CornerRadius="30"
Grid.Column="0"
Grid.Row="6"
Height="55"
HorizontalContentAlignment="Center"
Margin="5"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="1" Grid.Row="6"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="%"/>
Content="%"
CornerRadius="30"
Grid.Column="1"
Grid.Row="6"
Height="55"
HorizontalContentAlignment="Center"
Margin="5"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce" Grid.Column="2" Grid.Row="6"
Click="MathButton_OnClick" Click="MathButton_OnClick" Content="."/>
Content="."
CornerRadius="30"
Grid.Column="2"
Grid.Row="6"
Height="55"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce orange" Grid.Column="3" Grid.Row="6"
Background="Orange" Click="ResultButton_OnClick" Content="="/>
Click="ResultButton_OnClick"
Content="="
CornerRadius="30"
Grid.Column="3"
Grid.Row="6"
Height="55"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="4" Grid.Row="6"
Background="Gray" Click="MathButton_OnClick" Content="π"/>
Click="MathButton_OnClick"
Content="π"
CornerRadius="30"
Grid.Column="4"
Grid.Row="6"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="5" Grid.Row="6"
Background="Gray" Click="MathButton_OnClick" Content="1/x"/>
Click="MathButton_OnClick"
Content="1/x"
CornerRadius="30"
Grid.Column="5"
Grid.Row="6"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<Button <Button Classes="cirlce gray" Grid.Column="6" Grid.Row="6"
Background="Gray" Click="MathButton_OnClick" Content="log"/>
Click="MathButton_OnClick"
Content="log"
CornerRadius="30"
Grid.Column="6"
Grid.Row="6"
Height="60"
HorizontalAlignment="Center"
HorizontalContentAlignment="Center"
Margin="5"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Width="60" />
<!-- 7th row --> <!-- 7th row -->
<TextBlock <TextBlock Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="7" Name="History1"
FontSize="25" Text=""/>
Grid.Column="0"
Grid.ColumnSpan="7"
Grid.Row="7"
Name="History1"
Text="" />
<!-- 8th row --> <!-- 8th row -->
<TextBlock <TextBlock Name="History2" Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="7"
FontSize="25" Text=""/>
Grid.Column="0"
Grid.ColumnSpan="7"
Grid.Row="8"
Name="History2"
Text="" />
<!-- 9th row --> <!-- 9th row -->
<TextBlock <TextBlock Name="History3" Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="7"
FontSize="25" Text=""/>
Grid.Column="0"
Grid.ColumnSpan="7"
Grid.Row="9"
Name="History3"
Text="" />
</Grid> </Grid>
</Window> </Window>

5
SharpCalculator.Avalonia/MainWindow.axaml.cs
View File

@ -11,8 +11,8 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using FusionCalculator;
using Avalonia.Media; using Avalonia.Media;
using FusionCalculator;
namespace SharpCalculator.Avalonia; namespace SharpCalculator.Avalonia;
@ -20,7 +20,6 @@ namespace SharpCalculator.Avalonia;
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
private static readonly Random Random = new Random(); // Random object for rand() function in calculator private static readonly Random Random = new Random(); // Random object for rand() function in calculator
private readonly double _randomNumber = Random.NextDouble(); // Random variable is between 0 to 1
private readonly List<string> _history = new List<string>(); // History list to append expressions private readonly List<string> _history = new List<string>(); // History list to append expressions
public MainWindow() public MainWindow()
@ -67,7 +66,7 @@ public partial class MainWindow : Window
{ {
case "rand": // rand function add random variable from 0 to 1 into Input case "rand": // rand function add random variable from 0 to 1 into Input
Input.Text = ""; Input.Text = "";
Input.Text += _randomNumber.ToString(CultureInfo.InvariantCulture); Input.Text += _random.NextDouble().ToString(CultureInfo.InvariantCulture);
break; break;
case "π": // Pi function add pi value into Input case "π": // Pi function add pi value into Input
Input.Text = ""; Input.Text = "";