fix: Additional fixes

unoplatform · Jun 4, 2024 · 9aced5a · 9aced5a
1 parent f62e931
commit 9aced5a
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 110 deletions.
diff --git a/reference/ToDo/src/Directory.Build.props b/reference/ToDo/src/Directory.Build.props
@@ -13,10 +13,10 @@
     <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
   </PropertyGroup>
 
+  <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. -->
   <PropertyGroup>
-    <UnoExtensionsVersion>4.1.14</UnoExtensionsVersion>
-    <UnoToolkitVersion>6.0.18</UnoToolkitVersion>
+    <UnoExtensionsVersion>4.1.23</UnoExtensionsVersion>
+    <UnoToolkitVersion>6.0.24</UnoToolkitVersion>
     <UnoThemesVersion>5.0.13</UnoThemesVersion>
-    <UnoCSharpMarkupVersion>5.2.13</UnoCSharpMarkupVersion>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/reference/ToDo/src/Directory.Packages.props b/reference/ToDo/src/Directory.Packages.props
@@ -4,13 +4,9 @@
 
     See https://aka.platform.uno/using-uno-sdk for more information.
   -->
-  <ItemGroup>
-  </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.4.1" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
   </ItemGroup>
 </Project>
diff --git a/reference/ToDo/src/ToDo/App.xaml b/reference/ToDo/src/ToDo/App.xaml
@@ -1,57 +1,52 @@
 <Application x:Class="ToDo.App"
-       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:wasm="http://platform.uno/wasm"
-       xmlns:utum="using:Uno.Toolkit.UI.Material"
-       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-       xmlns:converters="using:ToDo.Converters"
-       mc:Ignorable="wasm">
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:wasm="http://platform.uno/wasm"
+			 xmlns:utum="using:Uno.Toolkit.UI.Material"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 xmlns:converters="using:ToDo.Converters"
+			 mc:Ignorable="wasm">
 
-  <Application.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <!-- Load WinUI resources -->
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-        <utum:MaterialToolkitTheme
-          ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml">
-          <!-- NOTE: You can override the default Roboto font by providing your font assets here. -->
-           <utum:MaterialToolkitTheme.FontOverrideDictionary>
-            <ResourceDictionary>
-              <FontFamily x:Key="MaterialLightFontFamily">ms-appx:///Uno.Fonts.Roboto/Fonts/Roboto-Light.ttf#Roboto</FontFamily>
-              <FontFamily x:Key="MaterialMediumFontFamily">ms-appx:///Uno.Fonts.Roboto/Fonts/Roboto-Medium.ttf#Roboto</FontFamily>
-              <FontFamily x:Key="MaterialRegularFontFamily">ms-appx:///Uno.Fonts.Roboto/Fonts/Roboto-Regular.ttf#Roboto</FontFamily>
-            </ResourceDictionary>
-          </utum:MaterialToolkitTheme.FontOverrideDictionary> 
-        </utum:MaterialToolkitTheme>
+	<Application.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<!-- Load WinUI resources -->
+				<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 
-        <ResourceDictionary>
-          <ResourceDictionary.ThemeDictionaries>
-            <ResourceDictionary x:Key="Light">
-              <Color x:Key="OverlayColor">#51000000</Color>
-            </ResourceDictionary>
-            <ResourceDictionary x:Key="Dark">
-              <Color x:Key="OverlayColor">#51FFFFFF</Color>
-            </ResourceDictionary>
-          </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
+				<!-- Load Material Toolkit resources -->
+				<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
+									  ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml"
+									  FontOverrideSource="ms-appx:///Styles/MaterialFontsOverride.xaml" />
 
-        <!-- Application's custom styles -->
-        <ResourceDictionary Source="ms-appx:///Styles/FeedView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Styles/NavigationBar.xaml" />
-        <ResourceDictionary Source="ms-appx:///Styles/NavigationView.xaml" />
-
-      </ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary>
+					<ResourceDictionary.ThemeDictionaries>
+						<ResourceDictionary x:Key="Light">
+							<Color x:Key="OverlayColor">#51000000</Color>
+						</ResourceDictionary>
+						<ResourceDictionary x:Key="Dark">
+							<Color x:Key="OverlayColor">#51FFFFFF</Color>
+						</ResourceDictionary>
+					</ResourceDictionary.ThemeDictionaries>
+				</ResourceDictionary>
 
-      <x:Double x:Key="LandscapeMaxPageWidth">500</x:Double>
+				<!-- Application's custom styles -->
+				<ResourceDictionary Source="ms-appx:///Styles/FeedView.xaml" />
+				<ResourceDictionary Source="ms-appx:///Styles/NavigationBar.xaml" />
+				<ResourceDictionary Source="ms-appx:///Styles/NavigationView.xaml" />
 
-      <!-- To override the default FlyoutLightDismissOverlayBackground resource -->
-      <SolidColorBrush x:Key="FlyoutLightDismissOverlayBackground"
+			</ResourceDictionary.MergedDictionaries>
+
+			<x:Double x:Key="LandscapeMaxPageWidth">500</x:Double>
+
+			<!-- To override the default FlyoutLightDismissOverlayBackground resource -->
+			<SolidColorBrush x:Key="FlyoutLightDismissOverlayBackground"
 							 Color="{ThemeResource OverlayColor}" />
-      <x:Double x:Key="WideMinWindowWidth">800</x:Double>
-      <x:Double x:Key="ExtraWideMinWindowWidth">1000</x:Double>
+
+			<x:Double x:Key="WideMinWindowWidth">800</x:Double>
+			<x:Double x:Key="ExtraWideMinWindowWidth">1000</x:Double>
 
-      <converters:FormatConverter x:Key="FormatConverter" />
-      <converters:StringFormatter x:Key="StringFormatter" />
+			<converters:FormatConverter x:Key="FormatConverter" />
+			<converters:StringFormatter x:Key="StringFormatter" />
       <converters:StringCompareConverter x:Key="IsNullOrEmpty" Comparison="IsNullOrEmpty" />
       <converters:StringCompareConverter x:Key="IsNullOrWhitespace" Comparison="IsNullOrWhitespace" />
       <converters:StringCompareConverter x:Key="IsEqualToParameterValue" Comparison="IsEqualToParameterValue" />
@@ -60,11 +55,11 @@
       <converters:StringCompareConverter x:Key="IsNotEqualToParameterValue" Comparison="IsEqualToParameterValue" InvertResult="True" />
       <converters:ReferenceConverter x:Key="IsNull" ConversionMode="IsNull" />
       <converters:ReferenceConverter x:Key="IsNotNull" ConversionMode="IsNotNull" />
-      <converters:BitmapSourceConverter x:Key="BitmapSourceConverter" />
+			<converters:BitmapSourceConverter x:Key="BitmapSourceConverter" />
 
-    </ResourceDictionary>
-  </Application.Resources>
+		</ResourceDictionary>
+	</Application.Resources>
 
-  <!-- Add resources here -->
+	<!-- Add resources here -->
 
 </Application>
diff --git a/reference/ToDo/src/ToDo/Presentation/SettingsViewModel.cs b/reference/ToDo/src/ToDo/Presentation/SettingsViewModel.cs
@@ -46,7 +46,7 @@ public SettingsViewModel(
 		SelectedAppTheme.Execute(ChangeAppTheme);
 
 		Cultures = localizationConfiguration.Value!.Cultures!.Select(c => new DisplayCulture(localizer[$"SettingsFlyout_LanguageLabel_{c}"], c)).ToArray();
-		SelectedCulture = State.Value(this, () => Cultures.FirstOrDefault(c => c.Culture.Equals(LocalizationService.CurrentCulture)) ?? Cultures.First());
+		SelectedCulture = State.Value(this, () => Cultures.FirstOrDefault(c => c.Culture.Equals(LocalizationService.CurrentCulture.ToString())) ?? Cultures.First());
 
 		SelectedCulture.Execute(ChangeLanguage);
 	}

diff --git a/reference/ToDo/src/ToDo/ToDo.csproj b/reference/ToDo/src/ToDo/ToDo.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworks>
       net8.0-android;
       net8.0-ios;
-      net8.0-maccatalyst;
       net8.0-windows10.0.19041;
       net8.0-desktop;
       net8.0-browserwasm;
@@ -49,39 +48,21 @@
       AuthenticationMsal;
       Navigation;
       ExtensionsCore;
+      Skia;
     </UnoFeatures>
   </PropertyGroup>
+
   <ItemGroup>
-    <None Remove="Assets\Images\back.svg" />
-    <None Remove="Mock\lists.json" />
-    <!--<Content Include="Mock\lists.json" />-->
-    <None Remove="Mock\profilePicture.json" />
-    <None Remove="Mock\tasks.json" />
-    <!--<Content Include="Mock\tasks.json" />-->
-    <None Remove="Strings\en\Resources.resw" />
-    <None Remove="Strings\es\Resources.resw" />
-    <None Remove="Strings\fr\Resources.resw" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Mock\lists.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mock\profilePicture.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Mock\tasks.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
+    <Content Include="Mock\*.json" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
-    <PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
-    <PackageReference Include="SkiaSharp.Skottie" />
   </ItemGroup>
-  <ItemGroup>
+<!--  <ItemGroup>
     <UnoImage Include="Assets\Images\back.svg" />
-  </ItemGroup>
+  </ItemGroup>-->
 
 </Project>
