Skip to content

947225-Cleared Warnings #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

947225-Cleared Warnings #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions EssentialMAUIUIKit/EssentialMAUIUIKit/ViewModel/RestaurantDashboardViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,6 @@ public ObservableCollection<string> OrderDetailsHeader

#region methods

private void OnDetailsClicked()
{
// Action on click

}

private void UpdateOrderDetails()
{
this.orderDetails = new ObservableCollection<RestaurantOrder>
Expand Down
52 changes: 26 additions & 26 deletions EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/CompanyHistoryPage.xaml
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyCaloriesReportPage.xaml
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyTimelinePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
</ContentView.BindingContext>
<StackLayout >

<Border StrokeThickness="1" Stroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="FillAndExpand" WidthRequest="{OnPlatform WinUI=647, MacCatalyst=647}" HorizontalOptions="CenterAndExpand" Margin="{OnPlatform WinUI='0,32,0,32'}">
<Border StrokeThickness="1" Stroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="{OnPlatform Default=FillAndExpand}" WidthRequest="{OnPlatform WinUI=647, MacCatalyst=647}" HorizontalOptions="Center" Margin="{OnPlatform WinUI='0,32,0,32'}">
<Border.StrokeShape>
<RoundRectangle CornerRadius="8"/>
</Border.StrokeShape>
<Grid RowDefinitions="Auto,Auto,*">
<Grid Grid.Row="0" HeightRequest="80">
<Border Stroke="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" HeightRequest="40" WidthRequest="{OnPlatform WinUI=145, MacCatalyst=145}" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" HorizontalOptions="Start" Margin="16,0,0,0">
<Border Stroke="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" HeightRequest="40" WidthRequest="{OnPlatform WinUI=145, MacCatalyst=145}" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" HorizontalOptions="Start" Margin="16,0,0,0">
<Border.StrokeShape>
<RoundRectangle CornerRadius="20"/>
</Border.StrokeShape>
Expand All @@ -23,40 +23,40 @@
</Border.Shadow>
<Grid Margin="{OnPlatform Android='20,0,0,0', iOS='20,0,0,0'}">
<!--DatePicker control-->
<DatePicker Date="{Binding SelectedDate, Mode=TwoWay}" HeightRequest="60" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="CenterAndExpand" HorizontalOptions="{OnPlatform WinUI=End, MacCatalyst=End, Android=Center, iOS=Center}" FontFamily="Roboto-Medium" Margin="{OnPlatform Default='10,0,0,0', MacCatalyst='10,40,0,0'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
<DatePicker x:DataType="local:DailyTimelineViewModel" Date="{Binding SelectedDate, Mode=TwoWay}" HeightRequest="60" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="Center" HorizontalOptions="{OnPlatform WinUI=End, MacCatalyst=End, Android=Center, iOS=Center}" FontFamily="Roboto-Medium" Margin="{OnPlatform Default='10,0,0,0', MacCatalyst='10,40,0,0'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
<!--Datepicker Icon-->
<Label FontFamily="DashboardFontIcons" Text="&#xe711;" Grid.Row="0" VerticalOptions="Center" HorizontalOptions="End" Margin="{OnPlatform Android='0,0,25,0', iOS='0,0,25,0', WinUI='0,0,10,0', MacCatalyst='0,0,10,0'}" IsVisible="{OnPlatform WinUI=True}" HeightRequest="14" WidthRequest="12" Background = "{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" />
</Grid>
</Border>
</Grid>
<BoxView Grid.Row="1" HeightRequest="1" HorizontalOptions="FillAndExpand" Margin="16,0,16,0" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
<Grid Grid.Row="2" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" Margin="16,16,0,16">
<CollectionView HorizontalOptions="FillAndExpand" ItemsSource="{Binding DailyActivities}" SelectionMode="None">
<BoxView Grid.Row="1" HeightRequest="1" HorizontalOptions="Fill" Margin="16,0,16,0" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
<Grid Grid.Row="2" VerticalOptions="Fill" HorizontalOptions="Fill" Margin="16,16,0,16">
<CollectionView HorizontalOptions="Fill" x:DataType="local:DailyTimelineViewModel" ItemsSource="{Binding DailyActivities}" SelectionMode="None">
<CollectionView.ItemTemplate>
<DataTemplate>
<VerticalStackLayout>
<Grid ColumnDefinitions="Auto,Auto,Auto" >
<Border Stroke="Transparent" WidthRequest="42" HeightRequest="32" VerticalOptions="Start">
<Label Text="{Binding Time}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" Grid.Column="0" FontSize="14" FontFamily="{OnPlatform WinUI=Roboto-Thin,MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" VerticalOptions="Center"/>
<Label x:DataType="local:DailyActivity" Text="{Binding Time}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" Grid.Column="0" FontSize="14" FontFamily="{OnPlatform WinUI=Roboto-Thin,MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" VerticalOptions="Center"/>
</Border>
<Grid Grid.Column="1" RowDefinitions="Auto,Auto">
<Border Grid.Row="0" VerticalOptions="Start" WidthRequest="32" HeightRequest="32" Stroke="Transparent" BackgroundColor="#7633DA" HorizontalOptions="Center">
<Border.StrokeShape>
<RoundRectangle CornerRadius="100" />
</Border.StrokeShape>
<Label FontFamily="DashboardFontIcons" Text="{Binding Icon}" WidthRequest="16" HeightRequest="16" HorizontalOptions="Center" TextColor="{DynamicResource White}"/>
<Label FontFamily="DashboardFontIcons" x:DataType="local:DailyActivity" Text="{Binding Icon}" WidthRequest="16" HeightRequest="16" HorizontalOptions="Center" TextColor="{DynamicResource White}"/>
</Border>
<Border Grid.Row="1" HeightRequest="52" WidthRequest="2" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,2,0,2">
<Border.Triggers>
<DataTrigger TargetType="Border" Binding="{Binding IsLastItem}" Value="True">
<DataTrigger TargetType="Border" x:DataType="local:DailyActivity" Binding="{Binding IsLastItem}" Value="True">
<Setter Property="IsVisible" Value="False" />
</DataTrigger>
</Border.Triggers>
</Border>
</Grid>
<Grid RowDefinitions="Auto,Auto" Grid.Column="2" WidthRequest="210" HeightRequest="80" Margin="10,0,0,0">
<Label Text="{Binding ActivityTitle}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="20" Grid.Row="0" FontFamily="Roboto-Medium" FontAttributes="{OnPlatform Android='Bold', iOS='Bold'}" FontSize="14" VerticalOptions="Start" />
<Label Text="{Binding ActivityDescription}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="60" Grid.Row="1" FontFamily="{OnPlatform WinUI=Roboto-Thin, MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" FontSize="14" VerticalOptions="FillAndExpand" />
<Label x:DataType="local:DailyActivity" Text="{Binding ActivityTitle}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="20" Grid.Row="0" FontFamily="Roboto-Medium" FontAttributes="{OnPlatform Android='Bold', iOS='Bold'}" FontSize="14" VerticalOptions="Start" />
<Label x:DataType="local:DailyActivity" Text="{Binding ActivityDescription}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="60" Grid.Row="1" FontFamily="{OnPlatform WinUI=Roboto-Thin, MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" FontSize="14" VerticalOptions="Fill" />
</Grid>
</Grid>
</VerticalStackLayout>
Expand Down
Loading