update

LM-Kit · Nov 23, 2024 · eeace0f · eeace0f
1 parent 317a41f
commit eeace0f
Show file tree

Hide file tree

Showing 9 changed files with 136 additions and 133 deletions.
diff --git a/LM-Kit-Maestro/AppConstants.cs b/LM-Kit-Maestro/AppConstants.cs
@@ -28,12 +28,10 @@ internal static class AppConstants
 
     public const double AlertPopupWidth = 400;
 
-    public const double TabBarHeight = 64;
+    public const double TabBarHeight = 48;
 
     public const double PageTopBarHeight = 64;
 
-    public const double ChatPageTopBarHeight = TabBarHeight + 64 - 8;
-
     public const double ModelSelectionButtonMaxWidth = 568;
 
     public const double MinimizedHeaderButtonWidth = ChatWindowLayoutMinimumWidth - (16 * 2);

diff --git a/LM-Kit-Maestro/AppShell.xaml b/LM-Kit-Maestro/AppShell.xaml
@@ -54,10 +54,9 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-            <!--<BoxView Grid.RowSpan="" HeightRequest="1" VerticalOptions="Start"/>-->
-            <!--<BoxView Grid.RowSpan="3" HeightRequest="1" VerticalOptions="End"/>-->
 
-            <Grid BackgroundColor="Transparent">
+            <Grid BackgroundColor="{StaticResource Primary}"/>
+            <Border StrokeThickness="0" BackgroundColor="{StaticResource Surface}" Stroke="Transparent" StrokeShape="RoundRectangle 4 4 0 0" ZIndex="1">
                 <Grid Padding="12, 0">
                     <HorizontalStackLayout
                         VerticalOptions="Center"
@@ -85,7 +84,7 @@
                         </BindableLayout.ItemTemplate>
                     </HorizontalStackLayout>
                 </Grid>
-            </Grid>
+            </Border>
 
             <shell:SimpleNavigationHost Grid.Row="1"/>
         </Grid>

diff --git a/LM-Kit-Maestro/UI/ChatConversationsView.xaml.cs b/LM-Kit-Maestro/UI/ChatConversationsView.xaml.cs
@@ -78,7 +78,7 @@ private async void OnConversationListItemShowMoreClicked(object? sender, EventAr
             ChatConversationActionPopupViewModel chatConversationActionPopupViewModel = new ChatConversationActionPopupViewModel()
             {
                 ConversationX = collectionView.ScrollX + conversationItem.Width,
-                ConversationY = conversationItem.Y - collectionView.ScrollY + conversationItem.Height + AppConstants.ChatPageTopBarHeight,
+                ConversationY = conversationItem.Y - collectionView.ScrollY + conversationItem.Height + AppConstants.TabBarHeight + AppConstants.PageTopBarHeight,
                 ConversationItemHeight = conversationItem.Height,
                 ConversationListHeight = Height
             };

diff --git a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml.cs b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml.cs
@@ -5,7 +5,7 @@ namespace LMKit.Maestro.UI;
 public partial class ChatPage : PageBase
 {
     private const int SidebarAnimationLength = 100;
-    public static readonly Thickness ChatViewMargin = new Thickness(AppConstants.HeaderHorizontalMargin, AppConstants.ChatPageHeaderHeight, AppConstants.PageTopBarHeight, 0);
+    public static readonly Thickness ChatViewMargin = new Thickness(AppConstants.HeaderHorizontalMargin, AppConstants.PageTopBarHeight + AppConstants.TabBarHeight, AppConstants.HeaderHorizontalMargin, 0);
 
     private readonly ChatPageViewModel _chatViewModel;
 

diff --git a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml
diff --git a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml.cs b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml.cs
@@ -4,7 +4,7 @@
 
 namespace LMKit.Maestro.UI;
 
-public partial class ModelsPage : ContentPage
+public partial class ModelsPage : PageBase
 {
     private readonly ModelsPageViewModel _modelsPageViewModel;
 

diff --git a/LM-Kit-Maestro/UI/Pages/PageBase.xaml b/LM-Kit-Maestro/UI/Pages/PageBase.xaml
@@ -6,13 +6,16 @@
              Title="PageBase"
              x:Name="pageBase"
              >
-    <Grid RowDefinitions="auto, *">
+    <Grid RowDefinitions="auto, 1, *">
+        <Border StrokeThickness="0" BackgroundColor="{StaticResource Surface}" Stroke="Transparent" StrokeShape="RoundRectangle 0 0 0 0" ZIndex="1">
+            <ContentView 
+                HeightRequest="{x:Static local:AppConstants.PageTopBarHeight}"
+                Content="{Binding Source={x:Reference pageBase}, Path=Header}"/>
+        </Border>
+
+        <BoxView Grid.Row="1" />
         <ContentView 
-            BackgroundColor="Red"
-            HeightRequest="{x:Static local:AppConstants.PageTopBarHeight}"
-            Content="{Binding Source={x:Reference pageBase}, Path=Header}"/>
-        <ContentView 
-            Grid.Row="1"
+            Grid.Row="2"
             Content="{Binding Source={x:Reference pageBase}, Path=Body}"/>
     </Grid>
 </ContentPage>
diff --git a/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml.cs b/LM-Kit-Maestro/UI/Popups/ChatConversationActionPopup.xaml.cs
@@ -35,7 +35,7 @@ private async void OnDeleteClicked(object sender, EventArgs e)
     private void OnPopupContentSizeChanged(object sender, EventArgs e)
     {
         var popupBottom = popupContentGrid.Height + _chatConversationActionPopupViewModel.ConversationY;
-        var pageBottom = _chatConversationActionPopupViewModel.ConversationListHeight + AppConstants.ChatPageTopBarHeight;
+        var pageBottom = _chatConversationActionPopupViewModel.ConversationListHeight + AppConstants.PageTopBarHeight + AppConstants.TabBarHeight;
 
         if (popupBottom > pageBottom)
         {

diff --git a/LM-Kit-Maestro/UI/TopBarScaffold.xaml b/LM-Kit-Maestro/UI/TopBarScaffold.xaml
@@ -10,7 +10,7 @@
     xmlns:vm="clr-namespace:LMKit.Maestro.ViewModels"
     x:Class="LMKit.Maestro.UI.TopBarScaffold">
     <Grid 
-        HeightRequest="{x:Static local:AppConstants.ChatPageTopBarHeight}"
+        HeightRequest="128"
         BackgroundColor="{StaticResource Surface}">
     </Grid>
 </ContentView>