From ce18a134531645a57661f6429b084c4b29938bf7 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Thu, 25 Oct 2018 20:41:16 -0700
Subject: [PATCH 01/11] Initial commit

Created a basic layout of things like main classes for the MVP.
As far as testing/interface goes it just shows the name of the most recent chore you entered.
---
 Chore.cs           | 70 +++++++++++++++++++++++++++++++++++++++++
 Group.cs           | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 MainActivity.cs    | 44 ++++++++++++++++++++++++++
 TaskList.cs        | 38 ++++++++++++++++++++++
 Timestamp.cs       | 66 +++++++++++++++++++++++++++++++++++++++
 User.cs            | 38 ++++++++++++++++++++++
 activity_main.axml | 50 +++++++++++++++++++++++++++++
 7 files changed, 384 insertions(+)
 create mode 100644 Chore.cs
 create mode 100644 Group.cs
 create mode 100644 MainActivity.cs
 create mode 100644 TaskList.cs
 create mode 100644 Timestamp.cs
 create mode 100644 User.cs
 create mode 100644 activity_main.axml

diff --git a/Chore.cs b/Chore.cs
new file mode 100644
index 0000000..ab5e06e
--- /dev/null
+++ b/Chore.cs
@@ -0,0 +1,70 @@
+using TimeSpace;
+
+namespace ChoreSpace
+{
+    public class Chore
+    {
+        int choreId;
+        string choreName;
+        int assignedUserId;
+        int completedUserId;
+        Timestamp deadlineTimestamp;
+        Timestamp completedTimestamp;
+        bool isPriority;
+        bool isCompleted;
+
+        //constructor
+        public Chore(string name, int passedUserId, string deadline)
+        {
+            isCompleted = false;
+            completedUserId = -1;
+            completedTimestamp = new Timestamp();
+
+            choreName = name;
+            choreId = generateChoreId();
+            assignedUserId = passedUserId;
+            deadlineTimestamp = new Timestamp(deadline);
+        }
+
+        int generateChoreId()
+        {
+            //TODO: fetch greatest chore id and increment by 1
+            return 0;
+        }
+
+        public void MarkPriority()
+        {
+            isPriority = true;
+        }
+
+        public void MarkComplete()
+        {
+            //TODO: get the Id of the user who marked it complete and assign it
+            completedUserId = assignedUserId;
+            completedTimestamp = new Timestamp().CurrentTimestamp();
+            isCompleted = true;
+        }
+
+        public int AssignUser(int passedUserId)
+        {
+            assignedUserId = passedUserId;
+            return (assignedUserId);
+        }
+
+        public Timestamp UpdateDeadline(string deadline)
+        {
+            deadlineTimestamp = new Timestamp(deadline);
+            return deadlineTimestamp;
+        }
+
+        public bool CheckId(int keyId)
+        {
+            return (keyId == choreId);
+        }
+        
+        public string GetName()
+        {
+            return (choreName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Group.cs b/Group.cs
new file mode 100644
index 0000000..7f20cd1
--- /dev/null
+++ b/Group.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using UserSpace;
+using TaskSpace;
+using ChoreSpace;
+
+namespace GroupSpace
+{
+    class Group
+    {
+        int groupId;
+        string groupName;
+        bool valid;
+
+        List<User> users;
+        TaskList tasks;
+
+        public Group()
+        {
+            groupId = 0;
+            groupName = "Fake";
+            valid = false;
+        }
+
+        public bool AssignGroup(int groupId)
+        {
+            //TODO:
+            //Fetch Grouup data corresponding to groupId
+            //Assign data values to group
+            valid = true;
+            //return false if group was not created or true if it was
+            return false;
+        }
+
+        public bool AssignGroup(string groupName)
+        {
+            //TODO:
+            //Fetch Grouup data corresponding to groupName
+            //Assign data values to group
+            valid = true;
+            //return false if group was not created or true if it was
+            return false;
+        }
+        
+        public Group GenerateNew(string Name)
+        {
+            //Add a new group to the database with name Name
+            //Add the local user to the group's list of users
+            return (new Group());
+        }
+
+        public Group GenerateTestGroup()
+        {
+            groupId = 0;
+            groupName = "Best_Group";
+            valid = true;
+            users = new List<User>();
+            tasks = new TaskList();
+            return this;
+        }
+
+        public User AddUser(User passedUser)
+        {
+            users.Add(passedUser);
+            return (passedUser);
+        }
+
+        public Chore AddChore(Chore chore)
+        {
+            tasks.AddChore(chore);
+            return chore;
+        }
+
+        public TaskList GetTaskList()
+        {
+            return(tasks);
+        }
+    }
+}
\ No newline at end of file
diff --git a/MainActivity.cs b/MainActivity.cs
new file mode 100644
index 0000000..4ba92c5
--- /dev/null
+++ b/MainActivity.cs
@@ -0,0 +1,44 @@
+using Android.App;
+using Android.OS;
+using Android.Support.V7.App;
+using Android.Runtime;
+using Android.Widget;
+using UserSpace;
+using GroupSpace;
+using ChoreSpace;
+
+namespace ChoreChomper
+{
+    [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)]
+    public class MainActivity : AppCompatActivity
+    {
+        protected override void OnCreate(Bundle savedInstanceState)
+        {
+            base.OnCreate(savedInstanceState);
+            // Set our view from the "main" layout resource
+            SetContentView(Resource.Layout.activity_main);
+
+            EditText choreNameText = FindViewById<EditText>(Resource.Id.editChoreName);
+            TextView choreNameView = FindViewById<TextView>(Resource.Id.textChoreDisp);
+            Button addButton = FindViewById<Button>(Resource.Id.buttonAddChore);
+
+            addButton.Click += (sender, e) =>
+            {
+                choreNameView.Text = Controller.AddTestChore(choreNameText.Text);
+            };
+        }
+    }
+
+    public static class Controller
+    {
+        public static string AddTestChore(string name)
+        {
+            User user = new User().GenerateTestUser();
+            Group group = new Group().GenerateTestGroup();
+            group.AddUser(user);
+            Chore chore = new Chore(name, user.GetId(), "11/11/111");
+            group.AddChore(chore);
+            return (group.GetTaskList().GetHeadChoreName());
+        }
+    }
+}
\ No newline at end of file
diff --git a/TaskList.cs b/TaskList.cs
new file mode 100644
index 0000000..4f090c4
--- /dev/null
+++ b/TaskList.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+using ChoreSpace;
+
+namespace TaskSpace
+{
+    class TaskList //Renamed from Calendar to avoid collisions and clarify use
+    {
+        List<Chore> choreList = new List<Chore>();
+
+        public void AddChore(Chore chore)
+        {
+            choreList.Add(chore);
+        }
+
+        public void AddChore(string name, int passedUserId, string deadline)
+        {
+            choreList.Add(new Chore(name, passedUserId, deadline));
+        }
+
+        public int RemoveChore(int choreId)
+        {
+            int countBefore = choreList.Count;
+            choreList.RemoveAll(c => c.CheckId(choreId));
+            
+            //returns number of chores removed
+            return (choreList.Count - countBefore);
+        }
+
+        public string GetHeadChoreName()
+        {
+            if (choreList.Count == 0)
+                return "";
+            else
+                return choreList[0].GetName();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Timestamp.cs b/Timestamp.cs
new file mode 100644
index 0000000..81cdb4b
--- /dev/null
+++ b/Timestamp.cs
@@ -0,0 +1,66 @@
+using System;
+
+namespace TimeSpace
+{
+    public class Timestamp
+    {
+        int day;
+        int month;
+        int year;
+        bool isValid;
+
+        public Timestamp()
+        {
+            day = 0;
+            month = 0;
+            year = 0;
+            isValid = false;
+        }
+
+        public Timestamp(int passDay, int passMonth, int passYear)
+        {
+            day = passDay;
+            month = passMonth;
+            year = passYear;
+            isValid = true;
+        }
+
+        public Timestamp(string condensedTimeFormat)
+        {
+            //assumes condensedTimeFormat is in the format "MM/DD/YYYY"
+            string[] values = condensedTimeFormat.Split('/');
+            //TODO: consider using parse return values to catch impropperly formatted dates.
+            Int32.TryParse(values[0], out day);
+            Int32.TryParse(values[1], out month);
+            Int32.TryParse(values[2], out year);
+            isValid = true;
+        }
+
+        public override string ToString()
+        {
+            return (day.ToString("D2") + "/" + month.ToString("D2") + "/" + year.ToString("D4"));
+        }
+
+        public int GetDay()
+        {
+            return (day);
+        }
+
+        public int GetMonth()
+        {
+            return (month);
+        }
+
+        public int GetYear()
+        {
+            return (year);
+        }
+
+        public Timestamp CurrentTimestamp()
+        {
+            DateTime desiredTime = DateTime.Now;
+            Timestamp desiredTimestamp = new Timestamp(desiredTime.Day, desiredTime.Month, desiredTime.Year);
+            return (desiredTimestamp);
+        }
+    }
+}
\ No newline at end of file
diff --git a/User.cs b/User.cs
new file mode 100644
index 0000000..b60e005
--- /dev/null
+++ b/User.cs
@@ -0,0 +1,38 @@
+namespace UserSpace
+{
+    class User
+    {
+        int userId;
+        string userName;
+
+        public User()
+        {
+            //TODO: creating new users
+        }
+
+        public User(string name)
+        {
+            userName = name;
+            //TODO: fetch and check id in database
+        }
+
+        public bool CheckCredentials(string pass)
+        {
+            //TODO: compare against the databases' password for this userId
+            return false;
+        }
+
+        public int GetId()
+        {
+            return userId;
+        }
+
+        public User GenerateTestUser()
+        {
+            userId = 0;
+            userName = "Bob";
+
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/activity_main.axml b/activity_main.axml
new file mode 100644
index 0000000..efafd8b
--- /dev/null
+++ b/activity_main.axml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Chore name:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/textChoreName"/>
+	<EditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/textChoreName"
+		android:id="@+id/editChoreName"
+		android:clickable="false" />
+	<Button
+		android:text="Button"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/editChoreName"
+		android:id="@+id/buttonAddChore"
+		android:clickable="false" />
+	<TextView
+		android:text="Chore list:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/buttonAddChore"
+		android:id="@+id/textChoreList" />
+	
+	<!--
+	<ListView
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/textChoreList"
+		android:id="@+id/listOfChores" />
+	-->
+	<TextView
+		android:text="Test Display"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/textChoreList"
+		android:id="@+id/textChoreDisp" />
+</RelativeLayout>

From 1f1bc49ba957f72e87b625724a5d53193d4c85c1 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Thu, 1 Nov 2018 13:41:47 -0700
Subject: [PATCH 02/11] Refactoring and screen swapping

Added screen swapping.
Refactored code into controller class.
Changed namespaces.
---
 Chore.cs             |   4 +-
 Controller.cs        | 104 +++++++++++++++++++++++++++++++++++++++++++
 Group.cs             |   7 +--
 MainActivity.cs      |  65 ++++++++++++++++++---------
 TaskList.cs          |  17 +++++--
 Timestamp.cs         |   2 +-
 User.cs              |   4 +-
 activity_main.axml   |  31 +++----------
 choreListLayout.axml |  26 +++++++++++
 loginLayout.axml     |  34 ++++++++++++++
 10 files changed, 234 insertions(+), 60 deletions(-)
 create mode 100644 Controller.cs
 create mode 100644 choreListLayout.axml
 create mode 100644 loginLayout.axml

diff --git a/Chore.cs b/Chore.cs
index ab5e06e..b3e8fac 100644
--- a/Chore.cs
+++ b/Chore.cs
@@ -1,6 +1,6 @@
-using TimeSpace;
+using ChoreChomper.Model.Utility;
 
-namespace ChoreSpace
+namespace ChoreChomper.Model
 {
     public class Chore
     {
diff --git a/Controller.cs b/Controller.cs
new file mode 100644
index 0000000..7f38bab
--- /dev/null
+++ b/Controller.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.Support.V7.Widget;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+//using Xamarin;
+
+using ChoreChomper.Model;
+
+namespace ChoreChomper.ViewControllers
+{
+    class Controller
+    {
+        
+    }
+
+    class LoginController : Controller
+    {
+        EditText usernameText;
+        EditText passwordText;
+        Button loginButton;
+
+        public LoginController(MainActivity act)
+        {
+            usernameText = act.FindViewById<EditText>(Resource.Id.editUsername);
+            passwordText = act.FindViewById<EditText>(Resource.Id.editPassword);
+            loginButton = act.FindViewById<Button>(Resource.Id.buttonLogin);
+
+            loginButton.Click += (sender, e) =>
+            {
+                // TODO: handle login attempt
+                act.ChangeTo(Resource.Layout.activity_main);
+            };
+        }
+    }
+
+    class HomeController:Controller
+    {
+        EditText choreNameText;
+        Button addChoreButton;
+        Button viewChoresButton;
+
+        public HomeController(MainActivity act)
+        {
+            act.SetContentView(Resource.Layout.activity_main);
+
+            choreNameText = act.FindViewById<EditText>(Resource.Id.editChoreName);
+            addChoreButton = act.FindViewById<Button>(Resource.Id.buttonAddChore);
+            viewChoresButton = act.FindViewById<Button>(Resource.Id.buttonViewChores);
+            
+            addChoreButton.Click += (sender, e) =>
+            {
+                // TODO: consider making addTestChore a bool and using that to determine if the chore was added
+                AddTestChore(choreNameText.Text, act);
+                choreNameText.Text = "chore added";
+            };
+
+            viewChoresButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };            
+        }
+
+        public static string AddTestChore(string name, MainActivity act)
+        {
+            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
+            act.getMainGroup().AddChore(chore);
+            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+        }
+    }
+
+    class ChoreListController:Controller
+    {
+        Button homeButton;
+        //Xamarin.Forms.ListView choreListView;
+        ListView choreListView;
+
+        public ChoreListController(MainActivity act)
+        {
+            homeButton = act.FindViewById<Button>(Resource.Id.buttonHome);
+            choreListView = act.FindViewById<ListView>(Resource.Id.listOfChores);
+
+            homeButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.activity_main);
+            };
+        }
+
+        private void SetupList(MainActivity act)
+        {
+            List<string> choreNames = act.getMainGroup().GetTaskList().GetChoreNames();
+            // TODO: add stuff to chore list and make it display them
+            //choreListView.ItemsSource.Add();
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/Group.cs b/Group.cs
index 7f20cd1..9d77518 100644
--- a/Group.cs
+++ b/Group.cs
@@ -1,11 +1,8 @@
 using System.Collections.Generic;
-using UserSpace;
-using TaskSpace;
-using ChoreSpace;
 
-namespace GroupSpace
+namespace ChoreChomper.Model
 {
-    class Group
+    public class Group
     {
         int groupId;
         string groupName;
diff --git a/MainActivity.cs b/MainActivity.cs
index 4ba92c5..2eed008 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -1,44 +1,65 @@
 using Android.App;
 using Android.OS;
 using Android.Support.V7.App;
+using Android.Support.V7.Widget;
 using Android.Runtime;
 using Android.Widget;
-using UserSpace;
-using GroupSpace;
-using ChoreSpace;
+
+using ChoreChomper.ViewControllers;
+using ChoreChomper.Model;
 
 namespace ChoreChomper
 {
     [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)]
     public class MainActivity : AppCompatActivity
     {
+        ChoreChomper.ViewControllers.Controller controller;
+        ChoreChomper.Model.User user;
+        ChoreChomper.Model.Group group;
+        public User getMainUser() { return user; }
+        public Group getMainGroup() { return group; }
+
         protected override void OnCreate(Bundle savedInstanceState)
         {
             base.OnCreate(savedInstanceState);
-            // Set our view from the "main" layout resource
-            SetContentView(Resource.Layout.activity_main);
 
-            EditText choreNameText = FindViewById<EditText>(Resource.Id.editChoreName);
-            TextView choreNameView = FindViewById<TextView>(Resource.Id.textChoreDisp);
-            Button addButton = FindViewById<Button>(Resource.Id.buttonAddChore);
+            // TODO: should likely be done in the loginLayoutController
+            SetupUserData();
 
-            addButton.Click += (sender, e) =>
-            {
-                choreNameView.Text = Controller.AddTestChore(choreNameText.Text);
-            };
+            // For future reference, remeber to set the content view before assigning the controller
+            SetContentView(Resource.Layout.loginLayout);
+            controller = new LoginController(this);
         }
-    }
-
-    public static class Controller
-    {
-        public static string AddTestChore(string name)
+        
+        private void SetupUserData()
         {
-            User user = new User().GenerateTestUser();
-            Group group = new Group().GenerateTestGroup();
+            user = new User().GenerateTestUser();
+            group = new Group().GenerateTestGroup();
             group.AddUser(user);
-            Chore chore = new Chore(name, user.GetId(), "11/11/111");
-            group.AddChore(chore);
-            return (group.GetTaskList().GetHeadChoreName());
+        }
+
+        public bool ChangeTo(int layout)
+        {
+            if (layout == Resource.Layout.activity_main)
+            {
+                SetContentView(Resource.Layout.activity_main);
+                controller = new HomeController(this);
+                return true;
+            }
+            else if (layout == Resource.Layout.choreListLayout)
+            {
+                SetContentView(Resource.Layout.choreListLayout);
+                controller = new ChoreListController(this);
+                return true;
+            }
+            else if(layout == Resource.Layout.loginLayout)
+            {
+                SetContentView(Resource.Layout.loginLayout);
+                controller = new LoginController(this);
+                return true;
+            }
+            else
+                return false;
         }
     }
 }
\ No newline at end of file
diff --git a/TaskList.cs b/TaskList.cs
index 4f090c4..56b0baf 100644
--- a/TaskList.cs
+++ b/TaskList.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using ChoreSpace;
 
-namespace TaskSpace
+namespace ChoreChomper.Model
 {
-    class TaskList //Renamed from Calendar to avoid collisions and clarify use
+    public class TaskList //Renamed from Calendar to avoid collisions and clarify use
     {
         List<Chore> choreList = new List<Chore>();
 
@@ -34,5 +33,17 @@ public string GetHeadChoreName()
             else
                 return choreList[0].GetName();
         }
+
+        public List<string> GetChoreNames()
+        {
+            List<string> desiredList = new List<string>();
+
+            foreach (Chore chore in choreList)
+            {
+                desiredList.Add(chore.GetName());
+            }
+
+            return desiredList;
+        }
     }
 }
\ No newline at end of file
diff --git a/Timestamp.cs b/Timestamp.cs
index 81cdb4b..04d9f50 100644
--- a/Timestamp.cs
+++ b/Timestamp.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace TimeSpace
+namespace ChoreChomper.Model.Utility
 {
     public class Timestamp
     {
diff --git a/User.cs b/User.cs
index b60e005..29dea67 100644
--- a/User.cs
+++ b/User.cs
@@ -1,6 +1,6 @@
-namespace UserSpace
+namespace ChoreChomper.Model
 {
-    class User
+    public class User
     {
         int userId;
         string userName;
diff --git a/activity_main.axml b/activity_main.axml
index efafd8b..9282e86 100644
--- a/activity_main.axml
+++ b/activity_main.axml
@@ -17,34 +17,15 @@
 		android:id="@+id/editChoreName"
 		android:clickable="false" />
 	<Button
-		android:text="Button"
+		android:text="Add Chore"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@+id/editChoreName"
-		android:id="@+id/buttonAddChore"
-		android:clickable="false" />
-	<TextView
-		android:text="Chore list:"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_width="wrap_content"
+		android:id="@+id/buttonAddChore" />
+	<Button
+		android:text="View Chores"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@+id/buttonAddChore"
-		android:id="@+id/textChoreList" />
-	
-	<!--
-	<ListView
-		android:minWidth="25px"
-		android:minHeight="25px"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_below="@+id/textChoreList"
-		android:id="@+id/listOfChores" />
-	-->
-	<TextView
-		android:text="Test Display"
-				android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_below="@+id/textChoreList"
-		android:id="@+id/textChoreDisp" />
+		android:id="@+id/buttonViewChores" />
 </RelativeLayout>
diff --git a/choreListLayout.axml b/choreListLayout.axml
new file mode 100644
index 0000000..34e85cf
--- /dev/null
+++ b/choreListLayout.axml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Chores:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:id="@+id/textChoresHeader" />
+	<Button
+		android:text="Home"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonHome" />
+	<ListView
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/listOfChores" />
+
+</LinearLayout>
diff --git a/loginLayout.axml b/loginLayout.axml
new file mode 100644
index 0000000..6c1edee
--- /dev/null
+++ b/loginLayout.axml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Username:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/textUsername"/>
+	<EditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/editUsername"
+		android:clickable="false" />
+	<TextView
+		android:text="Password:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/textPassword"/>
+	<EditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/editPassword"
+		android:clickable="false"
+		android:inputType="none|textPassword" />
+	<Button
+		android:text="Enter"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonLogin" />
+</LinearLayout>

From 3dadf692f8cbd7761144da251dd6496b465fa749 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Tue, 6 Nov 2018 21:37:28 -0800
Subject: [PATCH 03/11] Added new user screen

---
 Controller.cs      | 34 ++++++++++++++++++++++++++++++++++
 MainActivity.cs    |  6 ++++++
 loginLayout.axml   |  7 ++++++-
 newUserLayout.axml | 40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 newUserLayout.axml

diff --git a/Controller.cs b/Controller.cs
index 7f38bab..2892c1e 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -26,18 +26,52 @@ class LoginController : Controller
         EditText usernameText;
         EditText passwordText;
         Button loginButton;
+        Button newUserButton;
 
         public LoginController(MainActivity act)
         {
             usernameText = act.FindViewById<EditText>(Resource.Id.editUsername);
             passwordText = act.FindViewById<EditText>(Resource.Id.editPassword);
             loginButton = act.FindViewById<Button>(Resource.Id.buttonLogin);
+            newUserButton = act.FindViewById<Button>(Resource.Id.buttonNewUser);
 
             loginButton.Click += (sender, e) =>
             {
                 // TODO: handle login attempt
                 act.ChangeTo(Resource.Layout.activity_main);
             };
+
+            newUserButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.newUserLayout);
+            };
+        }
+    }
+
+    class NewUserController : Controller
+    {
+        EditText usernameText;
+        EditText passwordText;
+        Button confirmButton;
+        Button cancelButton;
+
+        public NewUserController(MainActivity act)
+        {
+            usernameText = act.FindViewById<EditText>(Resource.Id.editUsername);
+            passwordText = act.FindViewById<EditText>(Resource.Id.editPassword);
+            confirmButton = act.FindViewById<Button>(Resource.Id.buttonConfirm);
+            cancelButton = act.FindViewById<Button>(Resource.Id.buttonCancel);
+
+            confirmButton.Click += (sender, e) =>
+            {
+                // TODO: handle login attempt
+                act.ChangeTo(Resource.Layout.loginLayout);
+            };
+
+            cancelButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.loginLayout);
+            };
         }
     }
 
diff --git a/MainActivity.cs b/MainActivity.cs
index 2eed008..fe6ffcb 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -46,6 +46,12 @@ public bool ChangeTo(int layout)
                 controller = new HomeController(this);
                 return true;
             }
+            else if (layout == Resource.Layout.newUserLayout)
+            {
+                SetContentView(Resource.Layout.newUserLayout);
+                controller = new NewUserController(this);
+                return true;
+            }
             else if (layout == Resource.Layout.choreListLayout)
             {
                 SetContentView(Resource.Layout.choreListLayout);
diff --git a/loginLayout.axml b/loginLayout.axml
index 6c1edee..2c5dbf9 100644
--- a/loginLayout.axml
+++ b/loginLayout.axml
@@ -27,8 +27,13 @@
 		android:clickable="false"
 		android:inputType="none|textPassword" />
 	<Button
-		android:text="Enter"
+		android:text="Login"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/buttonLogin" />
+	<Button
+		android:text="New User"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonNewUser" />
 </LinearLayout>
diff --git a/newUserLayout.axml b/newUserLayout.axml
new file mode 100644
index 0000000..912429f
--- /dev/null
+++ b/newUserLayout.axml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Username:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:id="@+id/textUsername" />
+	<android.support.design.widget.TextInputEditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/editUsername" />
+	<TextView
+		android:text="Password:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/textPassword" />
+	<android.support.design.widget.TextInputEditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:inputType="none|textPassword" />
+		android:id="@+id/editPassword" />
+	<Button
+		android:text="Confirm"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonConfirm" />
+	<Button
+		android:text="Cancel"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonCancel" />
+
+</LinearLayout>

From e66f87ef92136278da4889ea7a517d6b4cada0b3 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Fri, 9 Nov 2018 07:16:00 -0800
Subject: [PATCH 04/11] Created new layouts and controllers

---
 Controller.cs          | 238 +++++++++++++++++++++++++++++++++++++++--
 MainActivity.cs        |  42 +++++++-
 choreCreateLayout.axml |  29 +++++
 choreEditLayout.axml   |  34 ++++++
 choreListLayout.axml   |  33 ++++--
 groupCreateLayout.axml |  29 +++++
 groupListLayout.axml   |  45 ++++++++
 joinGroupLayout.axml   |  29 +++++
 mainMenuLayout.axml    |  23 ++++
 9 files changed, 481 insertions(+), 21 deletions(-)
 create mode 100644 choreCreateLayout.axml
 create mode 100644 choreEditLayout.axml
 create mode 100644 groupCreateLayout.axml
 create mode 100644 groupListLayout.axml
 create mode 100644 joinGroupLayout.axml
 create mode 100644 mainMenuLayout.axml

diff --git a/Controller.cs b/Controller.cs
index 2892c1e..3cee08d 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -38,7 +38,7 @@ public LoginController(MainActivity act)
             loginButton.Click += (sender, e) =>
             {
                 // TODO: handle login attempt
-                act.ChangeTo(Resource.Layout.activity_main);
+                act.ChangeTo(Resource.Layout.choreListLayout);
             };
 
             newUserButton.Click += (sender, e) =>
@@ -110,29 +110,253 @@ public static string AddTestChore(string name, MainActivity act)
         }
     }
 
+    class MenuController : Controller
+    {
+        Button testGoToTasksButton;
+        Button testGoToGroupsButton;
+        ListView menuListView;
+        List<string> menuOptions = new List<string>
+        {
+            "Profile",
+            "Groups",
+            "Task List",
+            "Back",
+            "Log Out"
+        };
+
+        public MenuController(MainActivity act)
+        {
+            testGoToTasksButton = act.FindViewById<Button>(Resource.Id.buttonMenuToTaskList);
+            testGoToGroupsButton = act.FindViewById<Button>(Resource.Id.buttonMenuToGroupList);
+
+            testGoToTasksButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+
+            testGoToGroupsButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.groupListLayout);
+            };
+        }
+    }
+
     class ChoreListController:Controller
     {
-        Button homeButton;
-        //Xamarin.Forms.ListView choreListView;
+        Button mainMenuButton;
+        Button addChoreButton;
         ListView choreListView;
 
         public ChoreListController(MainActivity act)
         {
-            homeButton = act.FindViewById<Button>(Resource.Id.buttonHome);
+            mainMenuButton = act.FindViewById<Button>(Resource.Id.menuButtonChoreList);
+            addChoreButton = act.FindViewById<Button>(Resource.Id.buttonAddChore);
             choreListView = act.FindViewById<ListView>(Resource.Id.listOfChores);
 
-            homeButton.Click += (sender, e) =>
+            SetupList(act);
+
+            mainMenuButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.mainMenuLayout);
+            };
+
+            addChoreButton.Click += (sender, e) =>
             {
-                act.ChangeTo(Resource.Layout.activity_main);
+                act.ChangeTo(Resource.Layout.choreCreateLayout);
             };
         }
 
+        private void SetupTestList(MainActivity act)
+        {
+            List<string> itemList = new List<string>
+            {
+                "item 0",
+                "item 1",
+                "item 2",
+                "item 3",
+                "item 4",
+                "item 5"
+            };
+
+            ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, itemList);
+            choreListView.Adapter = adapter;
+        }
+
         private void SetupList(MainActivity act)
         {
             List<string> choreNames = act.getMainGroup().GetTaskList().GetChoreNames();
+            ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, choreNames);
+            choreListView.Adapter = adapter;
             // TODO: add stuff to chore list and make it display them
-            //choreListView.ItemsSource.Add();
+        }
+    }
+
+    class ChoreCreationController : Controller
+    {
+        EditText newChoreNameText;
+        Button confirmChoreButton;
+        Button backButton;
+
+        public ChoreCreationController(MainActivity act)
+        {
+            newChoreNameText = act.FindViewById<EditText>(Resource.Id.editNewChoreName);
+            confirmChoreButton = act.FindViewById<Button>(Resource.Id.buttonAddChore);
+            backButton = act.FindViewById<Button>(Resource.Id.buttonCreateChoreToChoreList);
+            
+            confirmChoreButton.Click += (sender, e) =>
+            {
+                // TODO: consider making addTestChore a bool and using that to determine if the chore was added
+                AddTestChore(newChoreNameText.Text, act);
+                newChoreNameText.Text = "chore added";
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+
+            backButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+        }
+
+        public static string AddTestChore(string name, MainActivity act)
+        {
+            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
+            act.getMainGroup().AddChore(chore);
+            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+        }
+    }
+
+    class ChoreEditController : Controller
+    {
+        EditText desiredChoreNameText;
+        Button confirmChoreButton;
+        Button completeChoreButton;
+        Button backButton;
+
+        public ChoreEditController(MainActivity act)
+        {
+            desiredChoreNameText = act.FindViewById<EditText>(Resource.Id.editChoreEditText);
+            confirmChoreButton = act.FindViewById<Button>(Resource.Id.buttonConfirmEditChore);
+            completeChoreButton = act.FindViewById<Button>(Resource.Id.buttonCompleteChore);
+            backButton = act.FindViewById<Button>(Resource.Id.buttonChoreEditToChoreList);
+
+            backButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+        }
 
+        public static string AddTestChore(string name, MainActivity act)
+        {
+            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
+            act.getMainGroup().AddChore(chore);
+            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+        }
+    }
+
+    class GroupListController : Controller
+    {
+        Button mainMenuButton;
+        Button joinGroupButton;
+        Button createGroupButton;
+        ListView groupListView;
+
+        public GroupListController(MainActivity act)
+        {
+            mainMenuButton = act.FindViewById<Button>(Resource.Id.menuButtonGroupList);
+            joinGroupButton = act.FindViewById<Button>(Resource.Id.buttonJoinGroup);
+            createGroupButton = act.FindViewById<Button>(Resource.Id.buttonCreateGroup);
+            groupListView = act.FindViewById<ListView>(Resource.Id.listOfGroups);
+
+            SetupTestList(act);
+
+            mainMenuButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.mainMenuLayout);
+            };
+
+            joinGroupButton.Click += (sender, e) =>
+            {
+                //act.ChangeTo(Resource.Layout.joinGroupLayout);
+            };
+
+            createGroupButton.Click += (sender, e) =>
+            {
+                //act.ChangeTo(Resource.Layout.createGroupLayout);
+            };
+        }
+
+        private void SetupTestList(MainActivity act)
+        {
+            List<string> itemList = new List<string>
+            {
+                "item 0",
+                "item 1",
+                "item 2",
+                "item 3",
+                "item 4",
+                "item 5"
+            };
+
+            ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, itemList);
+            groupListView.Adapter = adapter;
+        }
+
+        private void SetupList(MainActivity act)
+        {
+            // TODO: add groups to group list and make it display them
+        }
+    }
+
+    class GroupCreateController : Controller
+    {
+        EditText newGroupNameText;
+        Button confirmGroupButton;
+        Button backButton;
+
+        public GroupCreateController(MainActivity act)
+        {
+            newGroupNameText = act.FindViewById<EditText>(Resource.Id.editNewGroupName);
+            confirmGroupButton = act.FindViewById<Button>(Resource.Id.buttonConfirmNewGroup);
+            backButton = act.FindViewById<Button>(Resource.Id.buttonGroupCreateLayoutToGroupList);
+
+            confirmGroupButton.Click += (sender, e) =>
+            {
+                // TODO: consider making addTestChore a bool and using that to determine if the chore was added
+                AddTestChore(newGroupNameText.Text, act);
+                newGroupNameText.Text = "chore added";
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+
+            backButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+        }
+
+        public static string AddTestChore(string name, MainActivity act)
+        {
+            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
+            act.getMainGroup().AddChore(chore);
+            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+        }
+    }
+
+    class JoinGroupController : Controller
+    {
+        EditText newGroupNameText;
+        Button joinGroupButton;
+        Button backButton;
+
+        public JoinGroupController(MainActivity act)
+        {/*
+            newGroupNameText = act.FindViewById<EditText>(Resource.Id.editJoinGroupName);
+            joinGroupButton = act.FindViewById<Button>(Resource.Id.buttonConfirmJoinGroup);
+            backButton = act.FindViewById<Button>(Resource.Id.buttonJoinGroupToChoreList);
+
+            backButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };*/
         }
     }
 }
