diff --git a/Listify/app/src/main/java/com/example/listify/ListPage.java b/Listify/app/src/main/java/com/example/listify/ListPage.java
index 49cddfa..1efd025 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -3,10 +3,11 @@ package com.example.listify;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.*;
@@ -21,7 +22,6 @@ import com.example.listify.data.Item;
import com.example.listify.data.List;
import com.example.listify.data.ListEntry;
import com.example.listify.data.ListShare;
-import com.example.listify.ui.SignupPage;
import java.io.IOException;
import java.text.DecimalFormat;
@@ -144,6 +144,51 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
});
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ //Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.list, menu);
+// return super.onCreateOptionsMenu(menu);
+
+ MenuItem renameItem = menu.findItem(R.id.action_rename_list);
+ renameItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ Toast.makeText(ListPage.this, "Rename List", Toast.LENGTH_SHORT).show();
+ return false;
+ }
+ });
+
+ MenuItem shareItem = menu.findItem(R.id.action_share_list);
+ shareItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ Toast.makeText(ListPage.this, "Share List", Toast.LENGTH_SHORT).show();
+ return false;
+ }
+ });
+
+ MenuItem duplicateItem = menu.findItem(R.id.action_duplicate_list);
+ duplicateItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ Toast.makeText(ListPage.this, "Duplicate List", Toast.LENGTH_SHORT).show();
+ return false;
+ }
+ });
+
+ MenuItem exportItem = menu.findItem(R.id.action_export_list);
+ exportItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ Toast.makeText(ListPage.this, "Export List", Toast.LENGTH_SHORT).show();
+ return false;
+ }
+ });
+
+ return true;
+ }
+
@Override
public void acceptDelivery(Object delivered) {
List list = (List) delivered;
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_edit_24.xml b/Listify/app/src/main/res/drawable/ic_baseline_edit_24.xml
new file mode 100644
index 0000000..1c9bd3e
--- /dev/null
+++ b/Listify/app/src/main/res/drawable/ic_baseline_edit_24.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_file_copy_24.xml b/Listify/app/src/main/res/drawable/ic_baseline_file_copy_24.xml
new file mode 100644
index 0000000..47dc4fe
--- /dev/null
+++ b/Listify/app/src/main/res/drawable/ic_baseline_file_copy_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_filter_list_28.xml b/Listify/app/src/main/res/drawable/ic_baseline_filter_list_24.xml
similarity index 74%
rename from Listify/app/src/main/res/drawable/ic_baseline_filter_list_28.xml
rename to Listify/app/src/main/res/drawable/ic_baseline_filter_list_24.xml
index 4ecf051..4507d4e 100644
--- a/Listify/app/src/main/res/drawable/ic_baseline_filter_list_28.xml
+++ b/Listify/app/src/main/res/drawable/ic_baseline_filter_list_24.xml
@@ -1,9 +1,9 @@
+ android:tint="#000000">
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_import_export_24.xml b/Listify/app/src/main/res/drawable/ic_baseline_import_export_24.xml
new file mode 100644
index 0000000..0dacaec
--- /dev/null
+++ b/Listify/app/src/main/res/drawable/ic_baseline_import_export_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_more_vert_24.xml b/Listify/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
new file mode 100644
index 0000000..6a7f274
--- /dev/null
+++ b/Listify/app/src/main/res/drawable/ic_baseline_more_vert_24.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_share_24.xml b/Listify/app/src/main/res/drawable/ic_baseline_share_24.xml
index 9300daf..87cea78 100644
--- a/Listify/app/src/main/res/drawable/ic_baseline_share_24.xml
+++ b/Listify/app/src/main/res/drawable/ic_baseline_share_24.xml
@@ -1,4 +1,4 @@
-
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_sort_24.xml b/Listify/app/src/main/res/drawable/ic_baseline_sort_24.xml
new file mode 100644
index 0000000..0934b6b
--- /dev/null
+++ b/Listify/app/src/main/res/drawable/ic_baseline_sort_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/Listify/app/src/main/res/drawable/ic_baseline_sort_28.xml b/Listify/app/src/main/res/drawable/ic_baseline_sort_28.xml
deleted file mode 100644
index 60dff03..0000000
--- a/Listify/app/src/main/res/drawable/ic_baseline_sort_28.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/Listify/app/src/main/res/menu/list.xml b/Listify/app/src/main/res/menu/list.xml
new file mode 100644
index 0000000..c616b03
--- /dev/null
+++ b/Listify/app/src/main/res/menu/list.xml
@@ -0,0 +1,33 @@
+
+
\ No newline at end of file
diff --git a/Listify/app/src/main/res/menu/lists_menu.xml b/Listify/app/src/main/res/menu/lists_menu.xml
deleted file mode 100644
index 493c783..0000000
--- a/Listify/app/src/main/res/menu/lists_menu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Listify/app/src/main/res/menu/search.xml b/Listify/app/src/main/res/menu/search.xml
index 1602687..85af65c 100644
--- a/Listify/app/src/main/res/menu/search.xml
+++ b/Listify/app/src/main/res/menu/search.xml
@@ -2,13 +2,22 @@