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

Added the side boxes with different text, they will have to become seperate...

Added the side boxes with different text, they will have to become seperate components though (or children).
parent 10adbe94
No related branches found
No related tags found
1 merge request!1App now has a basic structure and BLE support
......@@ -62,14 +62,39 @@ stacklayout > image {
}
.sideBox {
background-color: lightgray; /* Change to your preferred background color */
border: 1px solid black; /* Optional: adds a border */
padding: 20px; /* Space inside the box */
margin: auto; /* Centers the box horizontally */
width: 150px; /* Fixed width, adjust as needed */
height: 100px; /* Fixed height, adjust as needed */
display: flex; /* Enables flexbox for centering content */
justify-content: center; /* Centers content horizontally */
align-items: center; /* Centers content vertically */
border-radius: 8px; /* Optional: rounded corners */
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: #647687;
padding: 10 5;
}
.side-box-header-text {
color: #FFFFFF;
font-size: 16;
}
.side-box-content {
background-color: #E8EDF1;
padding: 10;
height: 200;
}
.side-box-content Label {
margin: 0;
padding: 0;
}
.side-box-vertical-stack {
spacing: 0;
}
\ No newline at end of file
......@@ -57,5 +57,8 @@
<MauiXaml Update="Views\ConnectionPage.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\SideBox.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
</Project>
......@@ -18,6 +18,9 @@
<MauiXaml Update="Views\ConnectionPage.xaml">
<SubType>Designer</SubType>
</MauiXaml>
<MauiXaml Update="Views\SideBox.xaml">
<SubType>Designer</SubType>
</MauiXaml>
</ItemGroup>
<ItemGroup>
<None Update="Platforms\Windows\Package.appxmanifest">
......
......@@ -44,8 +44,8 @@ namespace RobobinApp.ViewModels
public const string SendReceiveServiceUUID = "00000001-710e-4a5b-8d75-3e5b444bc3cf";
public const string rxUUID = "00000002-710e-4a5b-8d75-3e5b444bc3cf";
public const string wxUUID = "00000003-710e-4a5b-8d75-3e5b444bc3cf";
public const string readCharacteristicName = "CPU Temperature";
public const string writeCharacteristicName = "Temperature Units (F or C)";
public const string readCharacteristicName = "SSID List";
public const string writeCharacteristicName = "SSID name and password";
public string tempUnit = "C";
......@@ -166,10 +166,10 @@ namespace RobobinApp.ViewModels
//Delay 5 seconds
await Task.Delay(2500);
//var networks = await ReadOperationAsync();
var networks = "Network1\nNetwork2\nNetwork3"; // For testing
var networks = await ReadOperationAsync();
//var networks = "Network1\nNetwork2\nNetwork3"; // For testing
Debug.WriteLine(networks);
var delimiter = "\n";
var delimiter = '\n'; //Test to see if actual SSID has \n, see if it breaks things
var networkList = networks.Split(delimiter);
var addedSsids = new HashSet<string>();
......@@ -396,7 +396,7 @@ namespace RobobinApp.ViewModels
{
WriteCharacteristic = characteristic;
const string command = "SCAN";
await WriteOperationAsync(command);
//await WriteOperationAsync(command);
ScanForWifiNetworks();
}
......
<?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.Views.LeftBox"
BackgroundColor="Lavender">
<VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center">
<Label BackgroundColor="Black">Test</Label>
<Label BackgroundColor="Black">Test</Label>
</VerticalStackLayout>
</ContentView>
using Microsoft.Maui.Controls;
namespace RobobinApp.Views
{
public partial class LeftBox : ContentView
{
public LeftBox()
{
InitializeComponent();
}
}
}
......@@ -19,11 +19,6 @@
</ResourceDictionary>
</ContentPage.Resources>
<ContentPage.MenuBarItems>
<MenuBarItem Text="Admin">
<MenuFlyoutItem Text="Connect to Robobin" Command="{Binding ConnectToRobobinCommand}" />
</MenuBarItem>
</ContentPage.MenuBarItems>
<Grid VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
<Grid.RowDefinitions>
......@@ -35,24 +30,38 @@
<ColumnDefinition Width="1*" />
</Grid.ColumnDefinitions>
<Frame StyleClass="sideFrame"
<VerticalStackLayout StyleClass="sideFrame"
HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
Grid.Column="0" Grid.Row="0">
<HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End">
<Button Text="Admin" HorizontalOptions="Start" VerticalOptions="Start" Command="{Binding ConnectToRobobinCommand}"/>
<Button Text="Setup" HorizontalOptions="Start" VerticalOptions="Start" Command="{Binding ConnectToRobobinCommand}"/>
</HorizontalStackLayout>
<Button Text="Right Box" HorizontalOptions="Center" VerticalOptions="Center" Command="{Binding ConnectToRobobinCommand}"/>
</Frame>
<local:SideBox Grid.Column="0" Grid.Row="0" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" />
<local:SideBox Grid.Column="0" Grid.Row="1" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HeaderTitle= "Status:" />
</VerticalStackLayout>
<Frame StyleClass="mainFrame"
HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
Grid.Column="1" Grid.Row="0">
<Label Text="{Binding StatusMessage}" HorizontalOptions="Center" VerticalOptions="Center"/>
</Frame>
<Frame StyleClass="sideFrame"
<VerticalStackLayout StyleClass="sideFrame"
HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand"
Grid.Column="2" Grid.Row="0">
<Button Text="Right Box" HorizontalOptions="Center" VerticalOptions="Center" Command="{Binding ConnectToRobobinCommand}"/>
</Frame>
<HorizontalStackLayout HorizontalOptions="Start" VerticalOptions="End">
<Button Text="Info" HorizontalOptions="Start" VerticalOptions="Start" />
</HorizontalStackLayout>
<local:SideBox Grid.Column="0" Grid.Row="0" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HeaderTitle= "Mode:" />
<local:SideBox Grid.Column="0" Grid.Row="1" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HeaderTitle= "Admin:" />
</VerticalStackLayout>
</Grid>
</ContentPage>
<?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.Views.SideBox"
StyleClass="SideBox">
<Frame StyleClass="side-box-frame">
<VerticalStackLayout>
<Grid StyleClass="side-box-header">
<Label x:Name="HeaderText"
Text="Queue Position:"
StyleClass="side-box-header-text"/>
</Grid>
<Grid StyleClass="side-box-content">
<ContentPresenter />
</Grid>
</VerticalStackLayout>
</Frame>
</ContentView>
\ No newline at end of file
namespace RobobinApp.Views
{
public partial class SideBox : ContentView
{
public static readonly BindableProperty HeaderTitleProperty =
BindableProperty.Create(nameof(HeaderTitle),
typeof(string),
typeof(SideBox),
defaultValue: "Queue Position:",
propertyChanged: OnHeaderTitleChanged);
public string HeaderTitle
{
get => (string)GetValue(HeaderTitleProperty);
set => SetValue(HeaderTitleProperty, value);
}
public SideBox()
{
InitializeComponent();
}
protected static void OnHeaderTitleChanged(BindableObject bindable, object oldValue, object newValue)
{
var control = (SideBox)bindable;
if (control.HeaderText != null)
{
control.HeaderText.Text = newValue?.ToString();
}
}
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment