Merge branch 'develop' into friends-lists-refresh-views

ChrispyPeaches · May 8, 2024 · 451a853 · 451a853
2 parents e119cfe + 76d7c08
commit 451a853
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 5 deletions.
diff --git a/src/FocusApp.Client/MauiProgram.cs b/src/FocusApp.Client/MauiProgram.cs
@@ -101,7 +101,7 @@ private static IServiceCollection RegisterRefitClient(this IServiceCollection se
         {
             services
                 .AddRefitClient<IAPIClient>()
-                .ConfigureHttpClient(c => c.BaseAddress = new Uri("http://test.zenpxl.com:25565"));
+                .ConfigureHttpClient(c => c.BaseAddress = new Uri("http://prod.zenpxl.com:25565"));
 
             return services;
         }

diff --git a/src/FocusApp.Client/Resources/Images/pet_beans.png b/src/FocusApp.Client/Resources/Images/pet_beans.png
diff --git a/src/FocusApp.Client/Resources/Images/pet_bob.png b/src/FocusApp.Client/Resources/Images/pet_bob.png
diff --git a/src/FocusApp.Client/Resources/Images/pet_cool_cat.png b/src/FocusApp.Client/Resources/Images/pet_cool_cat.png
diff --git a/src/FocusApp.Client/Resources/Images/pet_cooler_cat.png b/src/FocusApp.Client/Resources/Images/pet_cooler_cat.png
diff --git a/src/FocusApp.Client/Resources/Images/pet_danole.png b/src/FocusApp.Client/Resources/Images/pet_danole.png
diff --git a/src/FocusApp.Client/Resources/Images/pet_franklin.png b/src/FocusApp.Client/Resources/Images/pet_franklin.png
diff --git a/src/FocusApp.Client/Resources/Images/pet_greg.png b/src/FocusApp.Client/Resources/Images/pet_greg.png
diff --git a/src/FocusApp.Client/Resources/Images/pet_wurmy.png b/src/FocusApp.Client/Resources/Images/pet_wurmy.png
diff --git a/src/FocusApp.Client/Views/LoginPage.cs b/src/FocusApp.Client/Views/LoginPage.cs
@@ -30,7 +30,7 @@ PopupService popupService
         _mediator = mediator;
         _popupService = popupService;
 
-        var pets = new List<string> { "pet_beans.png", "pet_bob.png", "pet_danole.png", "pet_franklin.png", "pet_greg.png", "pet_wurmy.png" };
+        var pets = new List<string> { "pet_cool_cat.png", "pet_cool_cat.png", "pet_cool_cat.png", "pet_cooler_cat.png",  };
         var rnd = new Random();
 
         Loaded += LoginPage_Loaded;

diff --git a/src/FocusApp.Client/Views/Social/BadgesPage.cs b/src/FocusApp.Client/Views/Social/BadgesPage.cs
@@ -191,15 +191,15 @@ private void DisplayBadges(List<Badge> localBadges, List<Guid> userBadgeIds)
                 }
                 .Invoke(button => button.Released += (s, e) => OnImageButtonClicked(s, e));
 
-                var grid = new Grid
+                var ownedGrid = new Grid
                 {
                     ownedBadge
                     .ZIndex(0),
 
                     checkmark
                     .ZIndex(1)
                 };
-                flexLayout.Children.Add(grid);
+                flexLayout.Children.Add(ownedGrid);
             }
             else
             {
@@ -213,7 +213,14 @@ private void DisplayBadges(List<Badge> localBadges, List<Guid> userBadgeIds)
                     Opacity = .2
                 }
                 .Invoke(button => button.Released += (s, e) => OnImageButtonClicked(s, e));
-                flexLayout.Children.Add(unownedBadge);
+
+                var unownedGrid = new Grid
+                {
+                    unownedBadge
+                    .ZIndex(0)
+                };
+                flexLayout.Children.Add(unownedGrid);
+
             }
         }
     }