🚀 [Code] Updated the functionalities to .NET 8 c5

danielmonettelli · Mar 14, 2024 · 04ab606 · 04ab606
1 parent 018c019
commit 04ab606
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 31 deletions.
diff --git a/Mitawi/Constants/APIConstants.cs b/Mitawi/Constants/APIConstants.cs
@@ -1,8 +1,7 @@
-namespace Mitawi.Constants
+namespace Mitawi.Constants;
+
+public static class APIConstants
 {
-    public static class APIConstants
-    {
-        public const string OpenWeatherMapEndpoint = "https://api.openweathermap.org/data/2.5/onecall";
+    public const string OpenWeatherMapEndpoint = "https://api.openweathermap.org/data/2.5/onecall";
         public const string OpenWeatherMapAPIKey = "INSERT_API_KEY_HERE";
-    }
 }
diff --git a/Mitawi/Converters/InvertBooleanConverter.cs b/Mitawi/Converters/InvertBooleanConverter.cs
@@ -0,0 +1,22 @@
+namespace Mitawi.Converters;
+
+public class InvertBooleanConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    {
+        if (value is bool boolValue)
+        {
+            return !boolValue;
+        }
+        return value;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    {
+        if (value is bool boolValue)
+        {
+            return !boolValue;
+        }
+        return value;
+    }
+}
diff --git a/Mitawi/MauiProgram.cs b/Mitawi/MauiProgram.cs
@@ -37,6 +37,7 @@ private static void RegisterServices(IServiceCollection services)
 
         //Register Views
         services.AddSingleton<WelcomePage>();
+
         services.AddSingleton<HomePageOrientation>();
         services.AddSingleton<HomePage>();
 

diff --git a/Mitawi/Models/WeatherData.cs b/Mitawi/Models/WeatherData.cs
@@ -38,7 +38,7 @@ public class Weather
 
 public class Hourly
 {
-    public bool IsBusy { get; set; }
+    public bool IsAnimationSkeleton { get; set; }
 
     [JsonPropertyName("dt")]
     public long Dt { get; set; }

diff --git a/Mitawi/ViewModels/Base/BaseViewModel.cs b/Mitawi/ViewModels/Base/BaseViewModel.cs
@@ -2,6 +2,5 @@
 
 public partial class BaseViewModel : ObservableObject
 {
-    [ObservableProperty]
-    private bool isBusy = false;
+
 }
diff --git a/Mitawi/ViewModels/HomeViewModel.cs b/Mitawi/ViewModels/HomeViewModel.cs
@@ -4,6 +4,12 @@ public partial class HomeViewModel : BaseViewModel
 {
     private readonly IWeatherDataService _weatherDataService;
 
+    [ObservableProperty]
+    private bool isAnimationSkeleton;
+
+    [ObservableProperty]
+    private bool isLoading;
+
     [ObservableProperty]
     private List<Hourly> hourlies;
 
@@ -24,21 +30,21 @@ public HomeViewModel(IWeatherDataService weatherDataService)
     }
 
     [RelayCommand]
-    private void FullUpdate()
+    private async Task FullUpdate()
     {
-        WeatherDataFlow();
+        await WeatherDataFlow();
     }
 
     [RelayCommand]
     private void SelectedHourly(Hourly hourly)
     {
         if (hourly is not null)
         {
-            IsBusy = true;
+            IsAnimationSkeleton = true;
 
             Task.Delay(1000).ContinueWith((t) =>
             {
-                IsBusy = false;
+                IsAnimationSkeleton = false;
             });
 
             MyHourly = hourly;
@@ -61,7 +67,7 @@ await Shell.Current.GoToAsync(
 
     private async Task WeatherDataFlow()
     {
-        IsBusy = true;
+        IsLoading = true;
 
         var placemarkTask = _weatherDataService.GetPlacemarkAsync();
         var daysTask = _weatherDataService.GetDaysAsync();
@@ -76,7 +82,7 @@ private async Task WeatherDataFlow()
         // Get current time schedule
         MyHourly = Hourlies.ElementAt(0);
 
-        IsBusy = false;
+        IsLoading = false;
     }
 
 }
diff --git a/Mitawi/Views/HomePage.xaml b/Mitawi/Views/HomePage.xaml
@@ -3,7 +3,9 @@
     x:Class="Mitawi.Views.HomePage"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:converter="clr-namespace:Mitawi.Converters"
     xmlns:ffImageLoading="clr-namespace:FFImageLoading.Maui;assembly=FFImageLoading.Compat.Maui"
+    xmlns:heyview="clr-namespace:Mitawi.Views"
     xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
     xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     xmlns:models="clr-namespace:Mitawi.Models"
@@ -17,6 +19,8 @@
 
     <ContentPage.Resources>
         <ResourceDictionary Source="Orientations/HomePageOrientation.xaml" />
+
+        <converter:InvertBooleanConverter x:Key="InvertBooleanConverter" />
     </ContentPage.Resources>
 
     <ContentPage.Content>
@@ -29,7 +33,7 @@
             <Border
                 x:Name="topLayerLower1"
                 sk:Skeleton.Hide="True"
-                sk:Skeleton.IsBusy="{Binding IsBusy}"
+                sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                 BackgroundColor="{StaticResource col_thirt}"
                 StrokeThickness="0"
                 Style="{StaticResource vsm_orientation_topLayerLower1}">
@@ -52,7 +56,7 @@
                 sk:Skeleton.Animation="{sk:DefaultAnimation Source=Fade,
                                                             Interval='600',
                                                             Parameter='0.3'}"
-                sk:Skeleton.IsBusy="{Binding IsBusy}"
+                sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                 Stroke="{StaticResource col_twel}"
                 StrokeThickness="3"
                 Style="{StaticResource vsm_orientation_topLayerHigher2}">
@@ -69,7 +73,7 @@
                 <Grid
                     x:Name="gridAdminTopLayerHigher2"
                     Padding="16,0"
-                    sk:Skeleton.IsBusy="{Binding IsBusy}"
+                    sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                     sk:Skeleton.IsParent="True"
                     Style="{StaticResource vsm_orientation_gridAdminTopLayerHigher2}">
 
@@ -179,15 +183,15 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         sk:Skeleton.Hide="True"
-                        sk:Skeleton.IsBusy="{Binding IsBusy}"
+                        sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                         Source="{Binding MyHourly.Weather[0].Icon, Converter={StaticResource CustomImageUrlScalingConverter}, ConverterParameter=10}" />
                     <!--#endregion-->
 
                     <!--#region Basic description of the climate-->
                     <StackLayout
                         x:Name="lookTemperature"
                         sk:Skeleton.Hide="True"
-                        sk:Skeleton.IsBusy="{Binding IsBusy}"
+                        sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                         Style="{StaticResource vsm_orientation_lookTemperature}"
                         VerticalOptions="CenterAndExpand">
                         <Label
@@ -201,7 +205,7 @@
                     <StackLayout
                         x:Name="lookWeatherAndDt"
                         sk:Skeleton.Hide="True"
-                        sk:Skeleton.IsBusy="{Binding IsBusy}"
+                        sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                         Style="{StaticResource vsm_orientation_lookWeatherAndDt}">
 
                         <Label
@@ -244,7 +248,7 @@
 
                             <Label
                                 Margin="0,8,0,0"
-                                sk:Skeleton.IsBusy="{Binding IsBusy}"
+                                sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                                 HorizontalTextAlignment="Center"
                                 Style="{OnIdiom Phone={StaticResource TxtSubtitle2_2},
                                                 Tablet={StaticResource TxtHeadline6_2}}"
@@ -267,7 +271,7 @@
 
                             <Label
                                 Margin="0,8,0,0"
-                                sk:Skeleton.IsBusy="{Binding IsBusy}"
+                                sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                                 HorizontalTextAlignment="Center"
                                 Style="{OnIdiom Phone={StaticResource TxtSubtitle2_2},
                                                 Tablet={StaticResource TxtHeadline6_2}}"
