diff --git a/MCTG/Views/ContainerBase.xaml b/MCTG/Views/ContainerBase.xaml
index 0c862d7..651d6b1 100644
--- a/MCTG/Views/ContainerBase.xaml
+++ b/MCTG/Views/ContainerBase.xaml
@@ -13,10 +13,15 @@
MinimumHeightRequest="80"
VerticalOptions="StartAndExpand"/>
-
+ HorizontalOptions="StartAndExpand">
+
+
+
+
(View)GetValue(MyContentProperty);
set => SetValue(MyContentProperty, value);
}
+
+ public static readonly BindableProperty MyFlyoutContentProperty =
+ BindableProperty.Create("MyFlyoutContent", typeof(View), typeof(ContainerBase), new Grid());
+
+ public View MyFlyoutContent
+ {
+ get => (View)GetValue(MyFlyoutContentProperty);
+ set => SetValue(MyFlyoutContentProperty, value);
+ }
}
diff --git a/MCTG/Views/CustomFlyout.xaml b/MCTG/Views/ContainerFlyout.xaml
similarity index 51%
rename from MCTG/Views/CustomFlyout.xaml
rename to MCTG/Views/ContainerFlyout.xaml
index 36b747d..2bfa4c0 100644
--- a/MCTG/Views/CustomFlyout.xaml
+++ b/MCTG/Views/ContainerFlyout.xaml
@@ -1,7 +1,9 @@
@@ -14,30 +16,21 @@
BorderWidth="5" BorderColor="Black"
IsEnabled="False"/>
+ Style="{StaticResource button2}"/>
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Style="{StaticResource button2}"
+ IsVisible="False"/>
diff --git a/MCTG/Views/ContainerFlyout.xaml.cs b/MCTG/Views/ContainerFlyout.xaml.cs
new file mode 100644
index 0000000..19f60ff
--- /dev/null
+++ b/MCTG/Views/ContainerFlyout.xaml.cs
@@ -0,0 +1,18 @@
+namespace Views;
+
+public partial class ContainerFlyout : ContentView
+{
+ public ContainerFlyout()
+ {
+ InitializeComponent();
+ }
+
+ public static readonly BindableProperty MyFlyoutContentProperty =
+ BindableProperty.Create("MyFlyoutContent", typeof(View), typeof(ContainerFlyout), new Grid());
+
+ public View MyFlyoutContent
+ {
+ get => (View)GetValue(MyFlyoutContentProperty);
+ set => SetValue(MyFlyoutContentProperty, value);
+ }
+}
\ No newline at end of file
diff --git a/MCTG/Views/CustomFlyout.xaml.cs b/MCTG/Views/CustomFlyout.xaml.cs
deleted file mode 100644
index 5efde09..0000000
--- a/MCTG/Views/CustomFlyout.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Views;
-
-public partial class CustomFlyout : ContentView
-{
- public CustomFlyout()
- {
- InitializeComponent();
- }
-}
\ No newline at end of file
diff --git a/MCTG/Views/CustomHeader.xaml b/MCTG/Views/CustomHeader.xaml
index 962178c..92a2af0 100644
--- a/MCTG/Views/CustomHeader.xaml
+++ b/MCTG/Views/CustomHeader.xaml
@@ -7,7 +7,7 @@
diff --git a/MCTG/Views/Home.xaml b/MCTG/Views/Home.xaml
index becfa2c..4bc96ed 100644
--- a/MCTG/Views/Home.xaml
+++ b/MCTG/Views/Home.xaml
@@ -6,14 +6,34 @@
x:Class="Views.Home">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
diff --git a/MCTG/Views/Resources/Styles/Colors.xaml b/MCTG/Views/Resources/Styles/Colors.xaml
index 399fb52..0c04d0f 100644
--- a/MCTG/Views/Resources/Styles/Colors.xaml
+++ b/MCTG/Views/Resources/Styles/Colors.xaml
@@ -5,9 +5,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
#7d9e9f
- #e7caaf
+ #ffddbd
#d9b08c
- #d9b08c
White
Black
#E1E1E1
diff --git a/MCTG/Views/Resources/Styles/Styles.xaml b/MCTG/Views/Resources/Styles/Styles.xaml
index 25327bc..fe5821b 100644
--- a/MCTG/Views/Resources/Styles/Styles.xaml
+++ b/MCTG/Views/Resources/Styles/Styles.xaml
@@ -15,9 +15,18 @@
+
+
diff --git a/MCTG/Views/Views.csproj b/MCTG/Views/Views.csproj
index 36cc77a..04b3231 100644
--- a/MCTG/Views/Views.csproj
+++ b/MCTG/Views/Views.csproj
@@ -48,6 +48,14 @@
+
+
+
+
+
+
+
+
@@ -66,7 +74,7 @@
MSBuild:Compile
-
+
MSBuild:Compile