Skip to content
Snippets Groups Projects
Commit f58b5311 authored by Paul-Winpenny's avatar Paul-Winpenny
Browse files

Added additionl styles, fonts and icon

parent 5d577645
Branches
No related tags found
No related merge requests found
...@@ -12,5 +12,19 @@ ...@@ -12,5 +12,19 @@
<StyleSheet Source="/Resources/Styles/appstyle.css" /> <StyleSheet Source="/Resources/Styles/appstyle.css" />
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary>
<Style TargetType="Label">
<Setter Property="FontFamily" Value="Cabal" />
<Setter Property="FontSize" Value="16" />
<Setter Property="TextColor" Value="#E8EDF1" />
<Setter Property="Margin" Value="10" />
</Style>
<Style TargetType="Button">
<Setter Property="FontFamily" Value="Cabal" />
<Setter Property="FontSize" Value="16" />
<Setter Property="TextColor" Value="#E8EDF1" />
<Setter Property="Margin" Value="10" />
</Style>
</ResourceDictionary>
</Application.Resources> </Application.Resources>
</Application> </Application>
...@@ -16,6 +16,8 @@ public static class MauiProgram ...@@ -16,6 +16,8 @@ public static class MauiProgram
{ {
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
// fonts.AddFont("Cabal-w5j3.tff", "Atop");
fonts.AddFont("Cabal-w5j3.tff", "Cabal");
}); });
......
App/RobobinApp/Resources/AppIcon/RobobinLogo.png

19.3 KiB

File added
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<Style x:Key="TopBarButtonStyle" TargetType="Button"> <Style x:Key="TopBarButtonStyle" TargetType="Button">
<Setter Property="BackgroundColor" Value="#E4E4E4"/> <Setter Property="BackgroundColor" Value="#E4E4E4"/>
<Setter Property="TextColor" Value="#333333"/> <Setter Property="TextColor" Value="#333333"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="20"/>
<Setter Property="Padding" Value="10,5"/> <Setter Property="Padding" Value="10,5"/>
<Setter Property="CornerRadius" Value="5"/> <Setter Property="CornerRadius" Value="5"/>
<Setter Property="BorderWidth" Value="0.5"/> <Setter Property="BorderWidth" Value="0.5"/>
......
navigationpage { 
-maui-bar-background-color: lightgray; navigationpage {
-maui-bar-background-color: #647687;
-maui-bar-text-color: #FFFFFF;
} }
^contentpage { ^contentpage {
background-color: lightgray; background-color: #2B333E;
} color: #E8EDF1;
#listView {
background-color: lightgray;
} }
/* Layout Styling */
stacklayout { stacklayout {
margin: 20; margin: 20;
-maui-spacing: 6; -maui-spacing: 6;
...@@ -20,47 +20,84 @@ grid { ...@@ -20,47 +20,84 @@ grid {
column-gap: 6; column-gap: 6;
} }
.mainPageTitle { .mainPageTitle {
font-style: bold; font-style: bold;
font-size: 14; font-size: 18;
color: #E8EDF1;
} }
.mainPageSubtitle { .mainPageSubtitle {
font-size: 16;
color: #A3B4C6;
margin-top: 15; margin-top: 15;
} }
.detailPageTitle { .detailPageTitle {
font-style: bold; font-style: bold;
font-size: 14; font-size: 16;
text-align: center; text-align: center;
color: #E8EDF1;
} }
.detailPageSubtitle { .detailPageSubtitle {
text-align: center; text-align: center;
font-style: italic; font-style: italic;
font-size: 14;
color: #A3B4C6;
}
#listView {
background-color: #2B333E;
separator-color: #A3B4C6;
color: #E8EDF1;
} }
listview image { listview image {
height: 60; height: 60;
width: 60; width: 60;
border-radius: 8;
} }
stacklayout > image { stacklayout > image {
height: 200; height: 200;
width: 200; width: 200;
border-radius: 10;
border-color: #647687;
} }
.mainFrame { .mainFrame {
background-color: White; background-color: white;
border-color: Black; border-color: #647687;
corner-radius: 5; corner-radius: 5;
padding: 15;
} }
.sideFrame { .primaryFrame {
background-color: #2B333E; background-color: #2B333E;
border-color: Black; border-color: #647687;
corner-radius: 8;
padding: 10;
}
.button-primary {
background-color: #647687;
color: #FFFFFF;
padding: 10 5;
corner-radius: 5; corner-radius: 5;
font-style: bold;
}
.button-secondary {
background-color: #A3B4C6;
color: #FFFFFF;
padding: 8 4;
corner-radius: 5;
font-style: bold;
} }
.sideBox { .sideBox {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -88,9 +125,10 @@ stacklayout > image { ...@@ -88,9 +125,10 @@ stacklayout > image {
background-color: #E8EDF1; background-color: #E8EDF1;
padding: 10; padding: 10;
height: 200; height: 200;
color: #2B333E;
} }
.side-box-content Label { .side-box-content label {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
...@@ -98,3 +136,24 @@ stacklayout > image { ...@@ -98,3 +136,24 @@ stacklayout > image {
.side-box-vertical-stack { .side-box-vertical-stack {
spacing: 0; spacing: 0;
} }
.card {
background-color: #2B333E;
border-color: #647687;
corner-radius: 8;
padding: 15;
}
.card-header {
background-color: #647687;
padding: 10 5;
font-size: 16;
font-style: bold;
color: #FFFFFF;
}
.card-content {
background-color: #E8EDF1;
padding: 10;
}
/* Navigation and Page Backgrounds */
navigationpage {
-maui-bar-background-color: #D5006D; /* Bright pink accent */
-maui-bar-text-color: #FFFFFF; /* White text for contrast */
}
^contentpage {
background-color: #FCE4EC; /* Light pink background */
color: #880E4F; /* Darker pink for text */
}
/* Layout Styling */
stacklayout {
margin: 20;
-maui-spacing: 6;
}
grid {
row-gap: 6;
column-gap: 6;
}
/* Title and Subtitle Styling */
.mainPageTitle {
font-style: bold;
font-size: 18; /* Increased for main titles */
color: #880E4F; /* Darker pink for visibility */
}
.mainPageSubtitle {
font-size: 16;
color: #AD1457; /* Medium pink */
margin-top: 15;
}
.detailPageTitle {
font-style: bold;
font-size: 16;
text-align: center;
color: #880E4F; /* Darker pink */
}
.detailPageSubtitle {
text-align: center;
font-style: italic;
font-size: 14;
color: #AD1457; /* Medium pink */
}
/* ListView and Image Styling */
#listView {
background-color: #FCE4EC; /* Match background */
separator-color: #AD1457; /* Medium pink separator */
color: #880E4F; /* Darker pink for text */
}
listview image {
height: 60;
width: 60;
border-radius: 8; /* Rounded corners for consistency */
}
stacklayout > image {
height: 200;
width: 200;
border-radius: 10;
border-color: #D5006D; /* Bright pink for image border */
}
/* Frame Styling */
.mainFrame {
background-color: white; /* Keep it white for contrast */
border-color: #D5006D; /* Bright pink border */
corner-radius: 5;
padding: 15;
}
.primaryFrame {
background-color: #FCE4EC; /* Light pink for cohesive look */
border-color: #D5006D; /* Bright pink border */
corner-radius: 8;
padding: 10;
}
/* Button Styling */
.button-primary {
background-color: #D5006D; /* Bright pink */
color: #FFFFFF; /* White text */
padding: 10 5;
corner-radius: 5;
font-style: bold;
}
.button-secondary {
background-color: #F8BBD0; /* Lighter pink accent */
color: #FFFFFF; /* White text */
padding: 8 4;
corner-radius: 5;
font-style: bold;
}
/* SideBox Styling */
.sideBox {
margin: 0;
padding: 0;
}
.side-box-frame {
margin: 10;
padding: 0;
background-color: transparent;
border-color: transparent;
horizontal-options: fill-and-expand;
}
.side-box-header {
background-color: #D5006D; /* Bright pink for header */
padding: 10 5;
}
.side-box-header-text {
color: #FFFFFF; /* White text */
font-size: 16;
}
.side-box-content {
background-color: #FCE4EC; /* Light pink */
padding: 10;
height: 200;
color: #880E4F; /* Darker pink for readability */
}
.side-box-content label {
margin: 0;
padding: 0;
}
.side-box-vertical-stack {
spacing: 0;
}
/* Card Styling */
.card {
background-color: #FCE4EC; /* Light pink */
border-color: #D5006D; /* Bright pink */
corner-radius: 8
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" /> <MauiIcon Include="Resources\AppIcon\robobinlogo.png"/>
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" /> <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
<MauiImage Include="Resources\Images\*" /> <MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" /> <MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
......
...@@ -2,34 +2,12 @@ ...@@ -2,34 +2,12 @@
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="RobobinApp.Views.ConnectionPage" x:Class="RobobinApp.Views.ConnectionPage"
Title="Connect to Robobin"> Title="Connect to Robobin"
BackgroundColor="#2B333E">
<!-- Apply the CSS stylesheet -->
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>
<Style x:Key="HeaderLabelStyle" TargetType="Label"> <StyleSheet Source="/Resources/Styles/appstyle.css" />
<Setter Property="FontSize" Value="Medium" />
<Setter Property="TextColor" Value="DarkSlateBlue" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="VerticalOptions" Value="Start" />
</Style>
<Style x:Key="ButtonStyle" TargetType="Button">
<Setter Property="BackgroundColor" Value="LightBlue" />
<Setter Property="TextColor" Value="White" />
<Setter Property="Padding" Value="10,5" />
<Setter Property="CornerRadius" Value="5" />
<Setter Property="FontAttributes" Value="Bold" />
</Style>
<Style x:Key="ListViewStyle" TargetType="ListView">
<Setter Property="BackgroundColor" Value="White" />
<Setter Property="SeparatorVisibility" Value="Default" />
<Setter Property="SeparatorColor" Value="LightGray" />
<Setter Property="SelectedItem" Value="Blue" />
<Setter Property="VerticalScrollBarVisibility" Value="Always"/>
</Style>
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
...@@ -40,18 +18,18 @@ ...@@ -40,18 +18,18 @@
</ContentPage.MenuBarItems> </ContentPage.MenuBarItems>
<StackLayout Padding="20"> <StackLayout Padding="20">
<StackLayout IsVisible="{Binding IsBluetoothDeviceSelectionVisible}">
<Label Text="Select a Bluetooth Device" <!-- Bluetooth Device Selection Stack -->
FontSize="Medium" <StackLayout StyleClass="mainBox" IsVisible="{Binding IsBluetoothDeviceSelectionVisible}">
HorizontalOptions="Center" <Label StyleClass="mainPageSubtitle" HorizontalOptions="CenterAndExpand" Text="Select a Bluetooth Device" />
VerticalOptions="Start" />
<ListView x:Name="DeviceListView" <ListView x:Name="DeviceListView"
StyleClass="listView"
ItemsSource="{Binding BluetoothDevices}" ItemsSource="{Binding BluetoothDevices}"
SelectedItem="{Binding SelectedDevice}" SelectedItem="{Binding SelectedDevice}"
VerticalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
ItemTapped="DeviceListView_ItemTapped"> ItemTapped="DeviceListView_ItemTapped"
HorizontalOptions="CenterAndExpand">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextCell Text="{Binding Name}" /> <TextCell Text="{Binding Name}" />
...@@ -62,39 +40,35 @@ ...@@ -62,39 +40,35 @@
<Button Text="{Binding ConnectButtonText}" <Button Text="{Binding ConnectButtonText}"
Command="{Binding ConnectCommand}" Command="{Binding ConnectCommand}"
IsEnabled="{Binding SelectedDevice, Converter={StaticResource NullToBooleanConverter}}" IsEnabled="{Binding SelectedDevice, Converter={StaticResource NullToBooleanConverter}}"
HorizontalOptions="Center" StyleClass="button-primary"
VerticalOptions="End" /> HorizontalOptions="Center" />
</StackLayout> </StackLayout>
<StackLayout IsVisible="{Binding IsWifiNetworkSelectionVisible}"> <!-- WiFi Network Selection Stack -->
<Grid Padding="10" HorizontalOptions="FillAndExpand"> <StackLayout StyleClass="mainBox" IsVisible="{Binding IsWifiNetworkSelectionVisible}">
<Grid Padding="10" HorizontalOptions="CenterAndExpand" StyleClass="primaryFrame">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Text="{Binding SelectedDevice.Name}" <Label Text="{Binding SelectedDevice.Name}"
FontSize="Medium" StyleClass="mainPageTitle"
HorizontalOptions="Start"
VerticalOptions="Center"
Grid.Column="0" /> Grid.Column="0" />
<Button Text="Disconnect" <Button Text="Disconnect"
Command="{Binding DisconnectCommand}" Command="{Binding DisconnectCommand}"
HorizontalOptions="End" StyleClass="button-primary"
VerticalOptions="Center"
Grid.Column="1" /> Grid.Column="1" />
</Grid> </Grid>
<Label Text="Select a WiFi Network" <Label StyleClass="mainPageSubtitle" Text="Select a WiFi Network" />
FontSize="Medium"
HorizontalOptions="Center"
VerticalOptions="Start" />
<ListView x:Name="WifiListView" <ListView x:Name="WifiListView"
ItemsSource="{Binding WifiNetworks}" ItemsSource="{Binding WifiNetworks}"
SelectedItem="{Binding SelectedWifiNetwork}" SelectedItem="{Binding SelectedWifiNetwork}"
VerticalOptions="FillAndExpand"> VerticalOptions="FillAndExpand"
HorizontalOptions="CenterAndExpand">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextCell Text="{Binding SSID}" /> <TextCell Text="{Binding SSID}" />
...@@ -102,41 +76,31 @@ ...@@ -102,41 +76,31 @@
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
<StackLayout Padding="10" <!-- Password Entry for WiFi -->
BackgroundColor="LightGray" <StackLayout StyleClass="side-box-content">
HorizontalOptions="FillAndExpand" <Label StyleClass="side-box-header-text" Text="Password:" />
VerticalOptions="Start">
<Label Text="Password:"
FontSize="Medium"
HorizontalOptions="Start" />
<Entry x:Name="PasswordEntry" <Entry x:Name="PasswordEntry"
Placeholder="Enter Password" Placeholder="Enter Password"
Text="{Binding Password}" Text="{Binding Password}"
IsPassword="True" IsPassword="True"
HorizontalOptions="Fill" /> HorizontalOptions="Fill" />
<Button Text="Send WiFi Information" <Button Text="Send WiFi Information"
Command="{Binding SendWifiInfoCommand}" Command="{Binding SendWifiInfoCommand}"
HorizontalOptions="Center" StyleClass="button-primary"
VerticalOptions="End" /> HorizontalOptions="Center" />
</StackLayout> </StackLayout>
</StackLayout> </StackLayout>
<StackLayout Padding="10"
BackgroundColor="Black" <!-- Admin Panel Section -->
HorizontalOptions="FillAndExpand" <StackLayout StyleClass="sideFrame" Padding="10">
VerticalOptions="Start"> <Label StyleClass="side-box-header-text" Text="Admin Panel:" />
<Label Text="Admin Panel:"
FontSize="Medium"
HorizontalOptions="Start" />
<Button Text="Test Read Operation" <Button Text="Test Read Operation"
Command="{Binding TestReadOperation}" Command="{Binding TestReadOperation}"
HorizontalOptions="Center" StyleClass="button-primary" />
VerticalOptions="End" />
<Button Text="Test Write Operation" <Button Text="Test Write Operation"
Command="{Binding TestWriteOperation}" Command="{Binding TestWriteOperation}"
HorizontalOptions="Center" StyleClass="button-primary" />
VerticalOptions="End" />
</StackLayout> </StackLayout>
</StackLayout> </StackLayout>
</ContentPage> </ContentPage>
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary Source="../Resources/Styles/Styles.xaml" />
<StyleSheet Source="/Resources/Styles/appstyle.css" /> <StyleSheet Source="/Resources/Styles/appstyle.css" />
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment