fix: adjust Recipe Details into a single FeedView

Author: kazo0

Chefs/App.xaml.cs

@@ -38,6 +38,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
 		ConfigureAppBuilder(builder);
 		MainWindow = builder.Window;
 
+
 #if DEBUG
 		MainWindow.UseStudio();
 #endif

Chefs/Business/Models/Nutrition.cs

@@ -5,12 +5,12 @@ public partial record Nutrition
 {
 	internal Nutrition(NutritionData? nutritionData)
 	{
-		Protein = nutritionData?.Protein;
-		Carbs = nutritionData?.Carbs;
-		Fat = nutritionData?.Fat;
-		ProteinBase = nutritionData?.ProteinBase;
-		CarbsBase = nutritionData?.CarbsBase;
-		FatBase = nutritionData?.FatBase;
+		Protein = 30;
+		Carbs = 101;
+		Fat = 30;
+		ProteinBase = 110;
+		CarbsBase = 300;
+		FatBase = 75;
 	}
 
 	public double? Protein { get; }

Chefs/Presentation/RecipeDetailsModel.cs

@@ -1,11 +1,4 @@
-using System.Runtime.InteropServices;
-using System.Text;
-using Chefs.Business.Services.Recipes;
 using Chefs.Business.Services.Sharing;
-using Chefs.Business.Services.Users;
-using Windows.ApplicationModel.DataTransfer;
-using WinRT;
-using WinRT.Interop;
 
 namespace Chefs.Presentation;
 
@@ -14,57 +7,68 @@ public partial record RecipeDetailsModel
 	private readonly INavigator _navigator;
 	private readonly IRecipeService _recipeService;
 	private readonly IUserService _userService;
-	private readonly IMessenger _messenger;
 	private readonly IShareService _shareService;
+	private readonly RecipeFeedProvider _recipeFeed;
 
 	public RecipeDetailsModel(
 		Recipe recipe,
 		INavigator navigator,
 		IRecipeService recipeService,
 		IUserService userService,
-		IMessenger messenger,
 		IShareService shareService)
 	{
 		_navigator = navigator;
 		_recipeService = recipeService;
 		_userService = userService;
-		_messenger = messenger;
 		_shareService = shareService;
 
 		Recipe = recipe;
+		_recipeFeed = new RecipeFeedProvider(recipe, _recipeService, _userService);
 	}
 
 	public Recipe Recipe { get; }
-	public IState<bool> IsFavorited => State.Value(this, () => Recipe.IsFavorite);
 
-	public IState<User> User => State.Async(this, async ct => await _userService.GetById(Recipe.UserId, ct))
-		.Observe(_messenger, u => u.Id);
+	public IFeed<RecipeInfo> RecipeDetails => _recipeFeed.Feed;
 
-	public IFeed<User> CurrentUser => Feed.Async(_userService.GetCurrent);
-	public IListFeed<Ingredient> Ingredients => ListFeed.Async(async ct => await _recipeService.GetIngredients(Recipe.Id, ct));
-	public IListFeed<Step> Steps => ListFeed.Async(async ct => await _recipeService.GetSteps(Recipe.Id, ct));
+	public async ValueTask Like(Review review, CancellationToken ct)
+		=> await _recipeService.LikeReview(review, ct);
 
-	public IListState<Review> Reviews => ListState
-		.Async(this, async ct => await _recipeService.GetReviews(Recipe.Id, ct))
-		.Observe(_messenger, r => r.Id);
+	public async ValueTask Dislike(Review review, CancellationToken ct)
+		=> await _recipeService.DislikeReview(review, ct);
 
-	public async ValueTask Like(Review review, CancellationToken ct) =>
-		await _recipeService.LikeReview(review, ct);
+	public async ValueTask LiveCooking(RecipeInfo recipeDetails)
+		=> await _navigator.NavigateDataAsync(this, data: new LiveCookingParameter(recipeDetails.Recipe, recipeDetails.Steps));
 
-	public async ValueTask Dislike(Review review, CancellationToken ct) =>
-		await _recipeService.DislikeReview(review, ct);
+	public async ValueTask Favorite(RecipeInfo recipeDetails, CancellationToken ct)
+		=> await _recipeService.Favorite(recipeDetails.Recipe, ct);
 
-	public async ValueTask LiveCooking(IImmutableList<Step> steps) =>
-		await _navigator.NavigateRouteAsync(this, "LiveCooking", data: new LiveCookingParameter(Recipe, steps));
+	public async Task Share(RecipeInfo recipeDetails, CancellationToken ct)
+		=> await _shareService.ShareRecipe(recipeDetails.Recipe, recipeDetails.Steps, ct);
 
-	public async ValueTask Favorite(CancellationToken ct)
+	private class RecipeFeedProvider(Recipe recipe, IRecipeService recipeService, IUserService userService)
 	{
-		await _recipeService.Favorite(Recipe, ct);
-		await IsFavorited.UpdateAsync(s => !s);
-	}
+		public IFeed<RecipeInfo> Feed => Uno.Extensions.Reactive.Feed
+			.Combine(Recipe, User, Ingredients, Steps, Reviews)
+			.Select(ToRecipeInfo);
 
-	public async Task Share(CancellationToken ct)
-	{
-		await _shareService.ShareRecipe(Recipe, await Steps, ct);
+		private IFeed<Recipe> Recipe => State.Value(this, () => recipe);
+
+		private IFeed<User> User => Recipe.SelectAsync(async (r, ct) => await userService.GetById(r.UserId, ct));
+
+		private IFeed<IImmutableList<Ingredient>> Ingredients => Recipe.SelectAsync(async (r, ct) => await recipeService.GetIngredients(r.Id, ct));
+
+		private IFeed<IImmutableList<Step>> Steps => Recipe.SelectAsync(async (r, ct) => await recipeService.GetSteps(r.Id, ct));
+
+		private IFeed<IImmutableList<Review>> Reviews => Recipe.SelectAsync(async (r, ct) => await recipeService.GetReviews(r.Id, ct));
+
+		private RecipeInfo ToRecipeInfo((Recipe recipe, User user, IImmutableList<Ingredient> ingredients, IImmutableList<Step> steps, IImmutableList<Review> reviews) values)
+			=> new RecipeInfo(
+				values.recipe,
+				values.user,
+				values.steps,
+				values.ingredients,
+				values.reviews);
 	}
+
+	public record RecipeInfo(Recipe Recipe, User User, IImmutableList<Step> Steps, IImmutableList<Ingredient> Ingredients, IImmutableList<Review> Reviews);
 }

Chefs/Styles/FeedView.xaml

@@ -351,4 +351,4 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-</ResourceDictionary>
+</ResourceDictionary>