diff --git a/SharpCalculator.Avalonia/App.axaml b/SharpCalculator.Avalonia/App.axaml
index 69b003e..4d08634 100644
--- a/SharpCalculator.Avalonia/App.axaml
+++ b/SharpCalculator.Avalonia/App.axaml
@@ -3,6 +3,32 @@
x:Class="SharpCalculator.Avalonia.App"
RequestedThemeVariant="Dark">
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SharpCalculator.Avalonia/MainWindow.axaml b/SharpCalculator.Avalonia/MainWindow.axaml
index 38b9dc8..b36632f 100644
--- a/SharpCalculator.Avalonia/MainWindow.axaml
+++ b/SharpCalculator.Avalonia/MainWindow.axaml
@@ -1,571 +1,151 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:Class="SharpCalculator.Avalonia.MainWindow"
+ Title="SharpCalculator"
+ FontFamily="Consolas" FontSize="24"
+ Width="600" Height="750"
+ MinWidth="600" MinHeight="750">
-
+
* * * * * * *
* * * * * * * * * *
-
+ Text=""/>
-
+
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/SharpCalculator.Avalonia/MainWindow.axaml.cs b/SharpCalculator.Avalonia/MainWindow.axaml.cs
index e7835f9..f3b0aa6 100644
--- a/SharpCalculator.Avalonia/MainWindow.axaml.cs
+++ b/SharpCalculator.Avalonia/MainWindow.axaml.cs
@@ -8,25 +8,20 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
using Avalonia.Controls;
using Avalonia.Interactivity;
-using FusionCalculator;
using Avalonia.Media;
-
+using FusionCalculator;
namespace SharpCalculator.Avalonia;
public partial class MainWindow : Window
{
- static Random _random = new Random(); // Random object for rand() function in calculator
- double _randomNumber = _random.NextDouble(); // Random variable is between 0 to 1
- private int _currentIndex = 0; // Current index for checking the length of input text, accordingly for clear button
+ static Random _random = new(); // Random object for rand() function in calculator
+ private int _currentIndex; // Current index for checking the length of input text, accordingly for clear Button Classes="cirlce"
- private List _history = new List();
+ private List _history = new();
public MainWindow()
{
@@ -46,7 +41,7 @@ public partial class MainWindow : Window
{
case "rand": // rand function add random variable from 0 to 1 into Input
Input.Text = "";
- Input.Text += _randomNumber.ToString(CultureInfo.InvariantCulture);
+ Input.Text += _random.NextDouble().ToString(CultureInfo.InvariantCulture);
break;
case "π": // Pi function add pi value into Input
Input.Text = "";