@@ -290,7 +294,7 @@
 
                             <Label
                                 Margin="0,8,0,0"
-                                sk:Skeleton.IsBusy="{Binding IsBusy}"
+                                sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                                 HorizontalTextAlignment="Center"
                                 Style="{OnIdiom Phone={StaticResource TxtSubtitle2_2},
                                                 Tablet={StaticResource TxtHeadline6_2}}"
@@ -324,6 +328,7 @@
                 <StackLayout
                     Padding="16,0"
                     HorizontalOptions="EndAndExpand"
+                    IsEnabled="{Binding IsLoading, Converter={StaticResource InvertBooleanConverter}}"
                     Orientation="Horizontal"
                     Spacing="6">
                     <StackLayout.GestureRecognizers>
@@ -354,9 +359,10 @@
 
                 <mct:UniformItemsLayout
                     x:Name="uniformItemsLayoutForecast24Hours"
-                    sk:Skeleton.IsBusy="{Binding IsBusy}"
+                    sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                     sk:Skeleton.IsParent="True"
                     BindableLayout.ItemsSource="{Binding Hourlies}"
+                    IsEnabled="{Binding IsLoading, Converter={StaticResource InvertBooleanConverter}}"
                     Style="{StaticResource vsm_orientation_uniformForecast24Hours}">
                     <BindableLayout.ItemTemplate>
                         <DataTemplate x:DataType="models:Hourly">
@@ -368,7 +374,7 @@
                                                                             Interval='600',
                                                                             Parameter='0.3'}"
                                 sk:Skeleton.BackgroundColor="{StaticResource col_sec}"
-                                sk:Skeleton.IsBusy="{Binding IsBusy}"
+                                sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                                 Style="{StaticResource vsm_surfaceHourly}">
                                 <Border.GestureRecognizers>
                                     <TapGestureRecognizer
@@ -381,7 +387,7 @@
                                     <!--#region Temperature in degrees celsius-->
                                     <Label
                                         x:Name="labelTemperature"