\ No newline at end of file
diff --git a/MainActivity.cs b/MainActivity.cs
index fe6ffcb..ea32cf1 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -52,16 +52,52 @@ public bool ChangeTo(int layout)
                 controller = new NewUserController(this);
                 return true;
             }
+            else if (layout == Resource.Layout.loginLayout)
+            {
+                SetContentView(Resource.Layout.loginLayout);
+                controller = new LoginController(this);
+                return true;
+            }
+            else if (layout == Resource.Layout.mainMenuLayout)
+            {
+                SetContentView(Resource.Layout.mainMenuLayout);
+                controller = new MenuController(this);
+                return true;
+            }
             else if (layout == Resource.Layout.choreListLayout)
             {
                 SetContentView(Resource.Layout.choreListLayout);
                 controller = new ChoreListController(this);
                 return true;
             }
-            else if(layout == Resource.Layout.loginLayout)
+            else if (layout == Resource.Layout.choreCreateLayout)
             {
-                SetContentView(Resource.Layout.loginLayout);
-                controller = new LoginController(this);
+                SetContentView(Resource.Layout.choreCreateLayout);
+                controller = new ChoreCreationController(this);
+                return true;
+            }
+            else if (layout == Resource.Layout.choreEditLayout)
+            {
+                SetContentView(Resource.Layout.choreEditLayout);
+                //controller = new ChoreEditController(this);
+                return true;
+            }
+            else if (layout == Resource.Layout.groupListLayout)
+            {
+                SetContentView(Resource.Layout.groupListLayout);
+                controller = new GroupListController(this);
+                return true;
+            }
+            else if (layout == Resource.Layout.groupCreateLayout)
+            {
+                SetContentView(Resource.Layout.groupCreateLayout);
+                controller = new GroupCreateController(this);
+                return true;
+            }
+            else if (layout == Resource.Layout.joinGroupLayout)
+            {
+                SetContentView(Resource.Layout.groupCreateLayout);
+                controller = new JoinGroupController(this);
                 return true;
             }
             else
diff --git a/choreCreateLayout.axml b/choreCreateLayout.axml
new file mode 100644
index 0000000..485be1a
--- /dev/null
+++ b/choreCreateLayout.axml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="New Chore:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:id="@+id/textNewChoreName" />
+	<EditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/editNewChoreName" />
+	<Button
+		android:text="Create Chore"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonAddChore" />
+	<Button
+		android:text="Back"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonCreateChoreToChoreList" />
+
+</LinearLayout>
diff --git a/choreEditLayout.axml b/choreEditLayout.axml
new file mode 100644
index 0000000..34af2c4
--- /dev/null
+++ b/choreEditLayout.axml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Edited Chore Name:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:id="@+id/textChoreEdit" />
+	<EditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/editChoreEditText" />
+	<Button
+		android:text="Confirm Edits"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonConfirmEditChore" />
+	<Button
+		android:text="Complete Chore"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonCompleteChore" />
+	<Button
+		android:text="Back"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonChoreEditToChoreList" />
+
+</LinearLayout>
diff --git a/choreListLayout.axml b/choreListLayout.axml
index 34e85cf..4164144 100644
--- a/choreListLayout.axml
+++ b/choreListLayout.axml
@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 	<TextView
 		android:text="Chores:"
 		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_width="120dp"
+		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
 		android:id="@+id/textChoresHeader" />
-	<Button
-		android:text="Home"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/buttonHome" />
 	<ListView
 		android:minWidth="25px"
 		android:minHeight="25px"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="260.5dp"
+		android:layout_below="@id/textChoresHeader"
 		android:id="@+id/listOfChores" />
+	<Button
+		android:text="+"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/listOfChores"
+		android:id="@+id/buttonAddChore" />
+	<Button
+		android:text="⋮"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentRight="true"
+		android:id="@+id/menuButtonChoreList"
+		android:layout_marginBottom="0.0dp" />
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/groupCreateLayout.axml b/groupCreateLayout.axml
new file mode 100644
index 0000000..73b1fe9
--- /dev/null
+++ b/groupCreateLayout.axml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Large Text"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:id="@+id/textNewGroupName" />
+	<EditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/editNewGroupName" />
+	<Button
+		android:text="Confirm Group"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonConfirmNewGroup" />
+	<Button
+		android:text="Back"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonGroupCreateLayoutToGroupList" />
+
+</LinearLayout>
diff --git a/groupListLayout.axml b/groupListLayout.axml
new file mode 100644
index 0000000..a380a23
--- /dev/null
+++ b/groupListLayout.axml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Groups:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="120dp"
+		android:layout_height="36.0dp"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:id="@+id/textGroupsHeader" />
+	<ListView
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:layout_width="match_parent"
+		android:layout_height="260.5dp"
+		android:layout_below="@id/textGroupsHeader"
+		android:id="@+id/listOfGroups" />
+	<Button
+		android:text="Join"
+		android:layout_width="100.0dp"
+		android:layout_height="wrap_content"
+		android:layout_alignParentLeft="true"
+		android:layout_below="@+id/listOfGroups"
+		android:id="@+id/buttonJoinGroup" />
+	<Button
+		android:text="Create"
+		android:layout_width="100.0dp"
+		android:layout_height="wrap_content"
+		android:layout_alignParentRight="true"
+		android:layout_below="@+id/listOfGroups"
+		android:id="@+id/buttonCreateGroup" />
+	<Button
+		android:text="⋮"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentRight="true"
+		android:id="@+id/menuButtonGroupList"
+		android:layout_marginBottom="0.0dp" />
+
+</RelativeLayout>
diff --git a/joinGroupLayout.axml b/joinGroupLayout.axml
new file mode 100644
index 0000000..7f6af01
--- /dev/null
+++ b/joinGroupLayout.axml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<TextView
+		android:text="Desired Group Name:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:id="@+id/textJoinGroupName" />
+	<EditText
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/editJoinGroupName" />
+	<Button
+		android:text="Confrim Join"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonConfirmJoinGroup" />
+	<Button
+		android:text="Back"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonJoinGroupToChoreList" />
+
+</LinearLayout>
diff --git a/mainMenuLayout.axml b/mainMenuLayout.axml
new file mode 100644
index 0000000..0431b30
--- /dev/null
+++ b/mainMenuLayout.axml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<Button
+		android:text="Task List"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonMenuToTaskList" />
+	<Button
+		android:text="Group List"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonMenuToGroupList" />
+	<ListView
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:id="@+id/listMenuOptions" />
+	
+</LinearLayout>

From a2a5b789af0c500628096edc1b02b8cc6027cd78 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Tue, 13 Nov 2018 22:48:44 -0800
Subject: [PATCH 05/11] Added list/edit/complete chore functionality

---
 Chore.cs               | 30 ++++++++++++++
 Controller.cs          | 94 ++++++++++++++++++++++++++++++++++++------
 Group.cs               |  8 +++-
 MainActivity.cs        | 47 +++++++++++++++------
 SessionData.cs         | 81 ++++++++++++++++++++++++++++++++++++
 TaskList.cs            | 15 +++++++
 Timestamp.cs           |  8 ++++
 groupCreateLayout.axml |  2 +-
 8 files changed, 258 insertions(+), 27 deletions(-)
 create mode 100644 SessionData.cs

diff --git a/Chore.cs b/Chore.cs
index b3e8fac..92ac50f 100644
--- a/Chore.cs
+++ b/Chore.cs
@@ -26,6 +26,18 @@ public Chore(string name, int passedUserId, string deadline)
             deadlineTimestamp = new Timestamp(deadline);
         }
 
+        public Chore(Chore old)
+        {
+            choreId = old.choreId;
+            choreName = old.choreName;
+            assignedUserId = old.assignedUserId;
+            completedUserId = old.completedUserId;
+            deadlineTimestamp = new Timestamp(old.deadlineTimestamp);
+            completedTimestamp = new Timestamp(old.completedTimestamp);
+            isPriority = old.isPriority;
+            isCompleted = old.isCompleted;
+        }
+
         int generateChoreId()
         {
             //TODO: fetch greatest chore id and increment by 1
@@ -66,5 +78,23 @@ public string GetName()
         {
             return (choreName);
         }
+
+        //for testing?
+        public string SetName(string name)
+        {
+            choreName = name;
+            return choreName;
+        }
+
+        public bool isComplete()
+        {
+            return isCompleted;
+        }
+
+        public bool SetComplete(bool completed)
+        {
+            isCompleted = completed;
+            return isCompleted;
+        }
     }
 }
\ No newline at end of file
diff --git a/Controller.cs b/Controller.cs
index 3cee08d..88fbbb5 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -14,7 +14,7 @@
 
 using ChoreChomper.Model;
 
-namespace ChoreChomper.ViewControllers
+namespace ChoreChomper.Controller
 {
     class Controller
     {
@@ -143,16 +143,19 @@ public MenuController(MainActivity act)
 
     class ChoreListController:Controller
     {
+        List<Chore> chores;
         Button mainMenuButton;
         Button addChoreButton;
         ListView choreListView;
-
+        
         public ChoreListController(MainActivity act)
         {
+            chores = SetupChores(act);
             mainMenuButton = act.FindViewById<Button>(Resource.Id.menuButtonChoreList);
             addChoreButton = act.FindViewById<Button>(Resource.Id.buttonAddChore);
             choreListView = act.FindViewById<ListView>(Resource.Id.listOfChores);
 
+            SetupChores(act);
             SetupList(act);
 
             mainMenuButton.Click += (sender, e) =>
@@ -164,6 +167,25 @@ public ChoreListController(MainActivity act)
             {
                 act.ChangeTo(Resource.Layout.choreCreateLayout);
             };
+
+            choreListView.ItemClick += (sender, e) =>
+            {
+                Chore targetChore = chores[(int)e.Id];
+                act.SetTargetChore(targetChore);
+                act.ChangeTo(Resource.Layout.choreEditLayout);
+            };
+        }
+
+        private List<Chore> SetupChores (MainActivity act)
+        {
+            List<Chore> fullList = act.getMainGroup().GetTaskList().GetChoreList();
+            List<Chore> ListOfIncomplete = new List<Chore>();
+            foreach (Chore c in fullList)
+            {
+                if (!c.isComplete())
+                    ListOfIncomplete.Add(c);
+            }
+            return ListOfIncomplete;
         }
 
         private void SetupTestList(MainActivity act)
@@ -184,7 +206,11 @@ private void SetupTestList(MainActivity act)
 
         private void SetupList(MainActivity act)
         {
-            List<string> choreNames = act.getMainGroup().GetTaskList().GetChoreNames();
+            List<string> choreNames = new List<string>();
+            foreach (Chore c in chores)
+            {
+                choreNames.Add(c.GetName());
+            }
             ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, choreNames);
             choreListView.Adapter = adapter;
             // TODO: add stuff to chore list and make it display them
@@ -227,6 +253,7 @@ public static string AddTestChore(string name, MainActivity act)
 
     class ChoreEditController : Controller
     {
+        Chore targetChore;
         EditText desiredChoreNameText;
         Button confirmChoreButton;
         Button completeChoreButton;
@@ -234,10 +261,29 @@ class ChoreEditController : Controller
 
         public ChoreEditController(MainActivity act)
         {
+            targetChore = act.GetTargetChore();
             desiredChoreNameText = act.FindViewById<EditText>(Resource.Id.editChoreEditText);
             confirmChoreButton = act.FindViewById<Button>(Resource.Id.buttonConfirmEditChore);
             completeChoreButton = act.FindViewById<Button>(Resource.Id.buttonCompleteChore);
             backButton = act.FindViewById<Button>(Resource.Id.buttonChoreEditToChoreList);
+            desiredChoreNameText.Text = targetChore.GetName();
+
+            confirmChoreButton.Click += (sender, e) =>
+            {
+                ApplyEdits();
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+            
+            void ApplyEdits()
+            {
+                targetChore.SetName(desiredChoreNameText.Text);
+            }
+
+            completeChoreButton.Click += (sender, e) =>
+            {
+                targetChore.SetComplete(true);
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
 
             backButton.Click += (sender, e) =>
             {
@@ -255,6 +301,7 @@ public static string AddTestChore(string name, MainActivity act)
 
     class GroupListController : Controller
     {
+        List<Group> groups;
         Button mainMenuButton;
         Button joinGroupButton;
         Button createGroupButton;
@@ -267,21 +314,27 @@ public GroupListController(MainActivity act)
             createGroupButton = act.FindViewById<Button>(Resource.Id.buttonCreateGroup);
             groupListView = act.FindViewById<ListView>(Resource.Id.listOfGroups);
 
-            SetupTestList(act);
+            SetupList(act);
 
             mainMenuButton.Click += (sender, e) =>
             {
                 act.ChangeTo(Resource.Layout.mainMenuLayout);
             };
 
+            groupListView.ItemClick += (sender, e) =>
+            {
+                Group targetGroup = groups[(int)e.Id];
+                act.SetTargetGroup(targetGroup);
+            };
+
             joinGroupButton.Click += (sender, e) =>
             {
-                //act.ChangeTo(Resource.Layout.joinGroupLayout);
+                act.ChangeTo(Resource.Layout.joinGroupLayout);
             };
 
             createGroupButton.Click += (sender, e) =>
             {
-                //act.ChangeTo(Resource.Layout.createGroupLayout);
+                act.ChangeTo(Resource.Layout.groupCreateLayout);
             };
         }
 
@@ -303,7 +356,14 @@ private void SetupTestList(MainActivity act)
 
         private void SetupList(MainActivity act)
         {
-            // TODO: add groups to group list and make it display them
+            groups = act.getUsersGroups();
+            List<string> groupNames = new List<string>();
+            foreach (Group g in groups)
+            {
+                groupNames.Add(g.getName());
+            }
+            ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, groupNames);
+            groupListView.Adapter = adapter;
         }
     }
 
@@ -324,12 +384,12 @@ public GroupCreateController(MainActivity act)
                 // TODO: consider making addTestChore a bool and using that to determine if the chore was added
                 AddTestChore(newGroupNameText.Text, act);
                 newGroupNameText.Text = "chore added";
-                act.ChangeTo(Resource.Layout.choreListLayout);
+                act.ChangeTo(Resource.Layout.groupListLayout);
             };
 
             backButton.Click += (sender, e) =>
             {
-                act.ChangeTo(Resource.Layout.choreListLayout);
+                act.ChangeTo(Resource.Layout.groupListLayout);
             };
         }
 
@@ -348,15 +408,23 @@ class JoinGroupController : Controller
         Button backButton;
 
         public JoinGroupController(MainActivity act)
-        {/*
+        {
             newGroupNameText = act.FindViewById<EditText>(Resource.Id.editJoinGroupName);
             joinGroupButton = act.FindViewById<Button>(Resource.Id.buttonConfirmJoinGroup);
             backButton = act.FindViewById<Button>(Resource.Id.buttonJoinGroupToChoreList);
-
+            
+            /*
+            joinGroupButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.groupListLayout);
+                // TODO: actually join the group with the entered credentials
+            };
+            
             backButton.Click += (sender, e) =>
             {
-                act.ChangeTo(Resource.Layout.choreListLayout);
-            };*/
+                act.ChangeTo(Resource.Layout.groupListLayout);
+            };
+            */
         }
     }
 }
\ No newline at end of file
diff --git a/Group.cs b/Group.cs
index 9d77518..30b2c8b 100644
--- a/Group.cs
+++ b/Group.cs
@@ -21,7 +21,7 @@ public Group()
         public bool AssignGroup(int groupId)
         {
             //TODO:
-            //Fetch Grouup data corresponding to groupId
+            //Fetch Group data corresponding to groupId
             //Assign data values to group
             valid = true;
             //return false if group was not created or true if it was
@@ -40,6 +40,7 @@ public bool AssignGroup(string groupName)
         
         public Group GenerateNew(string Name)
         {
+            //TODO:
             //Add a new group to the database with name Name
             //Add the local user to the group's list of users
             return (new Group());
@@ -71,5 +72,10 @@ public TaskList GetTaskList()
         {
             return(tasks);
         }
+
+        public string getName()
+        {
+            return groupName;
+        }
     }
 }
\ No newline at end of file
diff --git a/MainActivity.cs b/MainActivity.cs
index ea32cf1..476155b 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -4,20 +4,19 @@
 using Android.Support.V7.Widget;
 using Android.Runtime;
 using Android.Widget;
+using System.Collections.Generic;
 
-using ChoreChomper.ViewControllers;
+using ChoreChomper.Controller;
 using ChoreChomper.Model;
+using ChoreChomper.Data;
 
 namespace ChoreChomper
 {
     [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true)]
     public class MainActivity : AppCompatActivity
     {
-        ChoreChomper.ViewControllers.Controller controller;
-        ChoreChomper.Model.User user;
-        ChoreChomper.Model.Group group;
-        public User getMainUser() { return user; }
-        public Group getMainGroup() { return group; }
+        ChoreChomper.Controller.Controller controller;
+        SessionData currentSession = new SessionData();
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
@@ -31,11 +30,35 @@ protected override void OnCreate(Bundle savedInstanceState)
             controller = new LoginController(this);
         }
         
+        public User getMainUser() { return currentSession.getCurrentUser(); }
+        public Group getMainGroup() { return currentSession.getUsersGroups()[0]; }
+        public List<Group> getUsersGroups() { return currentSession.getUsersGroups(); }
+        public Group GetTargetGroup() { return currentSession.GetTargetGroup(); }
+        public Chore GetTargetChore() { return currentSession.GetTargetChore(); }
+        public Group SetTargetGroup(Group group)
+        {
+            currentSession.SetTargetGroup(group);
+            return GetTargetGroup();
+        }
+        public Chore SetTargetChore(Chore chore)
+        {
+            currentSession.SetTargetChore(chore);
+            return GetTargetChore();
+        }
+
+        private void AttemptLogin(string username, string password)
+        {
+            bool credentialsAreValid = true;
+            // TODO: check database to see if these credentials are valid
+            if (credentialsAreValid)
+            {
+                currentSession.LoadUser(username);
+            }
+        }
+
         private void SetupUserData()
         {
-            user = new User().GenerateTestUser();
-            group = new Group().GenerateTestGroup();
-            group.AddUser(user);
+            currentSession.GenerateTestSession();
         }
 
         public bool ChangeTo(int layout)
@@ -79,7 +102,7 @@ public bool ChangeTo(int layout)
             else if (layout == Resource.Layout.choreEditLayout)
             {
                 SetContentView(Resource.Layout.choreEditLayout);
-                //controller = new ChoreEditController(this);
+                controller = new ChoreEditController(this);
                 return true;
             }
             else if (layout == Resource.Layout.groupListLayout)
@@ -93,13 +116,13 @@ public bool ChangeTo(int layout)
                 SetContentView(Resource.Layout.groupCreateLayout);
                 controller = new GroupCreateController(this);
                 return true;
-            }
+            }/*
             else if (layout == Resource.Layout.joinGroupLayout)
             {
                 SetContentView(Resource.Layout.groupCreateLayout);
                 controller = new JoinGroupController(this);
                 return true;
-            }
+            }*/
             else
                 return false;
         }
diff --git a/SessionData.cs b/SessionData.cs
new file mode 100644
index 0000000..9fe6242
--- /dev/null
+++ b/SessionData.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+using ChoreChomper.Model;
+
+namespace ChoreChomper.Data
+{
+    class SessionData
+    {
+        User currentUser = null;
+        List<Group> usersGroups = new List<Group>();
+        Group targetGroup;
+        Chore targetChore;
+
+        public SessionData()
+        {
+            ;
+        }
+
+        public User getCurrentUser()
+        {
+            return currentUser;
+        }
+
+        public List<Group> getUsersGroups()
+        {
+            return usersGroups;
+        }
+
+        public Group GetTargetGroup()
+        {
+            return targetGroup;
+        }
+
+        public Group SetTargetGroup(Group group)
+        {
+            targetGroup = group;
+            return targetGroup;
+        }
+
+        public Chore GetTargetChore()
+        {
+            return targetChore;
+        }
+
+        public Chore SetTargetChore(Chore chore)
+        {
+            targetChore = chore;
+            return targetChore;
+        }
+
+        public void LoadUser(string username)
+        {
+            currentUser = new User(username);
+            LoadUsersGroups(currentUser.GetId());
+        }
+
+        private void LoadUsersGroups(int UserId)
+        {
+            // TODO: get a list of all group information associated with user from database and put them in userGroups;
+        }
+        
+        public void GenerateTestSession()
+        {
+            currentUser = new User().GenerateTestUser();
+            usersGroups = new List<Group>();
+            Group testGroup = new Group().GenerateTestGroup();
+            testGroup.AddUser(currentUser);
+            usersGroups.Add(testGroup);
+        }
+    }
+}
\ No newline at end of file
diff --git a/TaskList.cs b/TaskList.cs
index 56b0baf..58fedde 100644
--- a/TaskList.cs
+++ b/TaskList.cs
@@ -45,5 +45,20 @@ public List<string> GetChoreNames()
 
             return desiredList;
         }
+
+        public List<Chore> GetChoreListCopy()
+        {
+            List<Chore> returnList = new List<Chore>();
+            foreach (Chore c in choreList)
+            {
+                returnList.Add(new Chore(c));
+            }
+            return returnList;
+        }
+
+        public List<Chore> GetChoreList()
+        {
+            return choreList;
+        }
     }
 }
\ No newline at end of file
diff --git a/Timestamp.cs b/Timestamp.cs
index 04d9f50..2ac269a 100644
--- a/Timestamp.cs
+++ b/Timestamp.cs
@@ -17,6 +17,14 @@ public Timestamp()
             isValid = false;
         }
 
+        public Timestamp(Timestamp old)
+        {
+            day = old.day;
+            month = old.month;
+            year = old.year;
+            isValid = old.isValid;
+        }
+
         public Timestamp(int passDay, int passMonth, int passYear)
         {
             day = passDay;
diff --git a/groupCreateLayout.axml b/groupCreateLayout.axml
index 73b1fe9..fc4184d 100644
--- a/groupCreateLayout.axml
+++ b/groupCreateLayout.axml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 	<TextView
-		android:text="Large Text"
+		android:text="Group Name"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

From e7d4baa9cb0f4e73396b1016bfed25fdfbeaae1b Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Fri, 16 Nov 2018 00:26:38 -0800
Subject: [PATCH 06/11] updated UI, improvements with groups

---
 Controller.cs          | 36 ++++++++++++++++++++++++++++--------
 MainActivity.cs        | 42 +++++++++++++++++++-----------------------
 choreCreateLayout.axml |  6 ++++--
 choreEditLayout.axml   |  4 +++-
 choreListLayout.axml   | 10 +++++++++-
 groupCreateLayout.axml |  4 +++-
 groupListLayout.axml   |  9 +++++++++
 joinGroupLayout.axml   |  4 +++-
 loginLayout.axml       |  6 +++++-
 newUserLayout.axml     |  4 +++-
 10 files changed, 86 insertions(+), 39 deletions(-)

diff --git a/Controller.cs b/Controller.cs
index 88fbbb5..5e02504 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -151,7 +151,7 @@ class ChoreListController:Controller
         public ChoreListController(MainActivity act)
         {
             chores = SetupChores(act);
-            mainMenuButton = act.FindViewById<Button>(Resource.Id.menuButtonChoreList);
+            mainMenuButton = act.FindViewById<Button>(Resource.Id.navButtonChoreList);
             addChoreButton = act.FindViewById<Button>(Resource.Id.buttonAddChore);
             choreListView = act.FindViewById<ListView>(Resource.Id.listOfChores);
 
@@ -309,7 +309,7 @@ class GroupListController : Controller
 
         public GroupListController(MainActivity act)
         {
-            mainMenuButton = act.FindViewById<Button>(Resource.Id.menuButtonGroupList);
+            mainMenuButton = act.FindViewById<Button>(Resource.Id.navButtonGroupList);
             joinGroupButton = act.FindViewById<Button>(Resource.Id.buttonJoinGroup);
             createGroupButton = act.FindViewById<Button>(Resource.Id.buttonCreateGroup);
             groupListView = act.FindViewById<ListView>(Resource.Id.listOfGroups);
@@ -325,6 +325,7 @@ public GroupListController(MainActivity act)
             {
                 Group targetGroup = groups[(int)e.Id];
                 act.SetTargetGroup(targetGroup);
+                SetupList(act);
             };
 
             joinGroupButton.Click += (sender, e) =>
@@ -357,13 +358,34 @@ private void SetupTestList(MainActivity act)
         private void SetupList(MainActivity act)
         {
             groups = act.getUsersGroups();
-            List<string> groupNames = new List<string>();
+            List<Group> orderedGroups = CreateOrderedGroupList(groups, act);
+            List<string> groupNames = GetNamesOfGroups(orderedGroups);
+            ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, groupNames);
+            groupListView.Adapter = adapter;
+        }
+
+        private List<Group> CreateOrderedGroupList(List<Group> groups, MainActivity act)
+        {
+            List<Group> orderedGroups = new List<Group>();
+            Group currentTargetGroup = act.GetTargetGroup();
             foreach (Group g in groups)
             {
-                groupNames.Add(g.getName());
+                if (g == currentTargetGroup)
+                    orderedGroups.Insert(0, g);
+                else
+                    orderedGroups.Add(g);
             }
-            ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, groupNames);
-            groupListView.Adapter = adapter;
+            return orderedGroups;
+        }
+
+        private List<string> GetNamesOfGroups(List<Group> orderedGroups)
+        {
+            List<string> names = new List<string>();
+            foreach (Group g in orderedGroups)
+            {
+                names.Add(g.getName());
+            }
+            return names;
         }
     }
 
@@ -413,7 +435,6 @@ public JoinGroupController(MainActivity act)
             joinGroupButton = act.FindViewById<Button>(Resource.Id.buttonConfirmJoinGroup);
             backButton = act.FindViewById<Button>(Resource.Id.buttonJoinGroupToChoreList);
             
-            /*
             joinGroupButton.Click += (sender, e) =>
             {
                 act.ChangeTo(Resource.Layout.groupListLayout);
@@ -424,7 +445,6 @@ public JoinGroupController(MainActivity act)
             {
                 act.ChangeTo(Resource.Layout.groupListLayout);
             };
-            */
         }
     }
 }
\ No newline at end of file
diff --git a/MainActivity.cs b/MainActivity.cs
index 476155b..311b0eb 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -63,68 +63,64 @@ private void SetupUserData()
 
         public bool ChangeTo(int layout)
         {
+            bool valid = true;
+
             if (layout == Resource.Layout.activity_main)
             {
-                SetContentView(Resource.Layout.activity_main);
+                SetContentView(layout);
                 controller = new HomeController(this);
-                return true;
             }
             else if (layout == Resource.Layout.newUserLayout)
             {
-                SetContentView(Resource.Layout.newUserLayout);
+                SetContentView(layout);
                 controller = new NewUserController(this);
-                return true;
             }
             else if (layout == Resource.Layout.loginLayout)
             {
-                SetContentView(Resource.Layout.loginLayout);
+                SetContentView(layout);
                 controller = new LoginController(this);
-                return true;
             }
             else if (layout == Resource.Layout.mainMenuLayout)
             {
-                SetContentView(Resource.Layout.mainMenuLayout);
+                SetContentView(layout);
                 controller = new MenuController(this);
-                return true;
             }
             else if (layout == Resource.Layout.choreListLayout)
             {
-                SetContentView(Resource.Layout.choreListLayout);
+                SetContentView(layout);
                 controller = new ChoreListController(this);
-                return true;
             }
             else if (layout == Resource.Layout.choreCreateLayout)
             {
-                SetContentView(Resource.Layout.choreCreateLayout);
+                SetContentView(layout);
                 controller = new ChoreCreationController(this);
-                return true;
             }
             else if (layout == Resource.Layout.choreEditLayout)
             {
-                SetContentView(Resource.Layout.choreEditLayout);
+                SetContentView(layout);
                 controller = new ChoreEditController(this);
-                return true;
             }
             else if (layout == Resource.Layout.groupListLayout)
             {
-                SetContentView(Resource.Layout.groupListLayout);
+                SetContentView(layout);
                 controller = new GroupListController(this);
-                return true;
             }
             else if (layout == Resource.Layout.groupCreateLayout)
             {
-                SetContentView(Resource.Layout.groupCreateLayout);
+                SetContentView(layout);
                 controller = new GroupCreateController(this);
-                return true;
-            }/*
+            }
             else if (layout == Resource.Layout.joinGroupLayout)
             {
-                SetContentView(Resource.Layout.groupCreateLayout);
+                SetContentView(layout);
                 controller = new JoinGroupController(this);
-                return true;
-            }*/
+            }
             else
-                return false;
+            {
+                valid = false;
+            }
+
+            return valid;
         }
     }
 }
\ No newline at end of file
diff --git a/choreCreateLayout.axml b/choreCreateLayout.axml
index 485be1a..5e7b956 100644
--- a/choreCreateLayout.axml
+++ b/choreCreateLayout.axml
@@ -6,10 +6,12 @@
 	<TextView
 		android:text="New Chore:"
 		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_width="120dp"
+		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
 		android:id="@+id/textNewChoreName" />
 	<EditText
 		android:layout_width="match_parent"
diff --git a/choreEditLayout.axml b/choreEditLayout.axml
index 34af2c4..f10602a 100644
--- a/choreEditLayout.axml
+++ b/choreEditLayout.axml
@@ -7,9 +7,11 @@
 		android:text="Edited Chore Name:"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
 		android:id="@+id/textChoreEdit" />
 	<EditText
 		android:layout_width="match_parent"
diff --git a/choreListLayout.axml b/choreListLayout.axml
index 4164144..86e108b 100644
--- a/choreListLayout.axml
+++ b/choreListLayout.axml
@@ -12,6 +12,9 @@
 		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
+		android:layout_toRightOf="@+id/navButtonChoreList"
 		android:id="@+id/textChoresHeader" />
 	<ListView
 		android:minWidth="25px"
@@ -33,5 +36,10 @@
 		android:layout_alignParentRight="true"
 		android:id="@+id/menuButtonChoreList"
 		android:layout_marginBottom="0.0dp" />
-
+	<Button
+		android:text="☰"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentLeft="true"
+		android:id="@+id/navButtonChoreList" />
 </RelativeLayout>
diff --git a/groupCreateLayout.axml b/groupCreateLayout.axml
index fc4184d..0813356 100644
--- a/groupCreateLayout.axml
+++ b/groupCreateLayout.axml
@@ -7,9 +7,11 @@
 		android:text="Group Name"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
 		android:id="@+id/textNewGroupName" />
 	<EditText
 		android:layout_width="match_parent"
diff --git a/groupListLayout.axml b/groupListLayout.axml
index a380a23..32d82fd 100644
--- a/groupListLayout.axml
+++ b/groupListLayout.axml
@@ -12,6 +12,9 @@
 		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
+		android:layout_toRightOf="@+id/navButtonGroupList"
 		android:id="@+id/textGroupsHeader" />
 	<ListView
 		android:minWidth="25px"
@@ -41,5 +44,11 @@
 		android:layout_alignParentRight="true"
 		android:id="@+id/menuButtonGroupList"
 		android:layout_marginBottom="0.0dp" />
+	<Button
+		android:text="☰"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentLeft="true"
+		android:id="@+id/navButtonGroupList" />
 
 </RelativeLayout>
diff --git a/joinGroupLayout.axml b/joinGroupLayout.axml
index 7f6af01..fa6568c 100644
--- a/joinGroupLayout.axml
+++ b/joinGroupLayout.axml
@@ -7,9 +7,11 @@
 		android:text="Desired Group Name:"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
 		android:id="@+id/textJoinGroupName" />
 	<EditText
 		android:layout_width="match_parent"
diff --git a/loginLayout.axml b/loginLayout.axml
index 2c5dbf9..983b402 100644
--- a/loginLayout.axml
+++ b/loginLayout.axml
@@ -7,7 +7,11 @@
 		android:text="Username:"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_height="36.0dp"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
 		android:id="@+id/textUsername"/>
 	<EditText
 		android:layout_width="match_parent"
diff --git a/newUserLayout.axml b/newUserLayout.axml
index 912429f..690077c 100644
--- a/newUserLayout.axml
+++ b/newUserLayout.axml
@@ -7,9 +7,11 @@
 		android:text="Username:"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
 		android:id="@+id/textUsername" />
 	<android.support.design.widget.TextInputEditText
 		android:layout_width="match_parent"

From 0f45d608525cb2f81d2f66e21c056d063dd68ec0 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Fri, 16 Nov 2018 21:31:20 -0800
Subject: [PATCH 07/11] Improved group list/creation functionality

---
 Controller.cs   | 25 +++++++++++++++----------
 Group.cs        |  4 ++--
 MainActivity.cs |  1 +
 SessionData.cs  |  9 ++++++++-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Controller.cs b/Controller.cs
index 5e02504..59da411 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -358,8 +358,8 @@ private void SetupTestList(MainActivity act)
         private void SetupList(MainActivity act)
         {
             groups = act.getUsersGroups();
-            List<Group> orderedGroups = CreateOrderedGroupList(groups, act);
-            List<string> groupNames = GetNamesOfGroups(orderedGroups);
+            groups = CreateOrderedGroupList(groups, act);
+            List<string> groupNames = GetNamesOfGroups(groups);
             ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, groupNames);
             groupListView.Adapter = adapter;
         }
@@ -403,10 +403,12 @@ public GroupCreateController(MainActivity act)
 
             confirmGroupButton.Click += (sender, e) =>
             {
-                // TODO: consider making addTestChore a bool and using that to determine if the chore was added
-                AddTestChore(newGroupNameText.Text, act);
-                newGroupNameText.Text = "chore added";
-                act.ChangeTo(Resource.Layout.groupListLayout);
+                if (newGroupNameText.Text != "group added")
+                {
+                    AddTestGroup(newGroupNameText.Text, act);
+                    newGroupNameText.Text = "group added";
+                    act.ChangeTo(Resource.Layout.groupListLayout);
+                }
             };
 
             backButton.Click += (sender, e) =>
@@ -415,11 +417,11 @@ public GroupCreateController(MainActivity act)
             };
         }
 
-        public static string AddTestChore(string name, MainActivity act)
+        public Group AddTestGroup(string name, MainActivity act)
         {
-            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
-            act.getMainGroup().AddChore(chore);
-            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+            Group group = new Group();
+            group.GenerateTestGroup(name);
+            return act.JoinGroup(group);
         }
     }
 
@@ -439,6 +441,9 @@ public JoinGroupController(MainActivity act)
             {
                 act.ChangeTo(Resource.Layout.groupListLayout);
                 // TODO: actually join the group with the entered credentials
+                //  Check if group is in database
+                //  Check if you have the key for that group
+                //  Join group in database
             };
             
             backButton.Click += (sender, e) =>
diff --git a/Group.cs b/Group.cs
index 30b2c8b..7ae2c1d 100644
--- a/Group.cs
+++ b/Group.cs
@@ -46,10 +46,10 @@ public Group GenerateNew(string Name)
             return (new Group());
         }
 
