From 6d291ea40b469e5ddc6d705621d53582332fb6d1 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Thu, 5 Dec 2024 17:00:31 +0000
Subject: [PATCH 1/6] Add lightness detection to banner image

---
 UniSky/Helpers/Interop/BitmapInterop.cs       | 40 ++++++++++
 UniSky/Pages/HomePage.xaml                    | 10 ---
 UniSky/Pages/HomePage.xaml.cs                 |  1 +
 UniSky/Pages/ProfilePage.xaml                 |  4 +-
 UniSky/Pages/ProfilePage.xaml.cs              |  1 +
 UniSky/Services/ISafeAreaService.cs           |  3 +
 UniSky/Services/SafeAreaService.cs            | 12 ++-
 UniSky/ViewModels/Post/PostViewModel.cs       |  2 +-
 .../Profile/ProfilePageViewModel.cs           | 78 +++++++++++++++----
 9 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/UniSky/Helpers/Interop/BitmapInterop.cs b/UniSky/Helpers/Interop/BitmapInterop.cs
index 4299ce0..3fea2be 100644
--- a/UniSky/Helpers/Interop/BitmapInterop.cs
+++ b/UniSky/Helpers/Interop/BitmapInterop.cs
@@ -1,8 +1,11 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
+using FishyFlip.Lexicon.App.Bsky.Actor;
+using Microsoft.Toolkit.Uwp;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Graphics.Imaging;
 using Windows.Storage;
@@ -158,6 +161,43 @@ unsafe interface IMemoryBufferByteAccess
         void GetBuffer(out byte* buffer, out uint capacity);
     }
 
+    public static async Task<float> GetImageAverageBrightnessAsync(IRandomAccessStream stream)
+    {
+        static float RgbToLightness(double r, double g, double b)
+        {
+            float _R = (float)(r / 255f);
+            float _G = (float)(g / 255f);
+            float _B = (float)(b / 255f);
+
+            float _Min = Math.Min(Math.Min(_R, _G), _B);
+            float _Max = Math.Max(Math.Max(_R, _G), _B);
+            float _Delta = _Max - _Min;
+
+            float L = (float)((_Max + _Min) / 2.0f);
+
+            return L;
+        }
+
+        var decoder = await BitmapDecoder.CreateAsync(stream);
+        var transform = new BitmapTransform() { ScaledWidth = 1, ScaledHeight = 1, InterpolationMode = BitmapInterpolationMode.Cubic };
+
+        using var bitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied, transform, ExifOrientationMode.RespectExifOrientation, ColorManagementMode.ColorManageToSRgb);
+        using var buffer = bitmap.LockBuffer(BitmapBufferAccessMode.Read);
+        using var reference = buffer.CreateReference();
+
+        unsafe
+        {
+            ((IMemoryBufferByteAccess)reference).GetBuffer(out var raw, out var capacity);
+
+            var b = raw[0];
+            var g = raw[1];
+            var r = raw[2];
+            var a = raw[3];
+
+            return RgbToLightness(r, g, b);
+        }
+    }
+
     public static async Task<StorageFile> SaveBitmapToFileAsync(RandomAccessStreamReference streamReference)
     {
         var file = await ApplicationData.Current.TemporaryFolder.CreateFileAsync($"{Guid.NewGuid()}.png");
diff --git a/UniSky/Pages/HomePage.xaml b/UniSky/Pages/HomePage.xaml
index e8abf70..ef0ac56 100644
--- a/UniSky/Pages/HomePage.xaml
+++ b/UniSky/Pages/HomePage.xaml
@@ -380,16 +380,6 @@
                         <Setter Target="FooterNavigation.Visibility" Value="Collapsed"/>
                     </VisualState.Setters>
                 </VisualState>
-                <!--<VisualState x:Name="Wide">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="1023" />
-                    </VisualState.StateTriggers>
-
-                    <VisualState.Setters>
-                        <Setter Target="NavView.PaneDisplayMode" Value="Left"/>
-                        <Setter Target="FooterNavigation.Visibility" Value="Collapsed"/>
-                    </VisualState.Setters>
-                </VisualState>-->
             </VisualStateGroup>
             <VisualStateGroup>
                 <VisualState x:Name="Active">
diff --git a/UniSky/Pages/HomePage.xaml.cs b/UniSky/Pages/HomePage.xaml.cs
index e1b8f40..f6268d5 100644
--- a/UniSky/Pages/HomePage.xaml.cs
+++ b/UniSky/Pages/HomePage.xaml.cs
@@ -75,6 +75,7 @@ private void OnSafeAreaUpdated(object sender, SafeAreaUpdatedEventArgs e)
             VisualStateManager.GoToState(this, "Inactive", true);
         }
 
+        AppTitleBar.RequestedTheme = e.SafeArea.Theme;
         Margin = new Thickness(e.SafeArea.Bounds.Left, 0, e.SafeArea.Bounds.Right, e.SafeArea.Bounds.Bottom);
     }
 
diff --git a/UniSky/Pages/ProfilePage.xaml b/UniSky/Pages/ProfilePage.xaml
index a8c0553..46bac43 100644
--- a/UniSky/Pages/ProfilePage.xaml
+++ b/UniSky/Pages/ProfilePage.xaml
@@ -184,7 +184,7 @@
                             Grid.ColumnSpan="2"
                             Grid.Row="1"
                             VerticalAlignment="Bottom"
-                            RequestedTheme="Dark">
+                            RequestedTheme="{Binding Theme}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
@@ -208,7 +208,7 @@
                                 Tapped="ProfileContainer_Tapped"
                                 Margin="-60,-8,-8,-8"
                                 Grid.ColumnSpan="2"
-                                Grid.RowSpan="2"/>
+                                Grid.RowSpan="2"/> 
 
                         <Button x:Name="ScrolledFollowButton"
                                 Style="{ThemeResource ButtonRevealStyle}"
diff --git a/UniSky/Pages/ProfilePage.xaml.cs b/UniSky/Pages/ProfilePage.xaml.cs
index 6e04ee0..6dd23e2 100644
--- a/UniSky/Pages/ProfilePage.xaml.cs
+++ b/UniSky/Pages/ProfilePage.xaml.cs
@@ -74,6 +74,7 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
     {
         var safeAreaService = Ioc.Default.GetRequiredService<ISafeAreaService>();
         safeAreaService.SafeAreaUpdated -= OnSafeAreaUpdated;
+        safeAreaService.SetTitlebarTheme(ElementTheme.Default);
     }
 
     private void HandleUniskyProtocol(Uri uri)
diff --git a/UniSky/Services/ISafeAreaService.cs b/UniSky/Services/ISafeAreaService.cs
index 16e4034..329a9f9 100644
--- a/UniSky/Services/ISafeAreaService.cs
+++ b/UniSky/Services/ISafeAreaService.cs
@@ -1,4 +1,5 @@
 using System;
+using Windows.UI.Xaml;
 
 namespace UniSky.Services
 {
@@ -6,5 +7,7 @@ internal interface ISafeAreaService
     {
         SafeAreaInfo State { get; }
         event EventHandler<SafeAreaUpdatedEventArgs> SafeAreaUpdated;
+
+        void SetTitlebarTheme(ElementTheme theme);
     }
 }
\ No newline at end of file
diff --git a/UniSky/Services/SafeAreaService.cs b/UniSky/Services/SafeAreaService.cs
index c7dcf67..0afc5cc 100644
--- a/UniSky/Services/SafeAreaService.cs
+++ b/UniSky/Services/SafeAreaService.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Humanizer;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
@@ -13,10 +14,11 @@
 using Windows.UI.Core;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 
 namespace UniSky.Services;
 
-public record class SafeAreaInfo(bool HasTitleBar, bool IsActive, Thickness Bounds);
+public record class SafeAreaInfo(bool HasTitleBar, bool IsActive, Thickness Bounds, ElementTheme Theme);
 
 public class SafeAreaUpdatedEventArgs : EventArgs
 {
@@ -61,7 +63,7 @@ public SafeAreaService()
         titleBar.IsVisibleChanged
             += CoreTitleBar_IsVisibleChanged;
 
-        _state = new SafeAreaInfo(true, true, new Thickness());
+        _state = new SafeAreaInfo(true, true, new Thickness(), ElementTheme.Default);
     }
 
     public event EventHandler<SafeAreaUpdatedEventArgs> SafeAreaUpdated
@@ -153,4 +155,10 @@ private void UpdateBounds()
         _state = _state with { Bounds = new Thickness(left, top, right, bottom) };
         _event?.Invoke(this, new SafeAreaUpdatedEventArgs() { SafeArea = _state });
     }
+
+    public void SetTitlebarTheme(ElementTheme theme)
+    {
+        _state = _state with { Theme = theme };
+        _event?.Invoke(this, new SafeAreaUpdatedEventArgs() { SafeArea = _state });
+    }
 }
\ No newline at end of file
diff --git a/UniSky/ViewModels/Post/PostViewModel.cs b/UniSky/ViewModels/Post/PostViewModel.cs
index 1f012fb..7d1d21a 100644
--- a/UniSky/ViewModels/Post/PostViewModel.cs
+++ b/UniSky/ViewModels/Post/PostViewModel.cs
@@ -132,7 +132,7 @@ public PostViewModel(PostView view, bool hasChild = false)
         Embed = CreateEmbedViewModel(view.Embed);
 
         RichText = new RichTextViewModel(post.Text, post.Facets ?? []);
