diff --git a/POMO/CompletedTaskPopUp.xaml b/POMO/CompletedTaskPopUp.xaml
new file mode 100644
index 0000000..51d49b5
--- /dev/null
+++ b/POMO/CompletedTaskPopUp.xaml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/CompletedTaskPopUp.xaml.cs b/POMO/CompletedTaskPopUp.xaml.cs
new file mode 100644
index 0000000..fe75277
--- /dev/null
+++ b/POMO/CompletedTaskPopUp.xaml.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Maui.Views;
+
+namespace POMO;
+
+public partial class CompletedTaskPopUp : Popup
+{
+ public CompletedTaskPopUp()
+ {
+ InitializeComponent();
+ }
+
+ private void CloseButton_Clicked(object sender, EventArgs e)
+ {
+ Close();
+ }
+}
\ No newline at end of file
diff --git a/POMO/CreateNewTaskPopUp.xaml b/POMO/CreateNewTaskPopUp.xaml
new file mode 100644
index 0000000..cff6b81
--- /dev/null
+++ b/POMO/CreateNewTaskPopUp.xaml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/CreateNewTaskPopUp.xaml.cs b/POMO/CreateNewTaskPopUp.xaml.cs
new file mode 100644
index 0000000..870c6ac
--- /dev/null
+++ b/POMO/CreateNewTaskPopUp.xaml.cs
@@ -0,0 +1,31 @@
+using CommunityToolkit.Maui.Views;
+
+namespace POMO;
+
+public partial class CreateNewTaskPopUp : Popup
+{
+ public CreateNewTaskPopUp()
+ {
+ InitializeComponent();
+ }
+
+ private void CloseButton_Clicked(object sender, EventArgs e)
+ {
+ Close();
+ }
+
+ private void OnDescriptionTextChanged(object sender, TextChangedEventArgs e)
+ {
+
+ }
+
+ private void OnDecreaseClicked(object sender, EventArgs e)
+ {
+
+ }
+
+ private void OnIncreaseClicked(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/POMO/MainPage.xaml b/POMO/MainPage.xaml
index f476911..10ff361 100644
--- a/POMO/MainPage.xaml
+++ b/POMO/MainPage.xaml
@@ -1,70 +1,86 @@
+ x:Class="POMO.MainPage">
-
-
+
+
-
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/POMO/MainPage.xaml.cs b/POMO/MainPage.xaml.cs
index 9e43b0f..804d1dd 100644
--- a/POMO/MainPage.xaml.cs
+++ b/POMO/MainPage.xaml.cs
@@ -8,11 +8,16 @@ public MainPage()
InitializeComponent();
}
- private async void OnClockButtonTapped(object sender, EventArgs e)
+
+ private async void GoToTimer(object sender, EventArgs e)
{
- // Navigate to TimerPage
await Shell.Current.GoToAsync("TimerPage");
}
+
+ private async void GoToTask(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("TaskPage");
+ }
}
}
diff --git a/POMO/POMO.csproj b/POMO/POMO.csproj
index 3208404..01f5713 100644
--- a/POMO/POMO.csproj
+++ b/POMO/POMO.csproj
@@ -67,12 +67,33 @@
+
+ SpecificTaskPopUp.xaml
+
StartingPage.xaml
+
+ TimerPopUpPage2.xaml
+
+
+ TimerPopUpPage1.xaml
+
+
+ TimerPopUpPage3.xaml
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
MSBuild:Compile
@@ -91,6 +112,15 @@
MSBuild:Compile
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
diff --git a/POMO/Resources/Images/arrow_down.png b/POMO/Resources/Images/arrow_down.png
new file mode 100644
index 0000000..bb7bb7b
Binary files /dev/null and b/POMO/Resources/Images/arrow_down.png differ
diff --git a/POMO/Resources/Images/arrow_up.png b/POMO/Resources/Images/arrow_up.png
new file mode 100644
index 0000000..53e223a
Binary files /dev/null and b/POMO/Resources/Images/arrow_up.png differ
diff --git a/POMO/Resources/Images/bell_icon.png b/POMO/Resources/Images/bell_icon.png
new file mode 100644
index 0000000..bcdeabc
Binary files /dev/null and b/POMO/Resources/Images/bell_icon.png differ
diff --git a/POMO/Resources/Images/check_icon.png b/POMO/Resources/Images/check_icon.png
new file mode 100644
index 0000000..c41e6ca
Binary files /dev/null and b/POMO/Resources/Images/check_icon.png differ
diff --git a/POMO/Resources/Images/delete_button.png b/POMO/Resources/Images/delete_button.png
new file mode 100644
index 0000000..0ea213a
Binary files /dev/null and b/POMO/Resources/Images/delete_button.png differ
diff --git a/POMO/Resources/Images/edit_task_logo.png b/POMO/Resources/Images/edit_task_logo.png
new file mode 100644
index 0000000..b0154b3
Binary files /dev/null and b/POMO/Resources/Images/edit_task_logo.png differ
diff --git a/POMO/Resources/Images/existing_task_logo.png b/POMO/Resources/Images/existing_task_logo.png
new file mode 100644
index 0000000..dffbc7f
Binary files /dev/null and b/POMO/Resources/Images/existing_task_logo.png differ
diff --git a/POMO/Resources/Images/exit_button.png b/POMO/Resources/Images/exit_button.png
new file mode 100644
index 0000000..0a675c3
Binary files /dev/null and b/POMO/Resources/Images/exit_button.png differ
diff --git a/POMO/Resources/Images/new_task_logo.png b/POMO/Resources/Images/new_task_logo.png
new file mode 100644
index 0000000..f10d93c
Binary files /dev/null and b/POMO/Resources/Images/new_task_logo.png differ
diff --git a/POMO/Resources/Images/pause_button.png b/POMO/Resources/Images/pause_button.png
index d9f3d37..bf2c720 100644
Binary files a/POMO/Resources/Images/pause_button.png and b/POMO/Resources/Images/pause_button.png differ
diff --git a/POMO/Resources/Images/play_button.png b/POMO/Resources/Images/play_button.png
new file mode 100644
index 0000000..75a47f6
Binary files /dev/null and b/POMO/Resources/Images/play_button.png differ
diff --git a/POMO/Resources/Images/reset_button.png b/POMO/Resources/Images/reset_button.png
new file mode 100644
index 0000000..4a1773b
Binary files /dev/null and b/POMO/Resources/Images/reset_button.png differ
diff --git a/POMO/Resources/Images/specific_task_logo.png b/POMO/Resources/Images/specific_task_logo.png
new file mode 100644
index 0000000..f2d4df4
Binary files /dev/null and b/POMO/Resources/Images/specific_task_logo.png differ
diff --git a/POMO/Resources/Images/task_button_clicked.png b/POMO/Resources/Images/task_button_clicked.png
new file mode 100644
index 0000000..96dfd23
Binary files /dev/null and b/POMO/Resources/Images/task_button_clicked.png differ
diff --git a/POMO/Resources/Images/timer_button_clicked.png b/POMO/Resources/Images/timer_button_clicked.png
new file mode 100644
index 0000000..704e4b6
Binary files /dev/null and b/POMO/Resources/Images/timer_button_clicked.png differ
diff --git a/POMO/Resources/Images/yellow_timer_button.png b/POMO/Resources/Images/yellow_timer_button.png
new file mode 100644
index 0000000..28ba422
Binary files /dev/null and b/POMO/Resources/Images/yellow_timer_button.png differ
diff --git a/POMO/SpecificTaskPopUp.xaml b/POMO/SpecificTaskPopUp.xaml
new file mode 100644
index 0000000..96bd69b
--- /dev/null
+++ b/POMO/SpecificTaskPopUp.xaml
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/SpecificTaskPopup.xaml.cs b/POMO/SpecificTaskPopup.xaml.cs
new file mode 100644
index 0000000..b67e64c
--- /dev/null
+++ b/POMO/SpecificTaskPopup.xaml.cs
@@ -0,0 +1,31 @@
+using CommunityToolkit.Maui.Views;
+
+namespace POMO;
+
+public partial class SpecificTaskPopUp : Popup
+{
+ public SpecificTaskPopUp()
+ {
+ InitializeComponent();
+ }
+
+ private void CloseButton_Clicked(object sender, EventArgs e)
+ {
+ Close();
+ }
+
+ private void OnDescriptionTextChanged(object sender, TextChangedEventArgs e)
+ {
+
+ }
+
+ private void OnDecreaseClicked(object sender, EventArgs e)
+ {
+
+ }
+
+ private void OnIncreaseClicked(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/POMO/StartingPage.xaml b/POMO/StartingPage.xaml
index 45c06d5..e9518c0 100644
--- a/POMO/StartingPage.xaml
+++ b/POMO/StartingPage.xaml
@@ -4,7 +4,7 @@
x:Class="POMO.StartingPage">
-
+
diff --git a/POMO/TaskPage.xaml b/POMO/TaskPage.xaml
index 8658b47..946eea0 100644
--- a/POMO/TaskPage.xaml
+++ b/POMO/TaskPage.xaml
@@ -2,39 +2,43 @@
+ x:Class="POMO.TaskPage">
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
+ Specific Task Popup
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/TaskPage.xaml.cs b/POMO/TaskPage.xaml.cs
index f30a0e3..0397c81 100644
--- a/POMO/TaskPage.xaml.cs
+++ b/POMO/TaskPage.xaml.cs
@@ -1,3 +1,5 @@
+using CommunityToolkit.Maui.Views;
+
namespace POMO
{
public partial class TaskPage : ContentPage
@@ -6,27 +8,41 @@ public TaskPage()
{
InitializeComponent();
- // Access the TaskPopUp instance from XAML and subscribe to the events
- TaskPopUp.TaskCreated += OnTaskCreated;
- TaskPopUp.Cancelled += OnTaskCancelled;
}
- private void OnCreateNewTaskClicked(object sender, EventArgs e)
+ private async void OnCreateNewTaskClicked(object sender, EventArgs e)
+ {
+ this.ShowPopup(new CreateNewTaskPopUp());
+ }
+
+ private void OnExistingTasksToggleClicked(object sender, EventArgs e)
+ {
+
+ }
+
+ private void OnCompletedTasksToggleClicked(object sender, EventArgs e)
+ {
+
+ }
+
+ private async void GoToHome(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("MainPage");
+ }
+
+ private async void GoToTimer(object sender, EventArgs e)
{
- TaskPopUp.IsVisible = true; // Show the TaskPopUp when the button is clicked
+ await Shell.Current.GoToAsync("TimerPage");
}
- // Event handler when a task is created (done button clicked)
- private void OnTaskCreated(object? sender, EventArgs e)
+ private void OnTaskTapped(object sender, TappedEventArgs e)
{
- DisplayAlert("Task Created", "A new task has been successfully created.", "OK");
- TaskPopUp.IsVisible = false; // Hide the popup after task is created
+ this.ShowPopup(new SpecificTaskPopUp());
}
- // Event handler when task creation is canceled (cancel button clicked)
- private void OnTaskCancelled(object? sender, EventArgs e)
+ private void CompleteTaskTapped(object sender, TappedEventArgs e)
{
- TaskPopUp.IsVisible = false; // Hide the popup when the action is canceled
+ this.ShowPopup(new CompletedTaskPopUp());
}
}
}
\ No newline at end of file
diff --git a/POMO/TimerPage.xaml b/POMO/TimerPage.xaml
index b36368b..f6366a1 100644
--- a/POMO/TimerPage.xaml
+++ b/POMO/TimerPage.xaml
@@ -2,106 +2,121 @@
+
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/TimerPage.xaml.cs b/POMO/TimerPage.xaml.cs
index 132b740..12a5ed5 100644
--- a/POMO/TimerPage.xaml.cs
+++ b/POMO/TimerPage.xaml.cs
@@ -1,13 +1,42 @@
+using CommunityToolkit.Maui.Views;
+
namespace POMO
{
public partial class TimerPage : ContentPage
{
- private int _pomodoroCount = 1;
+ //private int _pomodoroCount = 1;
public TimerPage()
{
InitializeComponent();
}
+ private void EndTimer_Clicked(object sender, EventArgs e)
+ {
+ this.ShowPopup(new TimerPopUpPage1());
+ }
+
+ private void ChooseTask_Clicked(object sender, EventArgs e)
+ {
+ this.ShowPopup(new TimerPopUpPage2());
+ }
+
+ private void SkipSession_Clicked(object sender, EventArgs e)
+ {
+ this.ShowPopup(new TimerPopUpPage3());
+ }
+
+ private async void GoToHome(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("MainPage");
+ }
+
+ private async void GoToTask(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("TaskPage");
+ }
+
+
+ /*
private void OnIncreasePomodoroClicked(object sender, EventArgs e)
{
// Increment the Pomodoro count
@@ -53,5 +82,6 @@ private async void OnPlayButtonClicked(object sender, EventArgs e)
await Shell.Current.GoToAsync(
$"{nameof(RunningTimePage)}?InitialTimeValue={timeSet}&PomodoroCount={_pomodoroCount}");
}
+ */
}
}
\ No newline at end of file
diff --git a/POMO/TimerPopUpPage1.xaml b/POMO/TimerPopUpPage1.xaml
new file mode 100644
index 0000000..b781f58
--- /dev/null
+++ b/POMO/TimerPopUpPage1.xaml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/TimerPopUpPage1.xaml.cs b/POMO/TimerPopUpPage1.xaml.cs
new file mode 100644
index 0000000..f6e291d
--- /dev/null
+++ b/POMO/TimerPopUpPage1.xaml.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Maui.Views;
+
+namespace POMO;
+
+public partial class TimerPopUpPage1 : Popup
+{
+ public TimerPopUpPage1()
+ {
+ InitializeComponent();
+ }
+
+ private void CloseButton_Clicked(object sender, EventArgs e)
+ {
+ Close();
+ }
+}
\ No newline at end of file
diff --git a/POMO/TimerPopUpPage2.xaml b/POMO/TimerPopUpPage2.xaml
new file mode 100644
index 0000000..fadaff7
--- /dev/null
+++ b/POMO/TimerPopUpPage2.xaml
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/TimerPopUpPage2.xaml.cs b/POMO/TimerPopUpPage2.xaml.cs
new file mode 100644
index 0000000..230c17e
--- /dev/null
+++ b/POMO/TimerPopUpPage2.xaml.cs
@@ -0,0 +1,28 @@
+using CommunityToolkit.Maui.Views;
+
+namespace POMO;
+
+public partial class TimerPopUpPage2 : Popup
+{
+ public TimerPopUpPage2()
+ {
+ InitializeComponent();
+ }
+
+ private void CloseButton_Clicked(object sender, EventArgs e)
+ {
+ Close();
+ }
+
+ private void Task_Clicked(object sender, EventArgs e)
+ {
+ ChoosingTask.IsVisible = false;
+ ChoosingPomodoro.IsVisible = true;
+ }
+
+ private void PomodoroCancel_Clicked(object sender, EventArgs e)
+ {
+ ChoosingPomodoro.IsVisible = false;
+ ChoosingTask.IsVisible = true;
+ }
+}
\ No newline at end of file
diff --git a/POMO/TimerPopUpPage3.xaml b/POMO/TimerPopUpPage3.xaml
new file mode 100644
index 0000000..1086e09
--- /dev/null
+++ b/POMO/TimerPopUpPage3.xaml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/POMO/TimerPopUpPage3.xaml.cs b/POMO/TimerPopUpPage3.xaml.cs
new file mode 100644
index 0000000..a07fca5
--- /dev/null
+++ b/POMO/TimerPopUpPage3.xaml.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Maui.Views;
+
+namespace POMO;
+
+public partial class TimerPopUpPage3 : Popup
+{
+ public TimerPopUpPage3()
+ {
+ InitializeComponent();
+ }
+
+ private void CloseButton_Clicked(object sender, EventArgs e)
+ {
+ Close();
+ }
+}
\ No newline at end of file