-        public Group GenerateTestGroup()
+        public Group GenerateTestGroup(string name = "Best_Group")
         {
             groupId = 0;
-            groupName = "Best_Group";
+            groupName = name;
             valid = true;
             users = new List<User>();
             tasks = new TaskList();
diff --git a/MainActivity.cs b/MainActivity.cs
index 311b0eb..27bc51b 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -35,6 +35,7 @@ protected override void OnCreate(Bundle savedInstanceState)
         public List<Group> getUsersGroups() { return currentSession.getUsersGroups(); }
         public Group GetTargetGroup() { return currentSession.GetTargetGroup(); }
         public Chore GetTargetChore() { return currentSession.GetTargetChore(); }
+        public Group JoinGroup(Group group) { return currentSession.JoinGroup(group); }
         public Group SetTargetGroup(Group group)
         {
             currentSession.SetTargetGroup(group);
diff --git a/SessionData.cs b/SessionData.cs
index 9fe6242..598a02a 100644
--- a/SessionData.cs
+++ b/SessionData.cs
@@ -64,11 +64,18 @@ public void LoadUser(string username)
             LoadUsersGroups(currentUser.GetId());
         }
 
-        private void LoadUsersGroups(int UserId)
+        private void LoadUsersGroups(int userId)
         {
             // TODO: get a list of all group information associated with user from database and put them in userGroups;
         }
         
+        public Group JoinGroup(Group newGroup)
+        {
+            usersGroups.Add(newGroup);
+            targetGroup = newGroup;
+            return targetGroup;
+        }
+
         public void GenerateTestSession()
         {
             currentUser = new User().GenerateTestUser();

From 50c5087468ea4b95b7044516ea8ba4dad758cfe1 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Sat, 17 Nov 2018 22:48:18 -0800
Subject: [PATCH 08/11] Improved/added layouts

---
 Controller.cs                |  2 +-
 choreCreateLayout.axml       | 76 +++++++++++++++++++++++++++++++-----
 choreEditLayout.axml         | 75 +++++++++++++++++++++++++++++------
 choreListSettingsLayout.axml | 71 +++++++++++++++++++++++++++++++++
 groupCreateLayout.axml       | 43 +++++++++++++++-----
 groupListLayout.axml         |  7 ----
 joinGroupLayout.axml         | 43 +++++++++++++++-----
 mainMenuLayout.axml          | 18 ++++-----
 8 files changed, 279 insertions(+), 56 deletions(-)
 create mode 100644 choreListSettingsLayout.axml

diff --git a/Controller.cs b/Controller.cs
index 59da411..db604ec 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -262,7 +262,7 @@ class ChoreEditController : Controller
         public ChoreEditController(MainActivity act)
         {
             targetChore = act.GetTargetChore();
-            desiredChoreNameText = act.FindViewById<EditText>(Resource.Id.editChoreEditText);
+            desiredChoreNameText = act.FindViewById<EditText>(Resource.Id.editChoreEditName);
             confirmChoreButton = act.FindViewById<Button>(Resource.Id.buttonConfirmEditChore);
             completeChoreButton = act.FindViewById<Button>(Resource.Id.buttonCompleteChore);
             backButton = act.FindViewById<Button>(Resource.Id.buttonChoreEditToChoreList);
diff --git a/choreCreateLayout.axml b/choreCreateLayout.axml
index 5e7b956..47d0ff8 100644
--- a/choreCreateLayout.axml
+++ b/choreCreateLayout.axml
@@ -1,31 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+	<Button
+		android:text="◄"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentLeft="true"
+		android:id="@+id/buttonCreateChoreToChoreList" />
+	<TextView
+		android:text="Create Chore:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="36.0dp"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
+		android:layout_toRightOf="@+id/buttonCreateChoreToChoreList"
+		android:id="@+id/textNewChoreHeader" />
 	<TextView
-		android:text="New Chore:"
+		android:text="Chore Name"
 		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_width="120dp"
+		android:layout_width="match_parent"
 		android:layout_height="36.0dp"
 		android:minWidth="25px"
 		android:minHeight="25px"
 		android:gravity="bottom"
 		android:textAlignment="gravity"
+		android:layout_below="@+id/buttonCreateChoreToChoreList"
 		android:id="@+id/textNewChoreName" />
 	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_below="@+id/textNewChoreName"
 		android:id="@+id/editNewChoreName" />
-	<Button
-		android:text="Create Chore"
+	<TextView
+		android:text="Assigned User"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/editNewChoreName"
+		android:id="@+id/textNewChoreAssignment" />
+	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonAddChore" />
+		android:layout_below="@+id/textNewChoreAssignment"
+		android:id="@+id/editNewChoreAssignment" />
+	<TextView
+		android:text="Chore Deadline"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/editNewChoreAssignment"
+		android:id="@+id/textNewChoreDeadline" />
+	<EditText
+		android:inputType="date"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/textNewChoreDeadline"
+		android:id="@+id/dateNewChoreDeadline" />
+	<TextView
+		android:text="Priority"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/dateNewChoreDeadline"
+		android:id="@+id/textNewChorePriority" />
+	<CheckBox
+		android:text=""
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_toRightOf="@+id/textNewChorePriority"
+		android:layout_below="@id/dateNewChoreDeadline"
+		android:id="@+id/checkNewChorePriority" />
 	<Button
-		android:text="Back"
+		android:text="Create Chore"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonCreateChoreToChoreList" />
+		android:layout_alignParentBottom="true"
+		android:id="@+id/buttonAddChore" />
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/choreEditLayout.axml b/choreEditLayout.axml
index f10602a..3f48f99 100644
--- a/choreEditLayout.axml
+++ b/choreEditLayout.axml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+	<Button
+		android:text="◄"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentLeft="true"
+		android:id="@+id/buttonChoreEditToChoreList" />
 	<TextView
-		android:text="Edited Chore Name:"
+		android:text="Edit Chore:"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
 		android:layout_height="36.0dp"
@@ -12,25 +20,70 @@
 		android:minHeight="25px"
 		android:gravity="bottom"
 		android:textAlignment="gravity"
-		android:id="@+id/textChoreEdit" />
+		android:layout_toRightOf="@+id/buttonChoreEditToChoreList"
+		android:id="@+id/textChoreEditHeader" />
+	<TextView
+		android:text="Chore Name"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/textChoreEditHeader"
+		android:id="@+id/textChoreEditName" />
 	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/editChoreEditText" />
-	<Button
-		android:text="Confirm Edits"
+		android:layout_below="@+id/textChoreEditName"
+		android:id="@+id/editChoreEditName" />
+	<TextView
+		android:text="Assigned User"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/editChoreEditName"
+		android:id="@+id/textChoreEditAssignment" />
+	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonConfirmEditChore" />
+		android:layout_below="@+id/textChoreEditAssignment"
+		android:id="@+id/editChoreEditAssignment" />
+	<TextView
+		android:text="Chore Deadline"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/editChoreEditAssignment"
+		android:id="@+id/textChoreEditDeadline" />
+	<EditText
+		android:inputType="date"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/textChoreEditDeadline"
+		android:id="@+id/editChoreEditDeadline" />
+	<TextView
+		android:text="Priority"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/editChoreEditDeadline"
+		android:id="@+id/textChoreEditPriority" />
+	<CheckBox
+		android:text=""
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_toRightOf="@+id/textChoreEditPriority"
+		android:layout_below="@+id/editChoreEditDeadline"
+		android:id="@+id/checkChoreEditPriority" />
 	<Button
 		android:text="Complete Chore"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_above="@+id/buttonConfirmEditChore"
 		android:id="@+id/buttonCompleteChore" />
 	<Button
-		android:text="Back"
+		android:text="Confirm Edits"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonChoreEditToChoreList" />
+		android:layout_alignParentBottom="true"
+		android:id="@+id/buttonConfirmEditChore" />
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/choreListSettingsLayout.axml b/choreListSettingsLayout.axml
new file mode 100644
index 0000000..06404a6
--- /dev/null
+++ b/choreListSettingsLayout.axml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+	<Button
+		android:text="◄"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentLeft="true"
+		android:id="@+id/buttonChoreListSettingsToChoreList" />
+	<TextView
+		android:text="Edit Chore:"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="36.0dp"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:gravity="bottom"
+		android:textAlignment="gravity"
+		android:layout_toRightOf="@+id/buttonChoreListSettingsToChoreList"
+		android:id="@+id/textChoreListSettingsHeader" />
+	<CheckBox
+		android:text=""
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/buttonChoreListSettingsToChoreList"
+		android:id="@+id/checkChoreListSettingsMine" />
+	<TextView
+		android:text="Filter By Mine"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="match_parent"
+		android:layout_height="36.0dp"
+		android:minWidth="25px"
+		android:minHeight="25px"
+		android:layout_below="@+id/buttonChoreListSettingsToChoreList"
+		android:layout_toRightOf="@+id/checkChoreListSettingsMine"
+		android:id="@+id/textChroeListSettingsMine" />
+	<CheckBox
+		android:text=""
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/checkChoreListSettingsMine"
+		android:id="@+id/checkChoreListSettingsGroup" />
+	<TextView
+		android:text="Filter By Group"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/checkChoreListSettingsMine"
+		android:layout_toRightOf="@+id/checkChoreListSettingsGroup"
+		android:id="@+id/textChoreListSettingsGroup" />
+	<CheckBox
+		android:text=""
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/checkChoreListSettingsGroup"
+		android:id="@+id/checkChoreListSettingsComplete" />
+	<TextView
+		android:text="Filter By Complete"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/checkChoreListSettingsGroup"
+		android:layout_toRightOf="@+id/checkChoreListSettingsComplete"
+		android:id="@+id/textChoreListSettingsComplete" />
+
+
+</RelativeLayout>
diff --git a/groupCreateLayout.axml b/groupCreateLayout.axml
index 0813356..2276855 100644
--- a/groupCreateLayout.axml
+++ b/groupCreateLayout.axml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+	<Button
+		android:text="◄"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentLeft="true"
+		android:id="@+id/buttonGroupCreateLayoutToGroupList" />
 	<TextView
-		android:text="Group Name"
+		android:text="Create Group"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
 		android:layout_height="36.0dp"
@@ -12,20 +20,37 @@
 		android:minHeight="25px"
 		android:gravity="bottom"
 		android:textAlignment="gravity"
+		android:layout_toRightOf="@+id/buttonGroupCreateLayoutToGroupList"
+		android:id="@+id/textNewGroupHeader" />
+	<TextView
+		android:text="Group Name"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/buttonGroupCreateLayoutToGroupList"
 		android:id="@+id/textNewGroupName" />
 	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_below="@+id/textNewGroupName"
 		android:id="@+id/editNewGroupName" />
-	<Button
-		android:text="Confirm Group"
+	<TextView
+		android:text="Group Key"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/editNewGroupName"
+		android:id="@+id/textNewGroupKey" />
+	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonConfirmNewGroup" />
+		android:layout_below="@+id/textNewGroupKey"
+		android:id="@+id/editNewGroupKey" />
 	<Button
-		android:text="Back"
+		android:text="Confirm Group"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonGroupCreateLayoutToGroupList" />
+		android:layout_alignParentBottom="true"
+		android:id="@+id/buttonConfirmNewGroup" />
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/groupListLayout.axml b/groupListLayout.axml
index 32d82fd..ffb2e67 100644
--- a/groupListLayout.axml
+++ b/groupListLayout.axml
@@ -37,13 +37,6 @@
 		android:layout_alignParentRight="true"
 		android:layout_below="@+id/listOfGroups"
 		android:id="@+id/buttonCreateGroup" />
-	<Button
-		android:text="⋮"
-		android:layout_width="36.0dp"
-		android:layout_height="36.0dp"
-		android:layout_alignParentRight="true"
-		android:id="@+id/menuButtonGroupList"
-		android:layout_marginBottom="0.0dp" />
 	<Button
 		android:text="☰"
 		android:layout_width="36.0dp"
diff --git a/joinGroupLayout.axml b/joinGroupLayout.axml
index fa6568c..08e3bad 100644
--- a/joinGroupLayout.axml
+++ b/joinGroupLayout.axml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+	<Button
+		android:text="◄"
+		android:layout_width="36.0dp"
+		android:layout_height="36.0dp"
+		android:layout_alignParentLeft="true"
+		android:id="@+id/buttonJoinGroupToChoreList" />
 	<TextView
-		android:text="Desired Group Name:"
+		android:text="Join Group"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="match_parent"
 		android:layout_height="36.0dp"
@@ -12,20 +20,37 @@
 		android:minHeight="25px"
 		android:gravity="bottom"
 		android:textAlignment="gravity"
+		android:layout_toRightOf="@+id/buttonJoinGroupToChoreList"
+		android:id="@+id/textJoinGroupHeader" />
+	<TextView
+		android:text="Desired Group Name"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/buttonJoinGroupToChoreList"
 		android:id="@+id/textJoinGroupName" />
 	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_below="@+id/textJoinGroupName"
 		android:id="@+id/editJoinGroupName" />
-	<Button
-		android:text="Confrim Join"
+	<TextView
+		android:text="Group Key"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/editJoinGroupName"
+		android:id="@+id/textJoinGroupKey" />
+	<EditText
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonConfirmJoinGroup" />
+		android:layout_below="@+id/textJoinGroupKey"
+		android:id="@+id/editJoinGroupKey" />
 	<Button
-		android:text="Back"
+		android:text="Confrim Join"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/buttonJoinGroupToChoreList" />
+		android:layout_alignParentBottom="true"
+		android:id="@+id/buttonConfirmJoinGroup" />
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/mainMenuLayout.axml b/mainMenuLayout.axml
index 0431b30..6d21c4c 100644
--- a/mainMenuLayout.axml
+++ b/mainMenuLayout.axml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 	<Button
 		android:text="Task List"
 		android:layout_width="match_parent"
@@ -13,11 +14,10 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/buttonMenuToGroupList" />
-	<ListView
-		android:minWidth="25px"
-		android:minHeight="25px"
+	<Button
+		android:text="Logout"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:id="@+id/listMenuOptions" />
+		android:layout_height="wrap_content"
+		android:id="@+id/buttonMenuToLogin" />
 	
 </LinearLayout>

From c46dcfef80ed5eaa90d62e663cf110e9b2a761c2 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Sun, 18 Nov 2018 23:00:19 -0800
Subject: [PATCH 09/11] Added Chore List Filtering and Improved Editing

---
 Chore.cs                     |  40 ++++++-
 Controller.cs                | 216 ++++++++++++++++++++++++++---------
 MainActivity.cs              |  24 ++--
 SessionData.cs               |  52 ++++++++-
 User.cs                      |   5 +
 choreListLayout.axml         |   2 +-
 choreListSettingsLayout.axml |  16 ++-
 7 files changed, 276 insertions(+), 79 deletions(-)

diff --git a/Chore.cs b/Chore.cs
index 92ac50f..a074b00 100644
--- a/Chore.cs
+++ b/Chore.cs
@@ -14,7 +14,7 @@ public class Chore
         bool isCompleted;
 
         //constructor
-        public Chore(string name, int passedUserId, string deadline)
+        public Chore(string name, int passedUserId, string deadline, bool priority = false)
         {
             isCompleted = false;
             completedUserId = -1;
@@ -23,7 +23,9 @@ public Chore(string name, int passedUserId, string deadline)
             choreName = name;
             choreId = generateChoreId();
             assignedUserId = passedUserId;
-            deadlineTimestamp = new Timestamp(deadline);
+            if (deadline == "") { deadlineTimestamp = new Timestamp("00/00/0000").CurrentTimestamp(); }
+            else                { deadlineTimestamp = new Timestamp(deadline); }
+            isPriority = priority;
         }
 
         public Chore(Chore old)
@@ -86,6 +88,40 @@ public string SetName(string name)
             return choreName;
         }
 
+        public int GetAssignment()
+        {          
+            return assignedUserId;
+        }
+
+        public int SetAssignment(int newAssignedUserId)
+        {
+            assignedUserId = newAssignedUserId;
+            return assignedUserId;
+        }
+
+        public string GetDeadline()
+        {
+            return deadlineTimestamp.ToString();
+        }
+
+        public string SetDeadline(string newDeadline)
+        {
+            if (newDeadline != "")
+                deadlineTimestamp = new Timestamp(newDeadline);
+            return deadlineTimestamp.ToString();
+        }
+
+        public bool GetPriority()
+        {
+            return isPriority;
+        }
+
+        public bool SetPriority(bool newPriority)
+        {
+            isPriority = newPriority;
+            return isPriority;
+        }
+
         public bool isComplete()
         {
             return isCompleted;
diff --git a/Controller.cs b/Controller.cs
index db604ec..17c7427 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -104,40 +104,38 @@ public HomeController(MainActivity act)
 
         public static string AddTestChore(string name, MainActivity act)
         {
-            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
-            act.getMainGroup().AddChore(chore);
-            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+            Chore chore = new Chore(name, act.GetSessionData().GetCurrentUser().GetId(), "11/11/111");
+            act.GetSessionData().GetTargetGroup().AddChore(chore);
+            return (act.GetSessionData().GetTargetGroup().GetTaskList().GetHeadChoreName());
         }
     }
 
     class MenuController : Controller
     {
-        Button testGoToTasksButton;
-        Button testGoToGroupsButton;
-        ListView menuListView;
-        List<string> menuOptions = new List<string>
-        {
-            "Profile",
-            "Groups",
-            "Task List",
-            "Back",
-            "Log Out"
-        };
+        Button toTasksButton;
+        Button toGroupsButton;
+        Button toLoginButton;
 
         public MenuController(MainActivity act)
         {
-            testGoToTasksButton = act.FindViewById<Button>(Resource.Id.buttonMenuToTaskList);
-            testGoToGroupsButton = act.FindViewById<Button>(Resource.Id.buttonMenuToGroupList);
+            toTasksButton = act.FindViewById<Button>(Resource.Id.buttonMenuToTaskList);
+            toGroupsButton = act.FindViewById<Button>(Resource.Id.buttonMenuToGroupList);
+            toLoginButton = act.FindViewById<Button>(Resource.Id.buttonMenuToLogin);
 
-            testGoToTasksButton.Click += (sender, e) =>
+            toTasksButton.Click += (sender, e) =>
             {
                 act.ChangeTo(Resource.Layout.choreListLayout);
             };
 
-            testGoToGroupsButton.Click += (sender, e) =>
+            toGroupsButton.Click += (sender, e) =>
             {
                 act.ChangeTo(Resource.Layout.groupListLayout);
             };
+
+            toLoginButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.loginLayout);
+            };
         }
     }
 
@@ -145,6 +143,7 @@ class ChoreListController:Controller
     {
         List<Chore> chores;
         Button mainMenuButton;
+        Button settingsButton;
         Button addChoreButton;
         ListView choreListView;
         
@@ -152,10 +151,10 @@ public ChoreListController(MainActivity act)
         {
             chores = SetupChores(act);
             mainMenuButton = act.FindViewById<Button>(Resource.Id.navButtonChoreList);
+            settingsButton = act.FindViewById<Button>(Resource.Id.settingsButtonChoreList);
             addChoreButton = act.FindViewById<Button>(Resource.Id.buttonAddChore);
             choreListView = act.FindViewById<ListView>(Resource.Id.listOfChores);
-
-            SetupChores(act);
+            
             SetupList(act);
 
             mainMenuButton.Click += (sender, e) =>
@@ -163,6 +162,11 @@ public ChoreListController(MainActivity act)
                 act.ChangeTo(Resource.Layout.mainMenuLayout);
             };
 
+            settingsButton.Click += (sender, e) =>
+            {
+                act.ChangeTo(Resource.Layout.choreListSettingsLayout);
+            };
+
             addChoreButton.Click += (sender, e) =>
             {
                 act.ChangeTo(Resource.Layout.choreCreateLayout);
@@ -171,21 +175,16 @@ public ChoreListController(MainActivity act)
             choreListView.ItemClick += (sender, e) =>
             {
                 Chore targetChore = chores[(int)e.Id];
-                act.SetTargetChore(targetChore);
+                act.GetSessionData().SetTargetChore(targetChore);
                 act.ChangeTo(Resource.Layout.choreEditLayout);
             };
         }
 
         private List<Chore> SetupChores (MainActivity act)
         {
-            List<Chore> fullList = act.getMainGroup().GetTaskList().GetChoreList();
-            List<Chore> ListOfIncomplete = new List<Chore>();
-            foreach (Chore c in fullList)
-            {
-                if (!c.isComplete())
-                    ListOfIncomplete.Add(c);
-            }
-            return ListOfIncomplete;
+            List<Chore> fullList = new List<Chore>();
+            fullList = GenerateFullList(act);
+            return GenerateFilteredList(fullList, act);
         }
 
         private void SetupTestList(MainActivity act)
@@ -213,28 +212,118 @@ private void SetupList(MainActivity act)
             }
             ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, choreNames);
             choreListView.Adapter = adapter;
-            // TODO: add stuff to chore list and make it display them
+        }
+        
+        List<Chore> GenerateFullList(MainActivity act)
+        {
+            if (act.GetSessionData().GetChoreFilterGroup())
+            {
+                return GenerateFullListTargetGroup(act);
+            }
+            else
+            {
+                return GenerateFullListAllGroups(act);
+            }
+        }
+
+        List<Chore> GenerateFullListAllGroups(MainActivity act)
+        {
+            List<Group> userGroups = act.GetSessionData().GetUsersGroups();
+            List<Chore> allChores = new List<Chore>();
+            foreach (Group g in userGroups)
+            {
+                allChores.AddRange(g.GetTaskList().GetChoreList());
+            }
+            return allChores;
+        }
+
+        List<Chore> GenerateFullListTargetGroup(MainActivity act)
+        {
+            List<Chore> allChores = new List<Chore>();
+            allChores = act.GetSessionData().GetTargetGroup().GetTaskList().GetChoreList();
+            return allChores;
+        }
+
+        List<Chore> GenerateFilteredList(List<Chore> fullList, MainActivity act)
+        {
+            List<Chore> filteredList = new List<Chore>();
+            int localUserId = act.GetSessionData().GetCurrentUser().GetId();
+            bool wantAllAssignments = !act.GetSessionData().GetChoreFilterMine();
+            bool wantAllComplete = !act.GetSessionData().GetChoreFilterComplete();
+            bool wantAllPriority = !act.GetSessionData().GetChoreFilterPriority();
+
+            foreach (Chore c in fullList)
+            {
+                if ((wantAllAssignments || c.GetAssignment() == localUserId) && (wantAllComplete || c.isComplete()) && (wantAllPriority || c.GetPriority()))
+                    filteredList.Add(c);
+            }
+
+            return filteredList;
+        }
+    }
+
+    class ChoreListSettingsController : Controller
+    {
+        Button backButton;
+        CheckBox filterMineBox;
+        CheckBox filterGroupBox;
+        CheckBox filterPriorityBox;
+        CheckBox filterCompleteBox;
+
+        public ChoreListSettingsController(MainActivity act)
+        {
+            backButton = act.FindViewById<Button>(Resource.Id.buttonChoreListSettingsToChoreList);
+            filterMineBox = act.FindViewById<CheckBox>(Resource.Id.checkChoreListSettingsMine);
+            filterGroupBox = act.FindViewById<CheckBox>(Resource.Id.checkChoreListSettingsGroup);
+            filterPriorityBox = act.FindViewById<CheckBox>(Resource.Id.checkChoreListSettingsPriority);
+            filterCompleteBox = act.FindViewById<CheckBox>(Resource.Id.checkChoreListSettingsComplete);
+
+            SetInitialValues(act);
+
+            backButton.Click += (sender, e) =>
+            {
+                //TODO: store filter values
+                act.GetSessionData().SetFilters(filterMineBox.Checked, filterGroupBox.Checked, filterPriorityBox.Checked, filterCompleteBox.Checked);
+                act.ChangeTo(Resource.Layout.choreListLayout);
+            };
+        }
+
+        void SetInitialValues(MainActivity act)
+        {
+            filterMineBox.Checked = act.GetSessionData().GetChoreFilterMine();
+            filterGroupBox.Checked = act.GetSessionData().GetChoreFilterGroup();
+            filterPriorityBox.Checked = act.GetSessionData().GetChoreFilterPriority();
+            filterCompleteBox.Checked = act.GetSessionData().GetChoreFilterComplete();
         }
     }
 
     class ChoreCreationController : Controller
     {
         EditText newChoreNameText;
+        EditText newChoreAssignmentText;
+        EditText newChoreDeadlineText;
+        CheckBox newChorePriorityBox;
         Button confirmChoreButton;
         Button backButton;
 
         public ChoreCreationController(MainActivity act)
         {
             newChoreNameText = act.FindViewById<EditText>(Resource.Id.editNewChoreName);
+            newChoreAssignmentText = act.FindViewById<EditText>(Resource.Id.editNewChoreAssignment);
+            newChoreDeadlineText = act.FindViewById<EditText>(Resource.Id.dateNewChoreDeadline);
+            newChorePriorityBox = act.FindViewById<CheckBox>(Resource.Id.checkNewChorePriority);
             confirmChoreButton = act.FindViewById<Button>(Resource.Id.buttonAddChore);
             backButton = act.FindViewById<Button>(Resource.Id.buttonCreateChoreToChoreList);
             
             confirmChoreButton.Click += (sender, e) =>
             {
                 // TODO: consider making addTestChore a bool and using that to determine if the chore was added
-                AddTestChore(newChoreNameText.Text, act);
-                newChoreNameText.Text = "chore added";
-                act.ChangeTo(Resource.Layout.choreListLayout);
+                if (newChoreNameText.Text != "")
+                {
+                    AddTestChore(newChoreNameText.Text, newChoreAssignmentText.Text, newChoreDeadlineText.Text, newChorePriorityBox.Checked, act);
+                    newChoreNameText.Text = "chore added";
+                    act.ChangeTo(Resource.Layout.choreListLayout);
+                }
             };
 
             backButton.Click += (sender, e) =>
@@ -243,11 +332,11 @@ public ChoreCreationController(MainActivity act)
             };
         }
 
-        public static string AddTestChore(string name, MainActivity act)
+        public static string AddTestChore(string name, string assignment, string deadline, bool priority, MainActivity act)
         {
-            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
-            act.getMainGroup().AddChore(chore);
-            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+            Chore chore = new Chore(name, act.GetSessionData().GetIdOfUser(assignment), deadline, priority);
+            act.GetSessionData().GetTargetGroup().AddChore(chore);
+            return (act.GetSessionData().GetTargetGroup().GetTaskList().GetHeadChoreName());
         }
     }
 
@@ -255,30 +344,33 @@ class ChoreEditController : Controller
     {
         Chore targetChore;
         EditText desiredChoreNameText;
+        EditText desiredChoreAssignmentText;
+        EditText desiredChoreDeadlineText;
+        CheckBox desiredChorePriorityBox;
         Button confirmChoreButton;
         Button completeChoreButton;
         Button backButton;
 
         public ChoreEditController(MainActivity act)
         {
-            targetChore = act.GetTargetChore();
+            targetChore = act.GetSessionData().GetTargetChore();
             desiredChoreNameText = act.FindViewById<EditText>(Resource.Id.editChoreEditName);
+            desiredChoreAssignmentText = act.FindViewById<EditText>(Resource.Id.editChoreEditAssignment);
+            desiredChoreDeadlineText = act.FindViewById<EditText>(Resource.Id.editChoreEditDeadline);
+            desiredChorePriorityBox = act.FindViewById<CheckBox>(Resource.Id.checkChoreEditPriority);
             confirmChoreButton = act.FindViewById<Button>(Resource.Id.buttonConfirmEditChore);
             completeChoreButton = act.FindViewById<Button>(Resource.Id.buttonCompleteChore);
             backButton = act.FindViewById<Button>(Resource.Id.buttonChoreEditToChoreList);
             desiredChoreNameText.Text = targetChore.GetName();
 
+            SetInitialValues(act);
+
             confirmChoreButton.Click += (sender, e) =>
             {
-                ApplyEdits();
+                ApplyEdits(act);
                 act.ChangeTo(Resource.Layout.choreListLayout);
             };
-            
-            void ApplyEdits()
-            {
-                targetChore.SetName(desiredChoreNameText.Text);
-            }
-
+           
             completeChoreButton.Click += (sender, e) =>
             {
                 targetChore.SetComplete(true);
@@ -291,11 +383,20 @@ void ApplyEdits()
             };
         }
 
-        public static string AddTestChore(string name, MainActivity act)
+        void SetInitialValues(MainActivity act)
+        {
+            desiredChoreNameText.Text = targetChore.GetName();
+            desiredChoreAssignmentText.Text = act.GetSessionData().GetNameOfUser(targetChore.GetAssignment());
+            desiredChoreDeadlineText.Text = targetChore.GetDeadline().ToString();
+            desiredChorePriorityBox.Checked = targetChore.GetPriority();
+        }
+
+        void ApplyEdits(MainActivity act)
         {
-            Chore chore = new Chore(name, act.getMainUser().GetId(), "11/11/111");
-            act.getMainGroup().AddChore(chore);
-            return (act.getMainGroup().GetTaskList().GetHeadChoreName());
+            targetChore.SetName(desiredChoreNameText.Text);
+            targetChore.SetAssignment(act.GetSessionData().GetIdOfUser(desiredChoreAssignmentText.Text));
+            targetChore.SetDeadline(desiredChoreDeadlineText.Text);
+            targetChore.SetPriority(desiredChorePriorityBox.Checked);
         }
     }
 
@@ -324,7 +425,7 @@ public GroupListController(MainActivity act)
             groupListView.ItemClick += (sender, e) =>
             {
                 Group targetGroup = groups[(int)e.Id];
-                act.SetTargetGroup(targetGroup);
+                act.GetSessionData().SetTargetGroup(targetGroup);
                 SetupList(act);
             };
 