-        Debug.WriteLine(string.Concat(RichText.Facets.Select(f => f.Text)));
+        //Debug.WriteLine(string.Concat(RichText.Facets.Select(f => f.Text)));
 
         var timeSinceIndex = DateTime.Now - (view.IndexedAt.Value.ToLocalTime());
         var date = timeSinceIndex.Humanize(1, minUnit: Humanizer.Localisation.TimeUnit.Second);
diff --git a/UniSky/ViewModels/Profile/ProfilePageViewModel.cs b/UniSky/ViewModels/Profile/ProfilePageViewModel.cs
index f97ba55..1f2b09f 100644
--- a/UniSky/ViewModels/Profile/ProfilePageViewModel.cs
+++ b/UniSky/ViewModels/Profile/ProfilePageViewModel.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,11 +14,14 @@
 using FishyFlip.Tools;
 using Humanizer;
 using UniSky.Extensions;
+using UniSky.Helpers.Interop;
 using UniSky.Services;
 using UniSky.ViewModels.Feeds;
 using UniSky.ViewModels.Profiles;
 using Windows.Foundation.Metadata;
+using Windows.Graphics.Imaging;
 using Windows.Phone;
+using Windows.Storage;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 
@@ -44,9 +49,16 @@ public partial class ProfilePageViewModel : ProfileViewModel
     [ObservableProperty]
     private ProfileFeedViewModel selectedFeed;
 
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(Theme))]
+    private bool? isLight;
+
     public Visibility ShowBio
         => !string.IsNullOrWhiteSpace(Bio) ? Visibility.Visible : Visibility.Collapsed;
 
+    public ElementTheme Theme
+        => IsLight.HasValue ? IsLight.Value ? ElementTheme.Dark : ElementTheme.Light : ElementTheme.Default;
+
     public string Followers
         => FollowerCount.ToMetric(decimals: 2);
     public string Following
@@ -94,23 +106,33 @@ private async Task LoadAsync()
     {
         using var context = this.GetLoadingContext();
 
-        var protocol = Ioc.Default.GetRequiredService<IProtocolService>();
-        var profile = (await protocol.Protocol.GetProfileAsync(this.id).ConfigureAwait(false))
-            .HandleResult();
-
-        syncContext.Post(() =>
+        try
         {
-            if (Feeds.Count == 0)
+            var protocol = Ioc.Default.GetRequiredService<IProtocolService>();
+            var profile = (await protocol.Protocol.GetProfileAsync(this.id).ConfigureAwait(false))
+                .HandleResult();
+
+            syncContext.Post(() =>
             {
-                Feeds.Add(new ProfileFeedViewModel(this, "posts_no_replies", profile, protocol));
-                Feeds.Add(new ProfileFeedViewModel(this, "posts_with_replies", profile, protocol));
-                Feeds.Add(new ProfileFeedViewModel(this, "posts_with_media", profile, protocol));
+                if (Feeds.Count == 0)
+                {
+                    Feeds.Add(new ProfileFeedViewModel(this, "posts_no_replies", profile, protocol));
+                    Feeds.Add(new ProfileFeedViewModel(this, "posts_with_replies", profile, protocol));
+                    Feeds.Add(new ProfileFeedViewModel(this, "posts_with_media", profile, protocol));
 
-                SelectedFeed = Feeds[0];
-            }
+                    SelectedFeed = Feeds[0];
+                }
 
-            Populate(profile);
-        });
+                Populate(profile);
+            });
+
+            await CalculateBannerLightnessAsync(profile)
+                .ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            this.SetErrored(ex);
+        }
     }
 
     private void Populate(ProfileViewDetailed profile)
@@ -153,4 +175,34 @@ internal void Select(ProfileFeedViewModel profileFeedViewModel)
     {
         SelectedFeed = profileFeedViewModel;
     }
+
+    private async Task CalculateBannerLightnessAsync(ProfileViewDetailed profile)
+    {
+        if (string.IsNullOrWhiteSpace(profile.Banner)) return;
+
+        var protocol = Ioc.Default.GetRequiredService<IProtocolService>();
+        using var banner = await protocol.Protocol.Client.GetStreamAsync(profile.Banner)
+            .ConfigureAwait(false);
+        using var memoryStream = new MemoryStream();
+        await banner.CopyToAsync(memoryStream);
+
+        memoryStream.Seek(0, SeekOrigin.Begin);
+
+        var lightness = await BitmapInterop.GetImageAverageBrightnessAsync(memoryStream.AsRandomAccessStream());
+        IsLight = lightness < 0.66f;
+        Debug.WriteLine(lightness);
+
+        syncContext.Post(() =>
+        {
+            var safeAreaService = Ioc.Default.GetRequiredService<ISafeAreaService>();
+            if (IsLight == true)
+            {
+                safeAreaService.SetTitlebarTheme(ElementTheme.Dark);
+            }
+            else
+            {
+                safeAreaService.SetTitlebarTheme(ElementTheme.Light);
+            }
+        });
+    }
 }

