diff --git a/src/AdvancedCalculator.Android/Styles/Android.axaml b/src/AdvancedCalculator.Android/Styles/Android.axaml deleted file mode 100644 index 30f7e04..0000000 --- a/src/AdvancedCalculator.Android/Styles/Android.axaml +++ /dev/null @@ -1,17 +0,0 @@ - - - 16 - 18 - 24 - 1.35 - - - - - - diff --git a/src/AdvancedCalculator.Browser/Styles/Browser.axaml b/src/AdvancedCalculator.Browser/Styles/Browser.axaml deleted file mode 100644 index 3842c71..0000000 --- a/src/AdvancedCalculator.Browser/Styles/Browser.axaml +++ /dev/null @@ -1,16 +0,0 @@ - - - 15 - 22 - 1.3 - - - - - - diff --git a/src/AdvancedCalculator.Desktop/Styles/Desktop.axaml b/src/AdvancedCalculator.Desktop/Styles/Desktop.axaml deleted file mode 100644 index 7a951d8..0000000 --- a/src/AdvancedCalculator.Desktop/Styles/Desktop.axaml +++ /dev/null @@ -1,16 +0,0 @@ - - - 13 - 1.2 - 20 - - - - - - diff --git a/src/AdvancedCalculator/App.axaml b/src/AdvancedCalculator/App.axaml index 8d7bed3..5e686cd 100644 --- a/src/AdvancedCalculator/App.axaml +++ b/src/AdvancedCalculator/App.axaml @@ -6,8 +6,6 @@ - - diff --git a/src/AdvancedCalculator/App.axaml.cs b/src/AdvancedCalculator/App.axaml.cs index 32716eb..e967b3b 100644 --- a/src/AdvancedCalculator/App.axaml.cs +++ b/src/AdvancedCalculator/App.axaml.cs @@ -5,8 +5,6 @@ using Avalonia; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Data.Core.Plugins; using Avalonia.Markup.Xaml; -using Avalonia.Styling; -using System; namespace AdvancedCalculator; @@ -23,40 +21,6 @@ public partial class App : Application // Without this line you will get duplicate validations from both Avalonia and CT BindingPlugins.DataValidators.RemoveAt(0); - // Load platform-specific styles (typography, scrollbars overrides) - try - { - var styles = Current?.Styles; - if (styles is not null) - { - if (OperatingSystem.IsAndroid()) - { - styles.Add(new StyleInclude(new Uri("avares://AdvancedCalculator/")) - { - Source = new Uri("avares://AdvancedCalculator.Android/Styles/Android.axaml") - }); - } - else if (OperatingSystem.IsBrowser()) - { - styles.Add(new StyleInclude(new Uri("avares://AdvancedCalculator/")) - { - Source = new Uri("avares://AdvancedCalculator.Browser/Styles/Browser.axaml") - }); - } - else - { - styles.Add(new StyleInclude(new Uri("avares://AdvancedCalculator/")) - { - Source = new Uri("avares://AdvancedCalculator.Desktop/Styles/Desktop.axaml") - }); - } - } - } - catch - { - // If a platform-specific style dictionary is missing, continue without failing. - } - if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { desktop.MainWindow = new MainWindow diff --git a/src/AdvancedCalculator/Converters/WidthToBooleanConverter.cs b/src/AdvancedCalculator/Converters/WidthToBooleanConverter.cs deleted file mode 100644 index 6efa5f6..0000000 --- a/src/AdvancedCalculator/Converters/WidthToBooleanConverter.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Globalization; -using Avalonia.Data.Converters; - -namespace AdvancedCalculator.Converters; - -// Returns true if width (double) is less than the provided threshold (parameter), -// otherwise false. Default threshold is 640 when parameter is null or invalid. -public class WidthToBooleanConverter : IValueConverter -{ - public static readonly WidthToBooleanConverter Instance = new(); - - public object? Convert(object? value, Type targetType, object? parameter, CultureInfo? culture) - { - if (value is double width) - { - double threshold = 640; - if (parameter is double p) - threshold = p; - else if (parameter is string s && double.TryParse(s, NumberStyles.Number, CultureInfo.InvariantCulture, out var parsed)) - threshold = parsed; - - return width < threshold; - } - return false; - } - - public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo? culture) - => throw new NotSupportedException(); -} - diff --git a/src/AdvancedCalculator/Styles/Scroll.axaml b/src/AdvancedCalculator/Styles/Scroll.axaml deleted file mode 100644 index ea9284d..0000000 --- a/src/AdvancedCalculator/Styles/Scroll.axaml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - diff --git a/src/AdvancedCalculator/Styles/Typography.axaml b/src/AdvancedCalculator/Styles/Typography.axaml deleted file mode 100644 index eb80272..0000000 --- a/src/AdvancedCalculator/Styles/Typography.axaml +++ /dev/null @@ -1,30 +0,0 @@ - - - 12 - 14 - 16 - 20 - - 18 - 22 - 26 - - 1.1 - 1.25 - 1.4 - - - - - - - - diff --git a/src/AdvancedCalculator/ViewModels/MainViewModel.cs b/src/AdvancedCalculator/ViewModels/MainViewModel.cs index 7be1cf6..1611402 100644 --- a/src/AdvancedCalculator/ViewModels/MainViewModel.cs +++ b/src/AdvancedCalculator/ViewModels/MainViewModel.cs @@ -41,37 +41,6 @@ public partial class MainViewModel : ViewModelBase IsFunctionsPanelOpen = !IsFunctionsPanelOpen; } - // Insert helpers for touch: appends tokens to the input box - [RelayCommand] - private void InsertVariable(string? variableName) - { - if (string.IsNullOrWhiteSpace(variableName)) - return; - InsertToken(variableName); - } - - [RelayCommand] - private void InsertFunction(string? functionName) - { - if (string.IsNullOrWhiteSpace(functionName)) - return; - InsertToken(functionName + "()"); - } - - private void InsertToken(string token) - { - if (string.IsNullOrEmpty(InputText)) - { - InputText = token; - return; - } - - if (!char.IsWhiteSpace(InputText[^1])) - InputText += " "; - - InputText += token; - } - [RelayCommand(AllowConcurrentExecutions = false)] private async Task Submit() { diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml index d5fc5e7..71ffac9 100644 --- a/src/AdvancedCalculator/Views/MainView.axaml +++ b/src/AdvancedCalculator/Views/MainView.axaml @@ -10,184 +10,92 @@ x:DataType="vm:MainViewModel"> - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +