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 1efd025..c2d3db5 100644 --- a/Listify/app/src/main/java/com/example/listify/ListPage.java +++ b/Listify/app/src/main/java/com/example/listify/ListPage.java @@ -70,7 +70,9 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver { super.onCreate(savedInstanceState); setContentView(R.layout.activity_list); - final int listID = (int) getIntent().getSerializableExtra("listID"); + final int LIST_ID = (int) getIntent().getSerializableExtra("listID"); + final String LIST_NAME = (String) getIntent().getSerializableExtra("listName"); + setTitle(LIST_NAME); Properties configs = new Properties(); try { @@ -79,7 +81,7 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver { e.printStackTrace(); } requestor = new Requestor(am, configs.getProperty("apiKey")); - requestor.getObject(Integer.toString(listID), List.class, this); + requestor.getObject(Integer.toString(LIST_ID), List.class, this); listView = findViewById(R.id.listView); myAdapter = new MyAdapter(this, pNames, pStores, pPrices, pQuantity, pImages); @@ -125,7 +127,7 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver { public void onClick(DialogInterface dialog, int which) { EditText sharedEmailText = (EditText) codeView.findViewById(R.id.editTextTextSharedEmail); String sharedEmail = sharedEmailText.getText().toString(); - ListShare listShare = new ListShare(listID, sharedEmail); + ListShare listShare = new ListShare(LIST_ID, sharedEmail); try { requestor.postObject(listShare); } diff --git a/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java index 892f2f0..16a3e65 100644 --- a/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java +++ b/Listify/app/src/main/java/com/example/listify/adapter/ShoppingListsSwipeableAdapter.java @@ -157,8 +157,9 @@ public class ShoppingListsSwipeableAdapter extends BaseAdapter { public void onClick(View v) { Intent listPage = new Intent(activity, ListPage.class); - // Send the list ID + // Send the list ID and list name listPage.putExtra("listID", curList.getItemID()); + listPage.putExtra("listName", curList.getName()); activity.startActivity(listPage); } }); diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeViewModel.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeViewModel.java deleted file mode 100644 index 22e1280..0000000 --- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.listify.ui.home; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class HomeViewModel extends ViewModel { - - private MutableLiveData mText; - - public HomeViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is home fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file