From 608b04879dec7cc31e5401578202e08621e3b5d4 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Thu, 5 Dec 2024 17:50:04 +0000
Subject: [PATCH 2/6] Fixes, works reliably now

---
 UniSky/Helpers/Interop/BitmapInterop.cs       |   2 +-
 UniSky/Pages/HomePage.xaml                    | 125 +++++++++---------
 UniSky/Pages/HomePage.xaml.cs                 |   6 +-
 UniSky/Pages/ProfilePage.xaml                 |   6 +
 UniSky/Pages/ProfilePage.xaml.cs              |   2 +-
 UniSky/Services/SafeAreaService.cs            |  38 +++++-
 UniSky/ViewModels/Post/PostEmbedViewModel.cs  |   2 +-
 UniSky/ViewModels/Post/PostViewModel.cs       |   2 +-
 .../Profile/ProfilePageViewModel.cs           |   5 +-
 UniSky/ViewModels/Profile/ProfileViewModel.cs |  10 +-
 10 files changed, 122 insertions(+), 76 deletions(-)

diff --git a/UniSky/Helpers/Interop/BitmapInterop.cs b/UniSky/Helpers/Interop/BitmapInterop.cs
index 3fea2be..f556433 100644
--- a/UniSky/Helpers/Interop/BitmapInterop.cs
+++ b/UniSky/Helpers/Interop/BitmapInterop.cs
@@ -179,7 +179,7 @@ static float RgbToLightness(double r, double g, double b)
         }
 
         var decoder = await BitmapDecoder.CreateAsync(stream);
-        var transform = new BitmapTransform() { ScaledWidth = 1, ScaledHeight = 1, InterpolationMode = BitmapInterpolationMode.Cubic };
+        var transform = new BitmapTransform() { ScaledWidth = 1, ScaledHeight = 1, InterpolationMode = BitmapInterpolationMode.Fant };
 
         using var bitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied, transform, ExifOrientationMode.RespectExifOrientation, ColorManagementMode.ColorManageToSRgb);
         using var buffer = bitmap.LockBuffer(BitmapBufferAccessMode.Read);
diff --git a/UniSky/Pages/HomePage.xaml b/UniSky/Pages/HomePage.xaml
index ef0ac56..fb23527 100644
--- a/UniSky/Pages/HomePage.xaml
+++ b/UniSky/Pages/HomePage.xaml
@@ -296,61 +296,78 @@
                               ToolTipService.Placement="Top"/>
                 </Grid>
 
-
-
-                <Grid x:Name="AppTitleBar"
-                      Background="Transparent"
-                      VerticalAlignment="Top">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-
-                    <Grid Grid.Column="1" 
-                          MaxWidth="600" 
-                          HorizontalAlignment="Stretch">
+                <UserControl x:Name="AppTitleBarContainer"
+                             VerticalAlignment="Top">
+                    <Grid x:Name="AppTitleBar"
+                          Background="Transparent">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="32"/>
+                            <ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                        <Grid.RenderTransform>
-                            <TranslateTransform x:Name="TitleHeaderTransform"/>
-                        </Grid.RenderTransform>
 
-                        <Button x:Name="BackButton"
-                                x:Load="{x:Bind NavigationFrame.CanGoBack, Mode=OneWay}"
-                                Style="{StaticResource NavigationBackButtonNormalStyle}"
-                                Height="32"
-                                FontSize="13"
-                                ToolTipService.ToolTip="Back"
-                                Command="{x:Bind ViewModel.GoBackCommand}"/>
+                        <Grid Grid.Column="1" 
+                               MaxWidth="600" 
+                               HorizontalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="32"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RenderTransform>
+                                <TranslateTransform x:Name="TitleHeaderTransform"/>
+                            </Grid.RenderTransform>
 
-                        <Viewbox VerticalAlignment="Center"
-                                 HorizontalAlignment="Center"
-                                 Margin="8,2,0,0"
-                                 Width="16"
-                                 Height="16"
-                                 Grid.Column="1">
-                            <Path x:Name="AppIconPath"
-                                  Data="{StaticResource BlueSkyLogoPath}"
-                                  Fill="{ThemeResource ApplicationForegroundThemeBrush}"/>
-                        </Viewbox>
+                            <Button x:Name="BackButton"
+                                     x:Load="{x:Bind NavigationFrame.CanGoBack, Mode=OneWay}"
+                                     Style="{StaticResource NavigationBackButtonNormalStyle}"
+                                     Height="32"
+                                     FontSize="13"
+                                     ToolTipService.ToolTip="Back"
+                                     Command="{x:Bind ViewModel.GoBackCommand}"/>
+
+                            <Viewbox VerticalAlignment="Center"
+                                      HorizontalAlignment="Center"
+                                      Margin="8,2,0,0"
+                                      Width="16"
+                                      Height="16"
+                                      Grid.Column="1">
+                                <Path x:Name="AppIconPath"
+                                       Data="{StaticResource BlueSkyLogoPath}"
+                                       Fill="{ThemeResource ApplicationForegroundThemeBrush}"/>
+                            </Viewbox>
 
-                        <TextBlock x:Name="AppTitleTextBlock"
-                                   x:Uid="AppTitle"
-                                   Style="{StaticResource CaptionTextBlockStyle}" 
-                                   Text="Unisky"
-                                   VerticalAlignment="Center" 
-                                   Grid.Column="2"
-                                   Margin="8,0"/>
+                            <TextBlock x:Name="AppTitleTextBlock"
+                                        x:Uid="AppTitle"
+                                        Style="{StaticResource CaptionTextBlockStyle}" 
+                                        Text="Unisky"
+                                        VerticalAlignment="Center" 
+                                        Grid.Column="2"
+                                        Margin="8,0"/>
 
-                        <Border x:Name="TitleBarDrag"
-                                Background="Transparent"
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"/>
+                            <Border x:Name="TitleBarDrag"
+                                     Background="Transparent"
+                                     Grid.Column="1"
+                                     Grid.ColumnSpan="2"/>
+                        </Grid>
+                        
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup>
+                                <VisualState x:Name="Active">
+                                    <VisualState.Setters>
+                                        <Setter Target="AppIconPath.Fill" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
+                                        <Setter Target="AppTitleTextBlock.Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Inactive">
+                                    <VisualState.Setters>
+                                        <Setter Target="AppIconPath.Fill" Value="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"/>
+                                        <Setter Target="AppTitleTextBlock.Foreground" Value="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
                     </Grid>
-                </Grid>
+                </UserControl>
             </Grid>
 
         </mux:NavigationView>
@@ -381,20 +398,6 @@
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
-            <VisualStateGroup>
-                <VisualState x:Name="Active">
-                    <VisualState.Setters>
-                        <Setter Target="AppIconPath.Fill" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
-                        <Setter Target="AppTitleTextBlock.Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}"/>
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="Inactive">
-                    <VisualState.Setters>
-                        <Setter Target="AppIconPath.Fill" Value="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"/>
-                        <Setter Target="AppTitleTextBlock.Foreground" Value="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"/>
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>
diff --git a/UniSky/Pages/HomePage.xaml.cs b/UniSky/Pages/HomePage.xaml.cs
index f6268d5..b27dbc4 100644
--- a/UniSky/Pages/HomePage.xaml.cs
+++ b/UniSky/Pages/HomePage.xaml.cs
@@ -68,14 +68,14 @@ private void OnSafeAreaUpdated(object sender, SafeAreaUpdatedEventArgs e)
 
         if (e.SafeArea.IsActive)
         {
-            VisualStateManager.GoToState(this, "Active", true);
+            VisualStateManager.GoToState(AppTitleBarContainer, "Active", true);
         }
         else
         {
-            VisualStateManager.GoToState(this, "Inactive", true);
+            VisualStateManager.GoToState(AppTitleBarContainer, "Inactive", true);
         }
 
-        AppTitleBar.RequestedTheme = e.SafeArea.Theme;
+        AppTitleBarContainer.RequestedTheme = e.SafeArea.Theme;
         Margin = new Thickness(e.SafeArea.Bounds.Left, 0, e.SafeArea.Bounds.Right, e.SafeArea.Bounds.Bottom);
     }
 
diff --git a/UniSky/Pages/ProfilePage.xaml b/UniSky/Pages/ProfilePage.xaml
index 46bac43..e25a3b2 100644
--- a/UniSky/Pages/ProfilePage.xaml
+++ b/UniSky/Pages/ProfilePage.xaml
@@ -62,6 +62,12 @@
                                    HorizontalAlignment="Center"
                                    Stretch="UniformToFill"/>
                         </controls:ConstrainedBox>
