From 0fb18d655fdba0be85eb051e61c88bd6d5ad2283 Mon Sep 17 00:00:00 2001
From: Paul-Winpenny <92634321+Paul-Winpenny@users.noreply.github.com>
Date: Mon, 14 Oct 2024 15:26:26 +0100
Subject: [PATCH] Began layout, added admin button. Custom component
(hopefully) won't be too bad.
---
App/RobobinApp/AppShell.xaml | 1 -
App/RobobinApp/LeftBox.xaml | 12 +
App/RobobinApp/LeftBox.xaml.cs | 12 +
App/RobobinApp/MainPage.xaml | 83 ++--
App/RobobinApp/MainPage.xaml.cs | 38 +-
.../Resources/Styles/DarkTheme.xaml | 16 -
.../Resources/Styles/LightTheme.xaml | 22 -
App/RobobinApp/Resources/Styles/Styles.xaml | 434 +-----------------
App/RobobinApp/RobobinApp.csproj | 11 +-
App/RobobinApp/RobobinApp.csproj.user | 5 +
10 files changed, 122 insertions(+), 512 deletions(-)
create mode 100644 App/RobobinApp/LeftBox.xaml
create mode 100644 App/RobobinApp/LeftBox.xaml.cs
delete mode 100644 App/RobobinApp/Resources/Styles/DarkTheme.xaml
delete mode 100644 App/RobobinApp/Resources/Styles/LightTheme.xaml
diff --git a/App/RobobinApp/AppShell.xaml b/App/RobobinApp/AppShell.xaml
index d2f45e8f..2785781b 100644
--- a/App/RobobinApp/AppShell.xaml
+++ b/App/RobobinApp/AppShell.xaml
@@ -4,7 +4,6 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:RobobinApp"
- Shell.FlyoutBehavior="Disabled"
Title="RobobinApp">
<ShellContent
diff --git a/App/RobobinApp/LeftBox.xaml b/App/RobobinApp/LeftBox.xaml
new file mode 100644
index 00000000..bd9a8a54
--- /dev/null
+++ b/App/RobobinApp/LeftBox.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+ x:Class="RobobinApp.LeftBox"
+ BackgroundColor="Lavender">
+ <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
+ <Label BackgroundColor="Black">Test</Label>
+
+ <Label BackgroundColor="Black">Test</Label>
+
+ </VerticalStackLayout>
+</ContentView>
diff --git a/App/RobobinApp/LeftBox.xaml.cs b/App/RobobinApp/LeftBox.xaml.cs
new file mode 100644
index 00000000..cbc9a908
--- /dev/null
+++ b/App/RobobinApp/LeftBox.xaml.cs
@@ -0,0 +1,12 @@
+using Microsoft.Maui.Controls;
+
+namespace RobobinApp
+{
+ public partial class LeftBox : ContentView
+ {
+ public LeftBox()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/App/RobobinApp/MainPage.xaml b/App/RobobinApp/MainPage.xaml
index 551d6503..5ca20cb2 100644
--- a/App/RobobinApp/MainPage.xaml
+++ b/App/RobobinApp/MainPage.xaml
@@ -1,36 +1,57 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
- x:Class="RobobinApp.MainPage">
-
- <ScrollView>
- <VerticalStackLayout
- Padding="30,0"
- Spacing="25">
- <Image
- Source="dotnet_bot.png"
- HeightRequest="185"
- Aspect="AspectFit"
- SemanticProperties.Description="dot net bot in a race car number eight" />
-
- <Label
- Text="Hello, World!"
- Style="{StaticResource Headline}"
- SemanticProperties.HeadingLevel="Level1" />
-
- <Label
- Text="Welcome to .NET Multi-platform App UI"
- Style="{StaticResource SubHeadline}"
- SemanticProperties.HeadingLevel="Level2"
- SemanticProperties.Description="Welcome to dot net Multi platform App U I" />
-
- <Button
- x:Name="CounterBtn"
- Text="Click me"
- SemanticProperties.Hint="Counts the number of times you click"
- Clicked="OnCounterClicked"
- HorizontalOptions="Fill" />
- </VerticalStackLayout>
- </ScrollView>
+ xmlns:local="clr-namespace:RobobinApp"
+ x:Class="RobobinApp.MainPage"
+ Title="">
+
+ <ContentPage.Resources>
+ <ResourceDictionary>
+ <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+ </ResourceDictionary>
+ </ContentPage.Resources>
+
+ <ContentPage.MenuBarItems>
+ <MenuBarItem Text="Admin">
+ <MenuFlyoutItem Text="Connect to Robobin" Command="{Binding ConnectToRobobinCommand}" />
+ </MenuBarItem>
+ </ContentPage.MenuBarItems>
+
+ <!-- Main grid that holds all elements -->
+ <Grid VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="*"/>
+ <!-- Only one row filling the available height -->
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="1*" />
+ <!-- Left box -->
+ <ColumnDefinition Width="2*" />
+ <!-- Center box (bigger) -->
+ <ColumnDefinition Width="1*" />
+ <!-- Right box -->
+ </Grid.ColumnDefinitions>
+
+ <!-- Left side box -->
+ <local:LeftBox Grid.Column="0" Grid.Row="0" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" />
+
+
+ <!-- Center (big) box -->
+ <Frame BackgroundColor="White" BorderColor="Black" CornerRadius="5"
+ HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
+ Grid.Column="1" Grid.Row="0">
+ <Label Text="Center Box" HorizontalOptions="Center" VerticalOptions="Center"/>
+ </Frame>
+
+ <!-- Right side box -->
+ <Frame BackgroundColor="Lavender" BorderColor="Black" CornerRadius="5"
+ HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
+ Grid.Column="2" Grid.Row="0">
+ <Label Text="Right Box" HorizontalOptions="Center" VerticalOptions="Center"/>
+ </Frame>
+
+ </Grid>
</ContentPage>
diff --git a/App/RobobinApp/MainPage.xaml.cs b/App/RobobinApp/MainPage.xaml.cs
index a2af1fc4..42688b30 100644
--- a/App/RobobinApp/MainPage.xaml.cs
+++ b/App/RobobinApp/MainPage.xaml.cs
@@ -1,24 +1,26 @@
-namespace RobobinApp;
+using System.Windows.Input;
+using Microsoft.Maui.Controls;
-public partial class MainPage : ContentPage
+namespace RobobinApp
{
- int count = 0;
+ public partial class MainPage : ContentPage
+ {
+ public ICommand ConnectToRobobinCommand { get; }
- public MainPage()
- {
- InitializeComponent();
- }
+ public MainPage()
+ {
+ InitializeComponent();
- private void OnCounterClicked(object sender, EventArgs e)
- {
- count++;
+ // Create the command and assign it to the handler method
+ ConnectToRobobinCommand = new Command(OnConnectToRobobin);
+ BindingContext = this; // Set the BindingContext to the current page
+ }
- if (count == 1)
- CounterBtn.Text = $"Clicked {count} time";
- else
- CounterBtn.Text = $"Clicked {count} times";
-
- SemanticScreenReader.Announce(CounterBtn.Text);
- }
+ // Command handler method
+ private void OnConnectToRobobin()
+ {
+ // Logic to connect to Robobin goes here
+ DisplayAlert("Connection", "Connecting to Robobin...", "OK");
+ }
+ }
}
-
diff --git a/App/RobobinApp/Resources/Styles/DarkTheme.xaml b/App/RobobinApp/Resources/Styles/DarkTheme.xaml
deleted file mode 100644
index 90cbaea2..00000000
--- a/App/RobobinApp/Resources/Styles/DarkTheme.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
- xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
- <Color x:Key="PrimaryColor">#4CAF50</Color>
- <Color x:Key="SecondaryColor">#2196F3</Color>
- <Color x:Key="BackgroundColor">#121212</Color>
- <Color x:Key="TextColor">#FFFFFF</Color>
-
- <Style TargetType="Label">
- <Setter Property="TextColor" Value="{DynamicResource TextColor}"/>
- </Style>
- <Style TargetType="Button">
- <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryColor}"/>
- <Setter Property="TextColor" Value="#FFFFFF"/>
- </Style>
-</ResourceDictionary>
diff --git a/App/RobobinApp/Resources/Styles/LightTheme.xaml b/App/RobobinApp/Resources/Styles/LightTheme.xaml
deleted file mode 100644
index 5460de6c..00000000
--- a/App/RobobinApp/Resources/Styles/LightTheme.xaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
- xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
- <!-- Light Theme Colors -->
- <Color x:Key="PrimaryColor">#4CAF50</Color>
- <!-- Green -->
- <Color x:Key="SecondaryColor">#2196F3</Color>
- <!-- Blue -->
- <Color x:Key="BackgroundColor">#FFFFFF</Color>
- <!-- White -->
- <Color x:Key="TextColor">#000000</Color>
- <!-- Black -->
-
- <!-- Default Styles -->
- <Style TargetType="Label">
- <Setter Property="TextColor" Value="{DynamicResource TextColor}"/>
- </Style>
- <Style TargetType="Button">
- <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryColor}"/>
- <Setter Property="TextColor" Value="#FFFFFF"/>
- </Style>
-</ResourceDictionary>
diff --git a/App/RobobinApp/Resources/Styles/Styles.xaml b/App/RobobinApp/Resources/Styles/Styles.xaml
index d600a7f7..e36989d6 100644
--- a/App/RobobinApp/Resources/Styles/Styles.xaml
+++ b/App/RobobinApp/Resources/Styles/Styles.xaml
@@ -1,427 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?xaml-comp compile="true" ?>
-<ResourceDictionary
- xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
- xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
- <Style TargetType="ActivityIndicator">
- <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
- </Style>
-
- <Style TargetType="IndicatorView">
- <Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}"/>
- <Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}"/>
- </Style>
-
- <Style TargetType="Border">
- <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
- <Setter Property="StrokeShape" Value="Rectangle"/>
- <Setter Property="StrokeThickness" Value="1"/>
- </Style>
-
- <Style TargetType="BoxView">
- <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
- </Style>
-
- <Style TargetType="Button">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}" />
- <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
- <Setter Property="FontFamily" Value="OpenSansRegular"/>
- <Setter Property="FontSize" Value="14"/>
- <Setter Property="BorderWidth" Value="0"/>
- <Setter Property="CornerRadius" Value="8"/>
- <Setter Property="Padding" Value="14,10"/>
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
- <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- <VisualState x:Name="PointerOver" />
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="CheckBox">
- <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="DatePicker">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
- <Setter Property="BackgroundColor" Value="Transparent" />
- <Setter Property="FontFamily" Value="OpenSansRegular"/>
- <Setter Property="FontSize" Value="14"/>
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="Editor">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
- <Setter Property="BackgroundColor" Value="Transparent" />
- <Setter Property="FontFamily" Value="OpenSansRegular"/>
- <Setter Property="FontSize" Value="14" />
- <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="Entry">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
- <Setter Property="BackgroundColor" Value="Transparent" />
- <Setter Property="FontFamily" Value="OpenSansRegular"/>
- <Setter Property="FontSize" Value="14" />
- <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="Frame">
- <Setter Property="HasShadow" Value="False" />
- <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
- <Setter Property="CornerRadius" Value="8" />
- <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
- </Style>
-
- <Style TargetType="ImageButton">
- <Setter Property="Opacity" Value="1" />
- <Setter Property="BorderColor" Value="Transparent"/>
- <Setter Property="BorderWidth" Value="0"/>
- <Setter Property="CornerRadius" Value="0"/>
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="Opacity" Value="0.5" />
- </VisualState.Setters>
- </VisualState>
- <VisualState x:Name="PointerOver" />
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="Label">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
- <Setter Property="BackgroundColor" Value="Transparent" />
- <Setter Property="FontFamily" Value="OpenSansRegular" />
- <Setter Property="FontSize" Value="14" />
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="Span">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
- </Style>
-
- <Style TargetType="Label" x:Key="Headline">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
- <Setter Property="FontSize" Value="32" />
- <Setter Property="HorizontalOptions" Value="Center" />
- <Setter Property="HorizontalTextAlignment" Value="Center" />
- </Style>
-
- <Style TargetType="Label" x:Key="SubHeadline">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
- <Setter Property="FontSize" Value="24" />
- <Setter Property="HorizontalOptions" Value="Center" />
- <Setter Property="HorizontalTextAlignment" Value="Center" />
- </Style>
-
- <Style TargetType="ListView">
- <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
- <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
- </Style>
-
- <Style TargetType="Picker">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
- <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
- <Setter Property="BackgroundColor" Value="Transparent" />
- <Setter Property="FontFamily" Value="OpenSansRegular"/>
- <Setter Property="FontSize" Value="14"/>
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="ProgressBar">
- <Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="RadioButton">
- <Setter Property="BackgroundColor" Value="Transparent"/>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
- <Setter Property="FontFamily" Value="OpenSansRegular"/>
+ <Style x:Key="TopBarButtonStyle" TargetType="Button">
+ <Setter Property="BackgroundColor" Value="#E4E4E4"/>
+ <Setter Property="TextColor" Value="#333333"/>
<Setter Property="FontSize" Value="14"/>
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="RefreshView">
- <Setter Property="RefreshColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
- </Style>
-
- <Style TargetType="SearchBar">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
- <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
- <Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" />
- <Setter Property="BackgroundColor" Value="Transparent" />
- <Setter Property="FontFamily" Value="OpenSansRegular" />
- <Setter Property="FontSize" Value="14" />
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="SearchHandler">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
- <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
- <Setter Property="BackgroundColor" Value="Transparent" />
- <Setter Property="FontFamily" Value="OpenSansRegular" />
- <Setter Property="FontSize" Value="14" />
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="Shadow">
- <Setter Property="Radius" Value="15" />
- <Setter Property="Opacity" Value="0.5" />
- <Setter Property="Brush" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />
- <Setter Property="Offset" Value="10,10" />
- </Style>
-
- <Style TargetType="Slider">
- <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
- <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
- <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
- <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
- <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="SwipeItem">
- <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
- </Style>
-
- <Style TargetType="Switch">
- <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
- <Setter Property="ThumbColor" Value="{StaticResource White}" />
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- <VisualState x:Name="On">
- <VisualState.Setters>
- <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Gray200}}" />
- <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
- </VisualState.Setters>
- </VisualState>
- <VisualState x:Name="Off">
- <VisualState.Setters>
- <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray500}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="TimePicker">
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
- <Setter Property="BackgroundColor" Value="Transparent"/>
- <Setter Property="FontFamily" Value="OpenSansRegular"/>
- <Setter Property="FontSize" Value="14"/>
- <Setter Property="MinimumHeightRequest" Value="44"/>
- <Setter Property="MinimumWidthRequest" Value="44"/>
- <Setter Property="VisualStateManager.VisualStateGroups">
- <VisualStateGroupList>
- <VisualStateGroup x:Name="CommonStates">
- <VisualState x:Name="Normal" />
- <VisualState x:Name="Disabled">
- <VisualState.Setters>
- <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
- </VisualState.Setters>
- </VisualState>
- </VisualStateGroup>
- </VisualStateGroupList>
- </Setter>
- </Style>
-
- <Style TargetType="Page" ApplyToDerivedTypes="True">
- <Setter Property="Padding" Value="0"/>
- <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
- </Style>
-
- <Style TargetType="Shell" ApplyToDerivedTypes="True">
- <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
- <Setter Property="Shell.ForegroundColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
- <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
- <Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
- <Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
- <Setter Property="Shell.NavBarHasShadow" Value="False" />
- <Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
- <Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
- <Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
- <Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
- </Style>
-
- <Style TargetType="NavigationPage">
- <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
- <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
- <Setter Property="IconColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
+ <Setter Property="Padding" Value="10,5"/>
+ <Setter Property="CornerRadius" Value="5"/>
+ <Setter Property="BorderWidth" Value="0.5"/>
+ <Setter Property="BorderColor" Value="#CEC0C0"/>
+ <Setter Property="Margin" Value="5"/>
</Style>
- <Style TargetType="TabbedPage">
- <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray950}}" />
- <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
- <Setter Property="UnselectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
- <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
+ <Style x:Key="TopBarStyle" TargetType="StackLayout">
+ <Setter Property="BackgroundColor" Value="#F0F0F0"/>
+ <Setter Property="Padding" Value="10"/>
</Style>
</ResourceDictionary>
diff --git a/App/RobobinApp/RobobinApp.csproj b/App/RobobinApp/RobobinApp.csproj
index 248127a4..fc923e6d 100644
--- a/App/RobobinApp/RobobinApp.csproj
+++ b/App/RobobinApp/RobobinApp.csproj
@@ -63,10 +63,13 @@
</ItemGroup>
<ItemGroup>
- <MauiXaml Update="Resources\Styles\DarkTheme.xaml">
- <Generator>MSBuild:Compile</Generator>
- </MauiXaml>
- <MauiXaml Update="Resources\Styles\LightTheme.xaml">
+ <Compile Update="LeftBox.xaml.cs">
+ <DependentUpon>LeftBox.xaml</DependentUpon>
+ </Compile>
+ </ItemGroup>
+
+ <ItemGroup>
+ <MauiXaml Update="LeftBox.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
diff --git a/App/RobobinApp/RobobinApp.csproj.user b/App/RobobinApp/RobobinApp.csproj.user
index 7deb51d5..f75ca0bc 100644
--- a/App/RobobinApp/RobobinApp.csproj.user
+++ b/App/RobobinApp/RobobinApp.csproj.user
@@ -5,4 +5,9 @@
<ActiveDebugFramework>net8.0-windows10.0.19041.0</ActiveDebugFramework>
<ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
</PropertyGroup>
+ <ItemGroup>
+ <MauiXaml Update="LeftBox.xaml">
+ <SubType>Designer</SubType>
+ </MauiXaml>
+ </ItemGroup>
</Project>
\ No newline at end of file
--
GitLab