Merge pull request #153 from edgiardina/49-bottomsheet

49 bottomsheet
edgiardina · Aug 3, 2024 · e84a803 · e84a803
2 parents e183c61 + bad1980
commit e84a803
Show file tree

Hide file tree

Showing 7 changed files with 203 additions and 176 deletions.
diff --git a/IfpaMaui.csproj b/IfpaMaui.csproj
@@ -77,6 +77,7 @@
 		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
 		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
 		<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
+		<PackageReference Include="The49.Maui.BottomSheet" Version="8.0.3" />
 	</ItemGroup>
 
 	<!-- Maui Specifics -->

diff --git a/MauiProgram.cs b/MauiProgram.cs
@@ -16,6 +16,7 @@
 using Serilog;
 using Shiny;
 using CommunityToolkit.Maui.ApplicationModel;
+using The49.Maui.BottomSheet;
 
 namespace Ifpa;
 
@@ -38,6 +39,7 @@ public static MauiApp CreateMauiApp()
             .UseFluentMauiIcons()
             .UseShiny()
             .UseSkiaSharp(true)
+            .UseBottomSheet()
             .ConfigureSyncfusionCore()
             .ConfigureFonts(fonts =>
             {

diff --git a/Platforms/Android/Resources/values/styles.xml b/Platforms/Android/Resources/values/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+	<style name="Maui.MainTheme" parent="Theme.Material3.DayNight"></style>
+</resources>
diff --git a/Strings.Designer.cs b/Strings.Designer.cs
diff --git a/Strings.resx b/Strings.resx
@@ -139,7 +139,7 @@
     <value>Events Outside Country</value>
   </data>
   <data name="CalendarDetailPage_Date" xml:space="preserve">
-    <value>Date: </value>
+    <value>Date</value>
   </data>
   <data name="PlayerDetailPage_RankingStatistics" xml:space="preserve">
     <value>Ranking Statistics</value>
@@ -265,7 +265,7 @@
     <value>Tournament Result Posted</value>
   </data>
   <data name="CalendarDetailPage_Director" xml:space="preserve">
-    <value>Director: </value>
+    <value>Director</value>
   </data>
   <data name="CalendarPage_MyLocation" xml:space="preserve">
     <value>My Location</value>

diff --git a/Views/CalendarDetailPage.xaml b/Views/CalendarDetailPage.xaml
diff --git a/Views/CalendarDetailPage.xaml.cs b/Views/CalendarDetailPage.xaml.cs
@@ -1,6 +1,7 @@
 using Ifpa.ViewModels;
 using Microsoft.Maui.Controls.Maps;
 using Microsoft.Maui.Maps;
+using The49.Maui.BottomSheet;
 
 
 namespace Ifpa.Views
@@ -28,10 +29,10 @@ protected override async void OnAppearing()
                 MapSpan mapSpan = MapSpan.FromCenterAndRadius(mapLocation, Distance.FromKilometers(1));
                 var calendarMap = new Microsoft.Maui.Controls.Maps.Map(mapSpan)
                 {
-                    HeightRequest = 200,
                     IsZoomEnabled = false,
                     IsScrollEnabled = false,
-                    MapType = MapType.Street
+                    MapType = MapType.Street,
+                    IsTrafficEnabled = false                    
                 };
                 var pin = new Pin
                 {
@@ -52,6 +53,13 @@ protected override async void OnAppearing()
             catch (Exception)
             {
             }
+            await sheet.ShowAsync();
+        }
+
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            sheet.DismissAsync();
         }
 
         private void Pin_Clicked(object sender, PinClickedEventArgs e)