+
+                        <ProgressRing VerticalAlignment="Center"
+                                      HorizontalAlignment="Center"
+                                      Width="48"
+                                      Height="48"
+                                      IsActive="{Binding IsLoading}"/>
                     </Grid>
 
                     <Ellipse x:Name="ProfileImage"
diff --git a/UniSky/Pages/ProfilePage.xaml.cs b/UniSky/Pages/ProfilePage.xaml.cs
index 6dd23e2..d7ecb12 100644
--- a/UniSky/Pages/ProfilePage.xaml.cs
+++ b/UniSky/Pages/ProfilePage.xaml.cs
@@ -229,7 +229,7 @@ private void UpdateSizeDependentProperties()
 
         var safeAreaService = Ioc.Default.GetRequiredService<ISafeAreaService>();
 
-        var titleBarHeight = (float)safeAreaService.State.Bounds.Top;
+        var titleBarHeight = (float)safeAreaService.State.Bounds.Top + 4;
         var stickyHeight = (float)StickyFooter.ActualHeight;
         var totalSize = (float)ProfileContainer.ActualHeight;
         var clampHeight = (float)(52 + titleBarHeight) + stickyHeight;
diff --git a/UniSky/Services/SafeAreaService.cs b/UniSky/Services/SafeAreaService.cs
index 0afc5cc..d054705 100644
--- a/UniSky/Services/SafeAreaService.cs
+++ b/UniSky/Services/SafeAreaService.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Humanizer;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
+using Microsoft.Toolkit.Uwp.UI.Helpers;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
 using Windows.Foundation.Metadata;
@@ -30,6 +31,7 @@ internal class SafeAreaService : ISafeAreaService
     private readonly CoreWindow _window;
     private readonly ApplicationView _applicationView;
     private readonly CoreApplicationView _coreApplicationView;
+    private readonly ThemeListener _themeListener;
 
     private SafeAreaInfo _state;
 
@@ -51,10 +53,6 @@ public SafeAreaService()
         _applicationView.SetDesiredBoundsMode(ApplicationViewBoundsMode.UseCoreWindow);
         _applicationView.VisibleBoundsChanged += ApplicationView_VisibleBoundsChanged;
 
-        var appTitleBar = _applicationView.TitleBar;
-        appTitleBar.ButtonBackgroundColor = Colors.Transparent;
-        appTitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
-
         var titleBar = _coreApplicationView.TitleBar;
         titleBar.ExtendViewIntoTitleBar = true;
 
@@ -63,7 +61,11 @@ public SafeAreaService()
         titleBar.IsVisibleChanged
             += CoreTitleBar_IsVisibleChanged;
 
+        _themeListener = new ThemeListener();
+        _themeListener.ThemeChanged += OnThemeChanged;
+
         _state = new SafeAreaInfo(true, true, new Thickness(), ElementTheme.Default);
+        SetTitlebarTheme(ElementTheme.Default);
     }
 
     public event EventHandler<SafeAreaUpdatedEventArgs> SafeAreaUpdated
@@ -158,7 +160,35 @@ private void UpdateBounds()
 
     public void SetTitlebarTheme(ElementTheme theme)
     {
+        var actualTheme = theme switch
+        {
+            ElementTheme.Default => _themeListener.CurrentTheme == ApplicationTheme.Dark
+                ? ElementTheme.Dark
+                : ElementTheme.Light,
+            _ => theme
+        };
+
+        var appTitleBar = _applicationView.TitleBar;
+        appTitleBar.ButtonBackgroundColor = Colors.Transparent;
+        appTitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
+
+        if (actualTheme == ElementTheme.Dark)
+        {
+            appTitleBar.ButtonForegroundColor = Colors.White;
+            appTitleBar.ButtonInactiveForegroundColor = Colors.LightGray;
+        }
+        else
+        {
+            appTitleBar.ButtonForegroundColor = Colors.Black;
+            appTitleBar.ButtonInactiveForegroundColor = Colors.DarkGray;
+        }
+
         _state = _state with { Theme = theme };
         _event?.Invoke(this, new SafeAreaUpdatedEventArgs() { SafeArea = _state });
     }
+
+    private void OnThemeChanged(ThemeListener sender)
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/UniSky/ViewModels/Post/PostEmbedViewModel.cs b/UniSky/ViewModels/Post/PostEmbedViewModel.cs
index 2623936..3f730fb 100644
--- a/UniSky/ViewModels/Post/PostEmbedViewModel.cs
+++ b/UniSky/ViewModels/Post/PostEmbedViewModel.cs
@@ -7,6 +7,6 @@ public abstract partial class PostEmbedViewModel : ViewModelBase
 {
     public PostEmbedViewModel(ATObject embed)
     {
-        Debug.WriteLine(embed?.Type);
+        //Debug.WriteLine(embed?.Type);
     }
 }
diff --git a/UniSky/ViewModels/Post/PostViewModel.cs b/UniSky/ViewModels/Post/PostViewModel.cs
index 7d1d21a..ea68da8 100644
--- a/UniSky/ViewModels/Post/PostViewModel.cs
+++ b/UniSky/ViewModels/Post/PostViewModel.cs
@@ -273,7 +273,7 @@ private PostEmbedViewModel CreateEmbedViewModel(ATObject embed)
         if (embed is null)
             return null;
 
-        Debug.WriteLine(embed.GetType());
+        //Debug.WriteLine(embed.GetType());
 
         return embed switch
         {
diff --git a/UniSky/ViewModels/Profile/ProfilePageViewModel.cs b/UniSky/ViewModels/Profile/ProfilePageViewModel.cs
index 1f2b09f..3444bfe 100644
--- a/UniSky/ViewModels/Profile/ProfilePageViewModel.cs
+++ b/UniSky/ViewModels/Profile/ProfilePageViewModel.cs
@@ -139,7 +139,7 @@ private void Populate(ProfileViewDetailed profile)
     {
         this.id = profile.Did;
         this.AvatarUrl = profile.Avatar;
-        this.Name = profile.DisplayName;
+        this.Name = string.IsNullOrWhiteSpace(profile.DisplayName) ? profile.Handle.ToString() : profile.DisplayName;
         this.Handle = $"@{profile.Handle}";
         this.BannerUrl = profile.Banner;
         this.FollowerCount = (int)profile.FollowersCount;
@@ -189,7 +189,8 @@ private async Task CalculateBannerLightnessAsync(ProfileViewDetailed profile)
         memoryStream.Seek(0, SeekOrigin.Begin);
 
         var lightness = await BitmapInterop.GetImageAverageBrightnessAsync(memoryStream.AsRandomAccessStream());
-        IsLight = lightness < 0.66f;
+        IsLight = lightness < 0.60f;
+
         Debug.WriteLine(lightness);
 
         syncContext.Post(() =>
diff --git a/UniSky/ViewModels/Profile/ProfileViewModel.cs b/UniSky/ViewModels/Profile/ProfileViewModel.cs
index 2c21073..6588b6a 100644
--- a/UniSky/ViewModels/Profile/ProfileViewModel.cs
+++ b/UniSky/ViewModels/Profile/ProfileViewModel.cs
@@ -30,7 +30,10 @@ public ProfileViewModel(ATObject obj)
         {
             this.id = profile.Did;
             this.AvatarUrl = profile.Avatar;
-            this.Name = profile.DisplayName;
+            this.Name = string.IsNullOrWhiteSpace(profile.DisplayName) ? 
+                profile.Handle.ToString() :
+                profile.DisplayName;
+
             this.Handle = $"@{profile.Handle}";
         }
 
@@ -38,7 +41,10 @@ public ProfileViewModel(ATObject obj)
         {
             this.id = profileDetailed.Did;
             this.AvatarUrl = profileDetailed.Avatar;
-            this.Name = profileDetailed.DisplayName;
+            this.Name = string.IsNullOrWhiteSpace(profileDetailed.DisplayName) ? 
+                profileDetailed.Handle.ToString() :
+                profileDetailed.DisplayName;
+
             this.Handle = $"@{profileDetailed.Handle}";
         }
     }

From 1482be4583ae2dad0405464615c67d69adccc2e1 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Thu, 5 Dec 2024 18:03:49 +0000
Subject: [PATCH 3/6] StatusBar colours innit

---
 UniSky/Services/SafeAreaService.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/UniSky/Services/SafeAreaService.cs b/UniSky/Services/SafeAreaService.cs
index d054705..a6edbf7 100644
--- a/UniSky/Services/SafeAreaService.cs
+++ b/UniSky/Services/SafeAreaService.cs
@@ -183,12 +183,26 @@ public void SetTitlebarTheme(ElementTheme theme)
             appTitleBar.ButtonInactiveForegroundColor = Colors.DarkGray;
         }
 
+        if (ApiInformation.IsApiContractPresent(typeof(PhoneContract).FullName, 1))
+        {
+            var statusBar = StatusBar.GetForCurrentView();
+
+            if (actualTheme == ElementTheme.Dark)
+            {
+                statusBar.ForegroundColor = Colors.White;
+            }
+            else
+            {
+                statusBar.ForegroundColor = Colors.Black;
+            }
+        }
+
         _state = _state with { Theme = theme };
         _event?.Invoke(this, new SafeAreaUpdatedEventArgs() { SafeArea = _state });
     }
 
     private void OnThemeChanged(ThemeListener sender)
     {
-        
+
     }
 }
