diff --git a/critterfolio/CritterFolio/CritterFolio.Android/Icon.png b/critterfolio/CritterFolio/CritterFolio.Android/Icon.png
index 3c39845..6bb4ac3 100644
Binary files a/critterfolio/CritterFolio/CritterFolio.Android/Icon.png and b/critterfolio/CritterFolio/CritterFolio.Android/Icon.png differ
diff --git a/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable-night-v31/avalonia_anim.xml b/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable-night-v31/avalonia_anim.xml
deleted file mode 100644
index dde4b5a..0000000
--- a/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable-night-v31/avalonia_anim.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable-v31/avalonia_anim.xml b/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable-v31/avalonia_anim.xml
deleted file mode 100644
index 94f27d9..0000000
--- a/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable-v31/avalonia_anim.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable/icon.png b/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable/icon.png
new file mode 100644
index 0000000..6bb4ac3
Binary files /dev/null and b/critterfolio/CritterFolio/CritterFolio.Android/Resources/drawable/icon.png differ
diff --git a/critterfolio/CritterFolio/CritterFolio.Android/Resources/values-night/colors.xml b/critterfolio/CritterFolio/CritterFolio.Android/Resources/values-night/colors.xml
deleted file mode 100644
index 3d47b6f..0000000
--- a/critterfolio/CritterFolio/CritterFolio.Android/Resources/values-night/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- #212121
-
diff --git a/critterfolio/CritterFolio/CritterFolio.Android/Resources/values-v31/styles.xml b/critterfolio/CritterFolio/CritterFolio.Android/Resources/values-v31/styles.xml
deleted file mode 100644
index d5ecec4..0000000
--- a/critterfolio/CritterFolio/CritterFolio.Android/Resources/values-v31/styles.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/critterfolio/CritterFolio/CritterFolio/App.axaml b/critterfolio/CritterFolio/CritterFolio/App.axaml
index b4fb835..298208b 100644
--- a/critterfolio/CritterFolio/CritterFolio/App.axaml
+++ b/critterfolio/CritterFolio/CritterFolio/App.axaml
@@ -11,5 +11,15 @@
+
+
+
+ /Assets/Fonts/Phosphor.ttf#Phosphor
+ /Assets/Fonts/Phosphor-Fill.ttf#Phosphor-Fill
+
+ #1a1a1a
+ #FAFAFA
+ #26309b
+
\ No newline at end of file
diff --git a/critterfolio/CritterFolio/CritterFolio/Assets/Fonts/Phosphor-Fill.ttf b/critterfolio/CritterFolio/CritterFolio/Assets/Fonts/Phosphor-Fill.ttf
new file mode 100644
index 0000000..b02c4cb
Binary files /dev/null and b/critterfolio/CritterFolio/CritterFolio/Assets/Fonts/Phosphor-Fill.ttf differ
diff --git a/critterfolio/CritterFolio/CritterFolio/Assets/Fonts/Phosphor.ttf b/critterfolio/CritterFolio/CritterFolio/Assets/Fonts/Phosphor.ttf
new file mode 100644
index 0000000..7c1b8a7
Binary files /dev/null and b/critterfolio/CritterFolio/CritterFolio/Assets/Fonts/Phosphor.ttf differ
diff --git a/critterfolio/CritterFolio/CritterFolio/Assets/icon.ico b/critterfolio/CritterFolio/CritterFolio/Assets/icon.ico
new file mode 100644
index 0000000..0f6ec3f
Binary files /dev/null and b/critterfolio/CritterFolio/CritterFolio/Assets/icon.ico differ
diff --git a/critterfolio/CritterFolio/CritterFolio/CritterFolio.csproj b/critterfolio/CritterFolio/CritterFolio/CritterFolio.csproj
index 3e9acc5..718da84 100644
--- a/critterfolio/CritterFolio/CritterFolio/CritterFolio.csproj
+++ b/critterfolio/CritterFolio/CritterFolio/CritterFolio.csproj
@@ -22,4 +22,8 @@
+
+
+
+
diff --git a/critterfolio/CritterFolio/CritterFolio/Navigation.axaml b/critterfolio/CritterFolio/CritterFolio/Navigation.axaml
new file mode 100644
index 0000000..ca8c8d1
--- /dev/null
+++ b/critterfolio/CritterFolio/CritterFolio/Navigation.axaml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/critterfolio/CritterFolio/CritterFolio/Navigation.axaml.cs b/critterfolio/CritterFolio/CritterFolio/Navigation.axaml.cs
new file mode 100644
index 0000000..44a546c
--- /dev/null
+++ b/critterfolio/CritterFolio/CritterFolio/Navigation.axaml.cs
@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using CritterFolio.Pages;
+
+namespace CritterFolio;
+
+public partial class Navigation : UserControl
+{
+ public Page? CurrentPage
+ {
+ get
+ {
+ _pageStack.TryPeek(out var page);
+ return page;
+ }
+ }
+
+ private Panel? _pageContainer;
+ private Stack _pageStack = [];
+
+
+ public Navigation()
+ {
+ InitializeComponent();
+ }
+
+ public void Init(Panel pageContainer)
+ {
+ _pageContainer = pageContainer;
+ }
+
+ public void SetTitle(string title)
+ {
+ PageTitle.Content = title;
+ }
+
+ public void ShowBack()
+ {
+ BackButton.IsVisible = true;
+ }
+
+ public void HideBack()
+ {
+ BackButton.IsVisible = false;
+ }
+
+ public void AddHeaderButton(Button button)
+ {
+ button.Classes.Add("headerBttn");
+ HeaderButtons.Children.Add(button);
+ }
+
+ public void RemoveHeaderButton(Button button)
+ {
+ HeaderButtons.Children.Remove(button);
+ }
+
+ public void PushPage(Page page)
+ {
+ _pageStack.Push(page);
+ }
+
+ public void PopPage()
+ {
+ _pageStack.Pop();
+ }
+
+
+ private void RefreshPage()
+ {
+ _pageContainer?.Children.Clear();
+ if (CurrentPage is null) return;
+ _pageContainer?.Children.Add(CurrentPage);
+ CurrentPage.Refresh();
+ }
+}
\ No newline at end of file
diff --git a/critterfolio/CritterFolio/CritterFolio/Pages/Page.cs b/critterfolio/CritterFolio/CritterFolio/Pages/Page.cs
new file mode 100644
index 0000000..ba552bd
--- /dev/null
+++ b/critterfolio/CritterFolio/CritterFolio/Pages/Page.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace CritterFolio.Pages;
+
+public abstract class Page : UserControl
+{
+ public abstract void Refresh();
+}
\ No newline at end of file
diff --git a/critterfolio/CritterFolio/CritterFolio/Styles/MainStyles.axaml b/critterfolio/CritterFolio/CritterFolio/Styles/MainStyles.axaml
new file mode 100644
index 0000000..84ce175
--- /dev/null
+++ b/critterfolio/CritterFolio/CritterFolio/Styles/MainStyles.axaml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/critterfolio/CritterFolio/CritterFolio/Sys.cs b/critterfolio/CritterFolio/CritterFolio/Sys.cs
new file mode 100644
index 0000000..5b84dbe
--- /dev/null
+++ b/critterfolio/CritterFolio/CritterFolio/Sys.cs
@@ -0,0 +1,6 @@
+namespace CritterFolio;
+
+public static class Sys
+{
+ public static Navigation? Navigation { get; set; }
+}
\ No newline at end of file
diff --git a/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml b/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml
index 32dcb39..e0e5ebb 100644
--- a/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml
+++ b/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml
@@ -3,6 +3,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:CritterFolio.ViewModels"
+ xmlns:critterFolio="clr-namespace:CritterFolio"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="CritterFolio.Views.MainView"
x:DataType="vm:MainViewModel">
@@ -12,6 +13,10 @@
-
+
+
+
+
+
diff --git a/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml.cs b/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml.cs
index 300fbee..7d801b6 100644
--- a/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml.cs
+++ b/critterfolio/CritterFolio/CritterFolio/Views/MainView.axaml.cs
@@ -7,5 +7,6 @@ public partial class MainView : UserControl
public MainView()
{
InitializeComponent();
+ Sys.Navigation = Nav;
}
}
\ No newline at end of file
diff --git a/critterfolio/CritterFolio/CritterFolio/Views/MainWindow.axaml b/critterfolio/CritterFolio/CritterFolio/Views/MainWindow.axaml
index 5e2aa58..5107d23 100644
--- a/critterfolio/CritterFolio/CritterFolio/Views/MainWindow.axaml
+++ b/critterfolio/CritterFolio/CritterFolio/Views/MainWindow.axaml
@@ -6,7 +6,7 @@
xmlns:views="using:CritterFolio.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="CritterFolio.Views.MainWindow"
- Icon="/Assets/avalonia-logo.ico"
+ Icon="/Assets/icon.ico"
Title="CritterFolio">
diff --git a/icon-16x16.png b/icon-16x16.png
new file mode 100644
index 0000000..2e5cbea
Binary files /dev/null and b/icon-16x16.png differ
diff --git a/icon-400x400.png b/icon-400x400.png
new file mode 100644
index 0000000..6bb4ac3
Binary files /dev/null and b/icon-400x400.png differ
diff --git a/icon.ico b/icon.ico
new file mode 100644
index 0000000..0f6ec3f
Binary files /dev/null and b/icon.ico differ