diff --git a/reference/ToDo/src/ToDo/Views/Dialogs/SettingsFlyout.xaml b/reference/ToDo/src/ToDo/Views/Dialogs/SettingsFlyout.xaml
@@ -49,7 +49,7 @@
 											Orientation="Horizontal"
 											utu:AutoLayout.PrimaryAlignment="Stretch" />
 							<PersonPicture DisplayName="{Binding CurrentUser.Name}"
-										   ProfilePicture="{Binding ProfilePicture, Converter={StaticResource  BitmapSourceConverter}}"
+										   ProfilePicture="{Binding ProfilePicture, Converter={StaticResource BitmapSourceConverter}}"
 										   utu:AutoLayout.CounterAlignment="Start" />
 							<utu:AutoLayout Spacing="10"
 											Padding="20,15,20,15"
@@ -86,26 +86,6 @@
 									   Foreground="{ThemeResource PrimaryBrush}"
 									   Style="{StaticResource LabelLarge}" />
 							<utu:AutoLayout Spacing="20">
-								<!-- Commenting the Color Palette Section for now -->
-								<!-- Can be added again when it's implemented : https://github.com/unoplatform/uno.todo/issues/147 -->
-								<!--<utu:AutoLayout Spacing="5">
-							<TextBlock x:Uid="SettingsFlyout_PaletteSection"
-									   Text="Color palette"
-									   Foreground="{ThemeResource OnSurfaceBrush}"
-									   utu:AutoLayout.CounterAlignment="Start"
-									   Style="{StaticResource BodySmall}" />
-							<utu:ChipGroup x:Name="ColorPaletteChipGroup"
-										   SelectionMode="Single"
-										   ItemChecked="{x:Bind UpdateAppColorPalette}"
-										   Style="{StaticResource FilterChipGroupStyle}">
-								<utu:Chip x:Uid="SettingsFlyout_PalettePurple" Content="Purple"
-										  Style="{StaticResource FilterChipStyle}" />
-								<utu:Chip x:Uid="SettingsFlyout_PaletteBlue" Content="Blue"
-										  Style="{StaticResource FilterChipStyle}" />
-								<utu:Chip x:Uid="SettingsFlyout_PaletteYellow" Content="Yellow"
-										  Style="{StaticResource FilterChipStyle}" />
-							</utu:ChipGroup>
-						</utu:AutoLayout>-->
 								<utu:AutoLayout Spacing="5">
 									<TextBlock x:Uid="SettingsFlyout_LanguageLabel"
 											   Foreground="{ThemeResource OnSurfaceBrush}"

diff --git a/reference/ToDo/src/ToDo/Views/HomePage.xaml b/reference/ToDo/src/ToDo/Views/HomePage.xaml
@@ -9,7 +9,7 @@
 	  xmlns:uen="using:Uno.Extensions.Navigation.UI"
 	  xmlns:uer="using:Uno.Extensions.Reactive.UI"
 	  xmlns:um="using:Uno.Material"
-    xmlns:ut="using:Uno.Themes"
+	  xmlns:ut="using:Uno.Themes"
 	  xmlns:uut="using:Uno.UI.Toolkit"
 	  xmlns:utu="using:Uno.Toolkit.UI"
 	  xmlns:not_win="http://uno.ui/not_win"
@@ -88,7 +88,7 @@
 							  ColumnSpacing="8">
 							<PersonPicture Grid.Column="0"
 								   DisplayName="{Binding CurrentUser.Name}"
-								   ProfilePicture="{Binding ProfilePicture, Converter={StaticResource  BitmapSourceConverter}}"
+								   ProfilePicture="{Binding ProfilePicture, Converter={StaticResource BitmapSourceConverter}}"
 								   Width="40"
 								   Height="40"
 										   VerticalAlignment="Center" />

diff --git a/reference/ToDo/src/ToDo/Views/WelcomePage.xaml b/reference/ToDo/src/ToDo/Views/WelcomePage.xaml
@@ -87,7 +87,7 @@
 					<utu:AutoLayout Spacing="10"
 									Padding="0,0,0,40"
 									utu:AutoLayout.CounterAlignment="Start"
-									utu:AutoLayout.CounterLength="330">
+									utu:AutoLayout.CounterLength="340">
 						<TextBlock x:Uid="WelcomePage_Welcome"
 								   Foreground="{ThemeResource OnSecondaryMediumBrush}"
 								   TextWrapping="Wrap"

diff --git a/reference/ToDo/src/ToDo/appsettings.json b/reference/ToDo/src/ToDo/appsettings.json
@@ -18,7 +18,6 @@
     "Cultures": [
       "es",
       "fr",
-      "pt-BR",
       "en"
     ]
   }

diff --git a/reference/ToDo/src/global.json b/reference/ToDo/src/global.json
@@ -1,6 +1,6 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.2.80"
+    "Uno.Sdk": "5.2.132"
   }
 }