This commit is contained in:
Gerald Versluis 2024-04-04 14:19:57 +02:00
Родитель fcf3cd810e
Коммит a5267c9e70
7 изменённых файлов: 32 добавлений и 34 удалений

Просмотреть файл

@ -36,6 +36,10 @@ public static class MauiProgram
fonts.AddFont("opensans_semibold.ttf", "OpenSansSemiBold");
fonts.AddFont("fa_solid.ttf", "FontAwesome");
fonts.AddFont("fabmdl2.ttf", "Fabric");
})
.ConfigureMauiHandlers(handlers =>
{
ModifyEntry();
});
builder.Services.AddMauiBlazorWebView();
@ -62,8 +66,6 @@ public static class MauiProgram
});
#endif
ModifyEntry();
Barrel.ApplicationId = "com.simplyprofound.pointofsale";
return builder.Build();
@ -78,7 +80,9 @@ public static class MauiProgram
#elif IOS || MACCATALYST
handler.PlatformView.BorderStyle = UIKit.UITextBorderStyle.None;
#elif WINDOWS
// how can I remove the bottom border of the Entry?
handler.PlatformView.FontWeight = Microsoft.UI.Text.FontWeights.Thin;
handler.PlatformView.BorderThickness = new Microsoft.UI.Xaml.Thickness(0);
#endif
});
}

Просмотреть файл

@ -10,8 +10,8 @@
xmlns:system="clr-namespace:System;assembly=System.Runtime"
x:DataType="pages:HomeViewModel"
x:Class="PointOfSale.Pages.HomePage"
Shell.NavBarIsVisible="False"
Title="HomePage">
Shell.NavBarIsVisible="{OnPlatform False, WinUI=True}"
Title="">
<ContentPage.BindingContext>
<pages:HomeViewModel/>
@ -43,9 +43,10 @@
</ContentPage.MenuBarItems>
<Grid RowDefinitions="100,70,*"
ColumnDefinitions="*,400"
Margin="24,24,0,0"
<Grid RowDefinitions="100,Auto,*"
RowSpacing="10"
ColumnDefinitions="{OnPlatform '*,400', WinUI='*,440'}"
Margin="24,0,0,0"
x:Name="PageGrid">
<ScrollView Grid.Row="2">
@ -166,12 +167,13 @@
<!-- Tab Control -->
<Grid Grid.Row="1">
<BoxView Style="{StaticResource HRule}"
Margin="0,31,0,0"
VerticalOptions="Start"
Margin="0,0,0,0"
VerticalOptions="End"
/>
<HorizontalStackLayout Spacing="20"
RadioButtonGroup.GroupName="MenuCategories"
RadioButtonGroup.SelectedValue="{Binding Category}">
RadioButtonGroup.SelectedValue="{Binding Category}"
VerticalOptions="End">
<BindableLayout.ItemsSource>
<x:Array Type="{x:Type x:String}">
<x:String>Noodles</x:String>

Просмотреть файл

@ -69,6 +69,8 @@
<HorizontalStackLayout.Resources>
<Style TargetType="RadioButton">
<Setter Property="ControlTemplate" Value="{StaticResource ButtonRadioTemplate}"/>
<Setter Property="HorizontalOptions" Value="Start"/>
<Setter Property="WidthRequest" Value="50"/>
</Style>
</HorizontalStackLayout.Resources>
<RadioButton Content="Dine In" IsChecked="True"/>
@ -106,8 +108,9 @@
<Border
Grid.Column="1"
HorizontalOptions="Start"
HeightRequest="44"
WidthRequest="44"
WidthRequest="46"
Background="{StaticResource DarkBg1Brush}"
Stroke="{StaticResource SecondaryBrush}"
StrokeThickness="1">

Просмотреть файл

@ -7,9 +7,8 @@
IgnorableNamespaces="uap rescap">
<Identity
Name="8D1C6CD3-CA27-4254-B76F-15B91335C418"
Publisher="CN=User Name"
Version="1.0.0.0" />
Version="1.0.0.0" Name="a045a695-05e1-4353-a3d0-5cd58ec52a45"/>
<Properties>
<DisplayName>PointOfSale</DisplayName>

Просмотреть файл

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Uncomment the Entitlements for the full functionality to work. However, this will require you to have a matching provisioning profile in your Apple Developer Account. -->
<!-- <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.microsoft.adalcache</string>
</array>
</dict>
</plist>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.microsoft.adalcache</string>
</array>
</dict>
</plist> -->

Просмотреть файл

@ -18,10 +18,10 @@
<ImplicitUsings>enable</ImplicitUsings>
<!-- Display name -->
<ApplicationTitle>Food</ApplicationTitle>
<ApplicationTitle>Point of Sale</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>net.dot.pointofsale</ApplicationId>
<ApplicationId>com.simplyprofound.pointofsale</ApplicationId>
<!-- Versions -->
<ApplicationVersion>1</ApplicationVersion>
@ -39,18 +39,6 @@
<AssemblyName>Food</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
<CodesignProvision>dPOSDev</CodesignProvision>
<CodesignKey>Apple Development: Created via API (2NJFZDD9ZM)</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
<CodesignProvision>Automatic</CodesignProvision>
<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\appicon.svg" ForegroundFile="Resources\appiconfg.svg" Color="#252836" />

Просмотреть файл

@ -85,6 +85,7 @@
</VisualStateManager.VisualStateGroups>
<Label Text="{TemplateBinding Content}"
Margin="12,7"
HorizontalTextAlignment="{OnPlatform Start, WinUI=Center}"
x:Name="TextLabel" />
</Border>