-                                        sk:Skeleton.IsBusy="{Binding IsBusy}"
+                                        sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                                         HorizontalTextAlignment="Center"
                                         Style="{StaticResource vsm_labelTemperature}"
                                         Text="{Binding Temp, StringFormat='{0}°', Converter={StaticResource DoubleToIntConverter}}" />
@@ -391,15 +397,15 @@
                                     <ffImageLoading:CachedImage
                                         x:Name="imageSmallWeather"
                                         sk:Skeleton.Hide="True"
-                                        sk:Skeleton.IsBusy="{Binding IsBusy}"
+                                        sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                                         Source="{Binding Weather[0].Icon, Converter={StaticResource CustomImageUrlScalingConverter}, ConverterParameter=2}"
                                         Style="{StaticResource vsm_imageSmallWeather}" />
                                     <!--#endregion-->
 
                                     <!--#region Time per hour-->
                                     <Label
                                         x:Name="labelHour"
-                                        sk:Skeleton.IsBusy="{Binding IsBusy}"
+                                        sk:Skeleton.IsBusy="{Binding IsAnimationSkeleton}"
                                         HorizontalTextAlignment="Center"
                                         Style="{StaticResource vsm_labelHour}"
                                         Text="{Binding Dt, Converter={StaticResource UnixTimeToDateTimeConverter}, ConverterParameter=HH:mm}"
@@ -412,6 +418,43 @@
                 </mct:UniformItemsLayout>
             </ScrollView>
             <!--#endregion-->
+
+            <BoxView
+                Grid.Row="0"
+                Grid.RowSpan="5"
+                Margin="-16,0,-16,-8"
+                IsEnabled="{Binding IsLoading}"
+                IsVisible="{Binding IsLoading}">
+                <BoxView.Background>
+                    <LinearGradientBrush EndPoint="0,1">
+                        <GradientStop Offset="0" Color="{StaticResource col_prim}" />
+                        <GradientStop Offset="0.5" Color="{StaticResource col_sec}" />
+                    </LinearGradientBrush>
+                </BoxView.Background>
+            </BoxView>
+
+            <VerticalStackLayout
+                Grid.Row="0"
+                Grid.RowSpan="5"
+                Margin="-16,0,-16,-8"
+                HorizontalOptions="Center"
+                IsEnabled="{Binding IsLoading}"
+                IsVisible="{Binding IsLoading}"
+                Spacing="10"
+                VerticalOptions="Center">
+
+                <ActivityIndicator
+                    HeightRequest="50"
+                    IsRunning="{Binding IsLoading}"
+                    WidthRequest="50"
+                    Color="White" />
+
+                <Label
+                    HorizontalTextAlignment="Center"
+                    Style="{StaticResource TxtSubtitle1_1}"
+                    Text="Loading"
+                    TextColor="White" />
+            </VerticalStackLayout>
         </Grid>
         <!--#endregion-->
     </ContentPage.Content>

diff --git a/Mitawi/Views/HomePage.xaml.cs b/Mitawi/Views/HomePage.xaml.cs
@@ -13,6 +13,11 @@ public HomePage()
         BindingContext = vm;
     }
 
+    protected override bool OnBackButtonPressed()
+    {
+        return true;
+    }
+
     private void HomePage_Orientation(object sender, EventArgs e)
     {
         string visualStateOrientation = Height > Width ? "Portrait" : "Landscape";
@@ -33,7 +38,7 @@ private void HomePage_Orientation(object sender, EventArgs e)
         VisualStateManager.GoToState(uniformItemsLayoutForecast24Hours, visualStateOrientation);
     }
 
-    private void SelectedWeather_Tapped(object sender, EventArgs e)
+    private void SelectedWeather_Tapped(object sender, TappedEventArgs e)
     {
         VisualElement surfaceWeather = sender as VisualElement;
         UniformItemsLayout parent = surfaceWeather.Parent as UniformItemsLayout;
@@ -58,5 +63,4 @@ private static void ChangeSurfaceControls(VisualElement child, bool isSelected)
         VisualStateManager.GoToState(imageSmallWeather, visualStateControl);
         VisualStateManager.GoToState(labelHour, visualStateControl);
     }
-
 }
diff --git a/Mitawi/Views/WelcomePage.xaml.cs b/Mitawi/Views/WelcomePage.xaml.cs
@@ -46,7 +46,7 @@ private void RunWelcomeAnimation()
             { 0.3, 0.5, new Animation(v => imgWeather.Scale = v, 0, 1, Easing.SpringOut) },
             { 0.5, 0.7, new Animation(v => lblPhrase3.Opacity = v, 0, 1, Easing.CubicInOut) },
             { 0.6, 0.8, new Animation(v => lblPhrase4.Opacity = v, 0, 1, Easing.CubicInOut) },
-            { 0.8, 1, new Animation(v=>
+            { 0.8, 1, new Animation(v =>
               {
                   btnGetStarted.Opacity = v;
                   btnGetStarted.Scale = v;