\ No newline at end of file

From 667f151fd55e83a5062fdaa73a3f71aced11d306 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Thu, 5 Dec 2024 18:05:37 +0000
Subject: [PATCH 4/6] Theme updated :D

---
 UniSky/Services/SafeAreaService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UniSky/Services/SafeAreaService.cs b/UniSky/Services/SafeAreaService.cs
index a6edbf7..e98bad4 100644
--- a/UniSky/Services/SafeAreaService.cs
+++ b/UniSky/Services/SafeAreaService.cs
@@ -203,6 +203,6 @@ public void SetTitlebarTheme(ElementTheme theme)
 
     private void OnThemeChanged(ThemeListener sender)
     {
-
+        SetTitlebarTheme(_state.Theme);
     }
 }
\ No newline at end of file

From c529db84b9611180faf06ad16e0f11d1fb638c14 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Thu, 5 Dec 2024 18:07:21 +0000
Subject: [PATCH 5/6] remove unneeded usings

---
 UniSky/Helpers/Interop/BitmapInterop.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/UniSky/Helpers/Interop/BitmapInterop.cs b/UniSky/Helpers/Interop/BitmapInterop.cs
index f556433..2831832 100644
--- a/UniSky/Helpers/Interop/BitmapInterop.cs
+++ b/UniSky/Helpers/Interop/BitmapInterop.cs
@@ -4,9 +4,6 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
-using FishyFlip.Lexicon.App.Bsky.Actor;
-using Microsoft.Toolkit.Uwp;
-using Windows.ApplicationModel.DataTransfer;
 using Windows.Graphics.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;

From a2c74ecd6b484fdced543fa699daa5fcc697f679 Mon Sep 17 00:00:00 2001
From: Thomas May <wamwoowam@gmail.com>
Date: Thu, 5 Dec 2024 18:54:01 +0000
Subject: [PATCH 6/6] Profile scroll acrylic

---
 UniSky/Pages/ProfilePage.xaml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/UniSky/Pages/ProfilePage.xaml b/UniSky/Pages/ProfilePage.xaml
index e25a3b2..155e2d1 100644
--- a/UniSky/Pages/ProfilePage.xaml
+++ b/UniSky/Pages/ProfilePage.xaml
@@ -9,6 +9,7 @@
     xmlns:extensions="using:UniSky.Extensions"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:mux="using:Microsoft.UI.Xaml.Controls"
+    xmlns:w1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     Loaded="Page_Loaded"
@@ -19,13 +20,14 @@
 
     <Grid>
         <ListView x:Name="RootList"
-              ItemsSource="{Binding SelectedFeed.Items}" 
-              ItemTemplate="{StaticResource FeedItemContentTemplate}"
-              SelectionMode="None"
-              IsItemClickEnabled="True"
-              HorizontalAlignment="Stretch"
-              HorizontalContentAlignment="Stretch"
-              ScrollViewer.IsVerticalScrollChainingEnabled="True">
+                  ItemsSource="{Binding SelectedFeed.Items}" 
+                  ItemTemplate="{StaticResource FeedItemContentTemplate}"
+                  SelectionMode="None"
+                  IsItemClickEnabled="True"
+                  HorizontalAlignment="Stretch"
+                  HorizontalContentAlignment="Stretch"
+                  ScrollViewer.IsVerticalScrollChainingEnabled="True"
+                  w1809:ScrollViewer.CanContentRenderOutsideBounds="True">
             <ListView.Resources>
                 <SolidColorBrush Color="Transparent" x:Key="ListViewItemRevealBackground"/>
                 <SolidColorBrush Color="Transparent" x:Key="ListViewItemBackgroundPointerOver"/>
@@ -41,7 +43,6 @@
                 <Grid x:Name="ProfileContainer"
                       extensions:Hairline.BorderThickness="0,0,0,1"
                       BorderBrush="{StaticResource SystemControlRevealSeparatorBrush}"
-                      Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
                       SizeChanged="Page_SizeChanged">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
@@ -54,6 +55,16 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
+                    <Border Canvas.ZIndex="-1"
+                            Grid.ColumnSpan="2"
+                            Grid.RowSpan="3"
+                            Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"/>
+
+                    <Border Canvas.ZIndex="-1"
+                            Grid.ColumnSpan="2"
+                            Grid.Row="4"
+                            Background="{ThemeResource SystemControlChromeMediumAcrylicElementMediumBrush}"/>
+
                     <Grid x:Name="HeaderGrid"
                           Grid.ColumnSpan="2"
                           Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}">