@@ -357,7 +458,7 @@ private void SetupTestList(MainActivity act)
 
         private void SetupList(MainActivity act)
         {
-            groups = act.getUsersGroups();
+            groups = act.GetSessionData().GetUsersGroups();
             groups = CreateOrderedGroupList(groups, act);
             List<string> groupNames = GetNamesOfGroups(groups);
             ArrayAdapter<string> adapter = new ArrayAdapter<string>(act, Android.Resource.Layout.SimpleListItem1, groupNames);
@@ -367,7 +468,7 @@ private void SetupList(MainActivity act)
         private List<Group> CreateOrderedGroupList(List<Group> groups, MainActivity act)
         {
             List<Group> orderedGroups = new List<Group>();
-            Group currentTargetGroup = act.GetTargetGroup();
+            Group currentTargetGroup = act.GetSessionData().GetTargetGroup();
             foreach (Group g in groups)
             {
                 if (g == currentTargetGroup)
@@ -392,18 +493,20 @@ private List<string> GetNamesOfGroups(List<Group> orderedGroups)
     class GroupCreateController : Controller
     {
         EditText newGroupNameText;
+        EditText newGroupKeyText;
         Button confirmGroupButton;
         Button backButton;
 
         public GroupCreateController(MainActivity act)
         {
             newGroupNameText = act.FindViewById<EditText>(Resource.Id.editNewGroupName);
+            newGroupKeyText = act.FindViewById<EditText>(Resource.Id.editNewGroupKey);
             confirmGroupButton = act.FindViewById<Button>(Resource.Id.buttonConfirmNewGroup);
             backButton = act.FindViewById<Button>(Resource.Id.buttonGroupCreateLayoutToGroupList);
 
             confirmGroupButton.Click += (sender, e) =>
             {
-                if (newGroupNameText.Text != "group added")
+                if (newGroupNameText.Text != "group added" && newGroupNameText.Text != "")
                 {
                     AddTestGroup(newGroupNameText.Text, act);
                     newGroupNameText.Text = "group added";
@@ -421,19 +524,22 @@ public Group AddTestGroup(string name, MainActivity act)
         {
             Group group = new Group();
             group.GenerateTestGroup(name);
-            return act.JoinGroup(group);
+            //TODO: set a group password with the key
+            return act.GetSessionData().JoinGroup(group);
         }
     }
 
     class JoinGroupController : Controller
     {
         EditText newGroupNameText;
+        EditText newGroupKeyText;
         Button joinGroupButton;
         Button backButton;
 
         public JoinGroupController(MainActivity act)
         {
             newGroupNameText = act.FindViewById<EditText>(Resource.Id.editJoinGroupName);
+            newGroupKeyText = act.FindViewById<EditText>(Resource.Id.editJoinGroupKey);
             joinGroupButton = act.FindViewById<Button>(Resource.Id.buttonConfirmJoinGroup);
             backButton = act.FindViewById<Button>(Resource.Id.buttonJoinGroupToChoreList);
             
@@ -442,7 +548,7 @@ public JoinGroupController(MainActivity act)
                 act.ChangeTo(Resource.Layout.groupListLayout);
                 // TODO: actually join the group with the entered credentials
                 //  Check if group is in database
-                //  Check if you have the key for that group
+                //  Check if you have the correct key for that group
                 //  Join group in database
             };
             
diff --git a/MainActivity.cs b/MainActivity.cs
index 27bc51b..e6ec705 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -29,23 +29,8 @@ protected override void OnCreate(Bundle savedInstanceState)
             SetContentView(Resource.Layout.loginLayout);
             controller = new LoginController(this);
         }
-        
-        public User getMainUser() { return currentSession.getCurrentUser(); }
-        public Group getMainGroup() { return currentSession.getUsersGroups()[0]; }
-        public List<Group> getUsersGroups() { return currentSession.getUsersGroups(); }
-        public Group GetTargetGroup() { return currentSession.GetTargetGroup(); }
-        public Chore GetTargetChore() { return currentSession.GetTargetChore(); }
-        public Group JoinGroup(Group group) { return currentSession.JoinGroup(group); }
-        public Group SetTargetGroup(Group group)
-        {
-            currentSession.SetTargetGroup(group);
-            return GetTargetGroup();
-        }
-        public Chore SetTargetChore(Chore chore)
-        {
-            currentSession.SetTargetChore(chore);
-            return GetTargetChore();
-        }
+
+        public SessionData GetSessionData() { return currentSession; }
 
         private void AttemptLogin(string username, string password)
         {
@@ -91,6 +76,11 @@ public bool ChangeTo(int layout)
                 SetContentView(layout);
                 controller = new ChoreListController(this);
             }
+            else if (layout == Resource.Layout.choreListSettingsLayout)
+            {
+                SetContentView(layout);
+                controller = new ChoreListSettingsController(this);
+            }
             else if (layout == Resource.Layout.choreCreateLayout)
             {
                 SetContentView(layout);
diff --git a/SessionData.cs b/SessionData.cs
index 598a02a..6c1a520 100644
--- a/SessionData.cs
+++ b/SessionData.cs
@@ -14,24 +14,29 @@
 
 namespace ChoreChomper.Data
 {
-    class SessionData
+    public class SessionData
     {
         User currentUser = null;
         List<Group> usersGroups = new List<Group>();
         Group targetGroup;
         Chore targetChore;
 
+        bool choreFilterMine = false;
+        bool choreFilterGroup = false;
+        bool choreFilterPriority = false;
+        bool choreFilterComplete = false;
+
         public SessionData()
         {
             ;
         }
 
-        public User getCurrentUser()
+        public User GetCurrentUser()
         {
             return currentUser;
         }
 
-        public List<Group> getUsersGroups()
+        public List<Group> GetUsersGroups()
         {
             return usersGroups;
         }
@@ -58,12 +63,52 @@ public Chore SetTargetChore(Chore chore)
             return targetChore;
         }
 
+        public bool GetChoreFilterMine()
+        {
+            return choreFilterMine;
+        }
+
+        public bool GetChoreFilterGroup()
+        {
+            return choreFilterGroup;
+        }
+
+        public bool GetChoreFilterPriority()
+        {
+            return choreFilterPriority;
+        }
+
+        public bool GetChoreFilterComplete()
+        {
+            return choreFilterComplete;
+        }
+
+        public void SetFilters(bool mine, bool group, bool priority, bool complete)
+        {
+            choreFilterMine = mine;
+            choreFilterGroup = group;
+            choreFilterPriority = priority;
+            choreFilterComplete = complete;
+        }
+
         public void LoadUser(string username)
         {
             currentUser = new User(username);
             LoadUsersGroups(currentUser.GetId());
         }
 
+        public int GetIdOfUser(string name)
+        {
+            //TODO: fetch id from database if it isnt found return local user's
+            return currentUser.GetId();
+        }
+
+        public string GetNameOfUser(int id)
+        {
+            //TODO: fetch name from database if it isnt found return local user's
+            return currentUser.GetName();
+        }
+
         private void LoadUsersGroups(int userId)
         {
             // TODO: get a list of all group information associated with user from database and put them in userGroups;
@@ -82,6 +127,7 @@ public void GenerateTestSession()
             usersGroups = new List<Group>();
             Group testGroup = new Group().GenerateTestGroup();
             testGroup.AddUser(currentUser);
+            targetGroup = testGroup;
             usersGroups.Add(testGroup);
         }
     }
diff --git a/User.cs b/User.cs
index 29dea67..66e75ad 100644
--- a/User.cs
+++ b/User.cs
@@ -27,6 +27,11 @@ public int GetId()
             return userId;
         }
 
+        public string GetName()
+        {
+            return userName;
+        }
+
         public User GenerateTestUser()
         {
             userId = 0;
diff --git a/choreListLayout.axml b/choreListLayout.axml
index 86e108b..fd9dea1 100644
--- a/choreListLayout.axml
+++ b/choreListLayout.axml
@@ -34,7 +34,7 @@
 		android:layout_width="36.0dp"
 		android:layout_height="36.0dp"
 		android:layout_alignParentRight="true"
-		android:id="@+id/menuButtonChoreList"
+		android:id="@+id/settingsButtonChoreList"
 		android:layout_marginBottom="0.0dp" />
 	<Button
 		android:text="☰"
diff --git a/choreListSettingsLayout.axml b/choreListSettingsLayout.axml
index 06404a6..068dd94 100644
--- a/choreListSettingsLayout.axml
+++ b/choreListSettingsLayout.axml
@@ -56,14 +56,28 @@
 		android:text=""
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_below="@id/textChoreListSettingsGroup"
+		android:id="@+id/checkChoreListSettingsPriority" />
+	<TextView
+		android:text="Filter By Priority"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
 		android:layout_below="@+id/checkChoreListSettingsGroup"
+		android:layout_toRightOf="@+id/checkChoreListSettingsPriority"
+		android:id="@+id/textChoreListSettingsPriority" />
+	<CheckBox
+		android:text=""
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/checkChoreListSettingsPriority"
 		android:id="@+id/checkChoreListSettingsComplete" />
 	<TextView
 		android:text="Filter By Complete"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/checkChoreListSettingsGroup"
+		android:layout_below="@+id/checkChoreListSettingsPriority"
 		android:layout_toRightOf="@+id/checkChoreListSettingsComplete"
 		android:id="@+id/textChoreListSettingsComplete" />
 

From 80d700d057aee1da053e2c5d684b200f47fa57f9 Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Wed, 21 Nov 2018 09:45:18 -0800
Subject: [PATCH 10/11] Edits to UI and logic in filters

---
 Controller.cs                | 17 ++++++++++++-----
 Timestamp.cs                 |  2 +-
 choreListLayout.axml         |  5 +++--
 choreListSettingsLayout.axml |  2 +-
 groupListLayout.axml         |  7 ++++---
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Controller.cs b/Controller.cs
index 17c7427..2cebeab 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -248,13 +248,13 @@ List<Chore> GenerateFilteredList(List<Chore> fullList, MainActivity act)
         {
             List<Chore> filteredList = new List<Chore>();
             int localUserId = act.GetSessionData().GetCurrentUser().GetId();
-            bool wantAllAssignments = !act.GetSessionData().GetChoreFilterMine();
-            bool wantAllComplete = !act.GetSessionData().GetChoreFilterComplete();
-            bool wantAllPriority = !act.GetSessionData().GetChoreFilterPriority();
+            bool wantOnlyMine = act.GetSessionData().GetChoreFilterMine();
+            bool wantOnlyComplete = act.GetSessionData().GetChoreFilterComplete();
+            bool wantOnlyPriority = act.GetSessionData().GetChoreFilterPriority();
 
             foreach (Chore c in fullList)
             {
-                if ((wantAllAssignments || c.GetAssignment() == localUserId) && (wantAllComplete || c.isComplete()) && (wantAllPriority || c.GetPriority()))
+                if ((!wantOnlyMine || c.GetAssignment() == localUserId) && (wantOnlyComplete == c.isComplete()) && (!wantOnlyPriority || c.GetPriority()))
                     filteredList.Add(c);
             }
 
@@ -361,8 +361,9 @@ public ChoreEditController(MainActivity act)
             confirmChoreButton = act.FindViewById<Button>(Resource.Id.buttonConfirmEditChore);
             completeChoreButton = act.FindViewById<Button>(Resource.Id.buttonCompleteChore);
             backButton = act.FindViewById<Button>(Resource.Id.buttonChoreEditToChoreList);
-            desiredChoreNameText.Text = targetChore.GetName();
 
+            desiredChoreNameText.Text = targetChore.GetName();
+            
             SetInitialValues(act);
 
             confirmChoreButton.Click += (sender, e) =>
@@ -389,6 +390,12 @@ void SetInitialValues(MainActivity act)
             desiredChoreAssignmentText.Text = act.GetSessionData().GetNameOfUser(targetChore.GetAssignment());
             desiredChoreDeadlineText.Text = targetChore.GetDeadline().ToString();
             desiredChorePriorityBox.Checked = targetChore.GetPriority();
+
+            if(targetChore.isComplete())
+            {
+                completeChoreButton.Enabled = false;
+                confirmChoreButton.Enabled = false;
+            }
         }
 
         void ApplyEdits(MainActivity act)
diff --git a/Timestamp.cs b/Timestamp.cs
index 2ac269a..213e0b4 100644
--- a/Timestamp.cs
+++ b/Timestamp.cs
@@ -46,7 +46,7 @@ public Timestamp(string condensedTimeFormat)
 
         public override string ToString()
         {
-            return (day.ToString("D2") + "/" + month.ToString("D2") + "/" + year.ToString("D4"));
+            return (month.ToString("D2") + "/" + day.ToString("D2") + "/" + year.ToString("D4"));
         }
 
         public int GetDay()
diff --git a/choreListLayout.axml b/choreListLayout.axml
index fd9dea1..650c3fc 100644
--- a/choreListLayout.axml
+++ b/choreListLayout.axml
@@ -21,13 +21,14 @@
 		android:minHeight="25px"
 		android:layout_width="match_parent"
 		android:layout_height="260.5dp"
-		android:layout_below="@id/textChoresHeader"
+		android:layout_above="@+id/buttonAddChore"
+		android:layout_below="@+id/textChoresHeader"
 		android:id="@+id/listOfChores" />
 	<Button
 		android:text="+"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_below="@+id/listOfChores"
+		android:layout_alignParentBottom="true"
 		android:id="@+id/buttonAddChore" />
 	<Button
 		android:text="⋮"
diff --git a/choreListSettingsLayout.axml b/choreListSettingsLayout.axml
index 068dd94..88c5c1d 100644
--- a/choreListSettingsLayout.axml
+++ b/choreListSettingsLayout.axml
@@ -73,7 +73,7 @@
 		android:layout_below="@+id/checkChoreListSettingsPriority"
 		android:id="@+id/checkChoreListSettingsComplete" />
 	<TextView
-		android:text="Filter By Complete"
+		android:text="Only Show Complete"
 		android:textAppearance="?android:attr/textAppearanceLarge"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/groupListLayout.axml b/groupListLayout.axml
index ffb2e67..cb89e76 100644
--- a/groupListLayout.axml
+++ b/groupListLayout.axml
@@ -21,21 +21,22 @@
 		android:minHeight="25px"
 		android:layout_width="match_parent"
 		android:layout_height="260.5dp"
-		android:layout_below="@id/textGroupsHeader"
+		android:layout_below="@+id/textGroupsHeader"
+		android:layout_above="@+id/buttonCreateGroup"
 		android:id="@+id/listOfGroups" />
 	<Button
 		android:text="Join"
 		android:layout_width="100.0dp"
 		android:layout_height="wrap_content"
 		android:layout_alignParentLeft="true"
-		android:layout_below="@+id/listOfGroups"
+		android:layout_alignParentBottom="true"
 		android:id="@+id/buttonJoinGroup" />
 	<Button
 		android:text="Create"
 		android:layout_width="100.0dp"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
-		android:layout_below="@+id/listOfGroups"
+		android:layout_alignParentBottom="true"
 		android:id="@+id/buttonCreateGroup" />
 	<Button
 		android:text="☰"

From e7c949fb442662211e2bc71c848e50b8940554af Mon Sep 17 00:00:00 2001
From: scuPulos <44333074+scuPulos@users.noreply.github.com>
Date: Tue, 27 Nov 2018 19:40:25 -0800
Subject: [PATCH 11/11] Removed Bob

---
 Chore.cs             | 46 +++++++++++++++++++++++---------------------
 Controller.cs        | 13 +++++++------
 Group.cs             |  9 +++++++--
 MainActivity.cs      |  3 ++-
 SessionData.cs       |  4 ++--
 Timestamp.cs         | 16 ++++++++++++---
 User.cs              |  4 ++--
 joinGroupLayout.axml |  2 +-
 mainMenuLayout.axml  |  2 +-
 9 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/Chore.cs b/Chore.cs
index a074b00..511f988 100644
--- a/Chore.cs
+++ b/Chore.cs
@@ -9,22 +9,31 @@ public class Chore
         int assignedUserId;
         int completedUserId;
         Timestamp deadlineTimestamp;
+        string deadlineString;
         Timestamp completedTimestamp;
+        string completedString;
         bool isPriority;
-        bool isCompleted;
 
         //constructor
         public Chore(string name, int passedUserId, string deadline, bool priority = false)
         {
-            isCompleted = false;
             completedUserId = -1;
-            completedTimestamp = new Timestamp();
+            completedTimestamp = null;
+            completedString = null;
 
             choreName = name;
             choreId = generateChoreId();
             assignedUserId = passedUserId;
-            if (deadline == "") { deadlineTimestamp = new Timestamp("00/00/0000").CurrentTimestamp(); }
-            else                { deadlineTimestamp = new Timestamp(deadline); }
+            if (deadline == "")
+            {
+                deadlineTimestamp = new Timestamp("00/00/0000").CurrentTimestamp();
+                deadlineString = deadlineTimestamp.ToString();
+            }
+            else
+            {
+                deadlineTimestamp = new Timestamp(deadline);
+                deadlineString = deadlineTimestamp.ToString();
+            }
             isPriority = priority;
         }
 
@@ -35,9 +44,10 @@ public Chore(Chore old)
             assignedUserId = old.assignedUserId;
             completedUserId = old.completedUserId;
             deadlineTimestamp = new Timestamp(old.deadlineTimestamp);
+            deadlineString = deadlineTimestamp.ToString();
             completedTimestamp = new Timestamp(old.completedTimestamp);
+            completedString = completedTimestamp.ToString();
             isPriority = old.isPriority;
-            isCompleted = old.isCompleted;
         }
 
         int generateChoreId()
@@ -56,7 +66,7 @@ public void MarkComplete()
             //TODO: get the Id of the user who marked it complete and assign it
             completedUserId = assignedUserId;
             completedTimestamp = new Timestamp().CurrentTimestamp();
-            isCompleted = true;
+            completedString = completedTimestamp.ToString();
         }
 
         public int AssignUser(int passedUserId)
@@ -65,12 +75,6 @@ public int AssignUser(int passedUserId)
             return (assignedUserId);
         }
 
-        public Timestamp UpdateDeadline(string deadline)
-        {
-            deadlineTimestamp = new Timestamp(deadline);
-            return deadlineTimestamp;
-        }
-
         public bool CheckId(int keyId)
         {
             return (keyId == choreId);
@@ -101,14 +105,18 @@ public int SetAssignment(int newAssignedUserId)
 
         public string GetDeadline()
         {
-            return deadlineTimestamp.ToString();
+            return deadlineString;
         }
 
         public string SetDeadline(string newDeadline)
         {
             if (newDeadline != "")
+            {
                 deadlineTimestamp = new Timestamp(newDeadline);
-            return deadlineTimestamp.ToString();
+                deadlineString = deadlineTimestamp.ToString();
+            }
+
+            return deadlineString;
         }
 
         public bool GetPriority()
@@ -124,13 +132,7 @@ public bool SetPriority(bool newPriority)
 
         public bool isComplete()
         {
-            return isCompleted;
-        }
-
-        public bool SetComplete(bool completed)
-        {
-            isCompleted = completed;
-            return isCompleted;
+            return (completedTimestamp != null);
         }
     }
 }
\ No newline at end of file
diff --git a/Controller.cs b/Controller.cs
index 2cebeab..c457872 100644
--- a/Controller.cs
+++ b/Controller.cs
@@ -37,7 +37,8 @@ public LoginController(MainActivity act)
 
             loginButton.Click += (sender, e) =>
             {
-                // TODO: handle login attempt
+                // TODO: validate user
+                act.GetSessionData().GenerateTestSession(usernameText.Text);
                 act.ChangeTo(Resource.Layout.choreListLayout);
             };
 
@@ -106,7 +107,7 @@ public static string AddTestChore(string name, MainActivity act)
         {
             Chore chore = new Chore(name, act.GetSessionData().GetCurrentUser().GetId(), "11/11/111");
             act.GetSessionData().GetTargetGroup().AddChore(chore);
-            return (act.GetSessionData().GetTargetGroup().GetTaskList().GetHeadChoreName());
+            return (act.GetSessionData().GetTargetGroup().getTaskList().GetHeadChoreName());
         }
     }
 
@@ -232,7 +233,7 @@ List<Chore> GenerateFullListAllGroups(MainActivity act)
             List<Chore> allChores = new List<Chore>();
             foreach (Group g in userGroups)
             {
-                allChores.AddRange(g.GetTaskList().GetChoreList());
+                allChores.AddRange(g.getTaskList().GetChoreList());
             }
             return allChores;
         }
@@ -240,7 +241,7 @@ List<Chore> GenerateFullListAllGroups(MainActivity act)
         List<Chore> GenerateFullListTargetGroup(MainActivity act)
         {
             List<Chore> allChores = new List<Chore>();
-            allChores = act.GetSessionData().GetTargetGroup().GetTaskList().GetChoreList();
+            allChores = act.GetSessionData().GetTargetGroup().getTaskList().GetChoreList();
             return allChores;
         }
 
@@ -336,7 +337,7 @@ public static string AddTestChore(string name, string assignment, string deadlin
         {
             Chore chore = new Chore(name, act.GetSessionData().GetIdOfUser(assignment), deadline, priority);
             act.GetSessionData().GetTargetGroup().AddChore(chore);
-            return (act.GetSessionData().GetTargetGroup().GetTaskList().GetHeadChoreName());
+            return (act.GetSessionData().GetTargetGroup().getTaskList().GetHeadChoreName());
         }
     }
 
@@ -374,7 +375,7 @@ public ChoreEditController(MainActivity act)
            
             completeChoreButton.Click += (sender, e) =>
             {
-                targetChore.SetComplete(true);
+                targetChore.MarkComplete();
                 act.ChangeTo(Resource.Layout.choreListLayout);
             };
 
diff --git a/Group.cs b/Group.cs
index 7ae2c1d..3becc5d 100644
--- a/Group.cs
+++ b/Group.cs
@@ -46,7 +46,7 @@ public Group GenerateNew(string Name)
             return (new Group());
         }
 
-        public Group GenerateTestGroup(string name = "Best_Group")
+        public Group GenerateTestGroup(string name = "self")
         {
             groupId = 0;
             groupName = name;
@@ -68,11 +68,16 @@ public Chore AddChore(Chore chore)
             return chore;
         }
 
-        public TaskList GetTaskList()
+        public TaskList getTaskList()
         {
             return(tasks);
         }
 
+        public int getId()
+        {
+            return groupId;
+        }
+
         public string getName()
         {
             return groupName;
diff --git a/MainActivity.cs b/MainActivity.cs
index e6ec705..0383906 100644
--- a/MainActivity.cs
+++ b/MainActivity.cs
@@ -44,7 +44,8 @@ private void AttemptLogin(string username, string password)
 
         private void SetupUserData()
         {
-            currentSession.GenerateTestSession();
+            // TODO: REMOVED FOR TESTING PURPOSES
+            //currentSession.GenerateTestSession();
         }
 
         public bool ChangeTo(int layout)
diff --git a/SessionData.cs b/SessionData.cs
index 6c1a520..2fc2430 100644
--- a/SessionData.cs
+++ b/SessionData.cs
@@ -121,9 +121,9 @@ public Group JoinGroup(Group newGroup)
             return targetGroup;
         }
 
-        public void GenerateTestSession()
+        public void GenerateTestSession(string username)
         {
-            currentUser = new User().GenerateTestUser();
+            currentUser = new User().GenerateTestUser(username);
             usersGroups = new List<Group>();
             Group testGroup = new Group().GenerateTestGroup();
             testGroup.AddUser(currentUser);
diff --git a/Timestamp.cs b/Timestamp.cs
index 213e0b4..398ffca 100644
--- a/Timestamp.cs
+++ b/Timestamp.cs
@@ -38,9 +38,19 @@ public Timestamp(string condensedTimeFormat)
             //assumes condensedTimeFormat is in the format "MM/DD/YYYY"
             string[] values = condensedTimeFormat.Split('/');
             //TODO: consider using parse return values to catch impropperly formatted dates.
-            Int32.TryParse(values[0], out day);
-            Int32.TryParse(values[1], out month);
-            Int32.TryParse(values[2], out year);
+            if (values.Length == 3)
+            {
+                Int32.TryParse(values[0], out month);
+                Int32.TryParse(values[1], out day);
+                Int32.TryParse(values[2], out year);
+            }
+            else
+            {
+                DateTime desiredTime = DateTime.Now;
+                day = desiredTime.Day;
+                month = desiredTime.Month;
+                year = desiredTime.Year;
+            }
             isValid = true;
         }
 
diff --git a/User.cs b/User.cs
index 66e75ad..793a7c5 100644
--- a/User.cs
+++ b/User.cs
@@ -32,10 +32,10 @@ public string GetName()
             return userName;
         }
 
-        public User GenerateTestUser()
+        public User GenerateTestUser(string name)
         {
             userId = 0;
-            userName = "Bob";
+            userName = name;
 
             return this;
         }
diff --git a/joinGroupLayout.axml b/joinGroupLayout.axml
index 08e3bad..437e2c0 100644
--- a/joinGroupLayout.axml
+++ b/joinGroupLayout.axml
@@ -47,7 +47,7 @@
 		android:layout_below="@+id/textJoinGroupKey"
 		android:id="@+id/editJoinGroupKey" />
 	<Button
-		android:text="Confrim Join"
+		android:text="Confirm Join"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
diff --git a/mainMenuLayout.axml b/mainMenuLayout.axml
index 6d21c4c..eb61f5c 100644
--- a/mainMenuLayout.axml
+++ b/mainMenuLayout.axml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 	<Button
-		android:text="Task List"
+		android:text="Chore List"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/buttonMenuToTaskList" />