mirror of
https://github.com/ClaytonWWilson/Listify.git
synced 2025-12-16 10:48:46 +00:00
Connect search, lists, and itemDetails to db with hardcoded user
This commit is contained in:
parent
c5bb117136
commit
762e7907b8
@ -1,7 +1,10 @@
|
|||||||
package com.example.listify;
|
package com.example.listify;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import com.amplifyframework.auth.AuthException;
|
||||||
import com.bumptech.glide.Glide;
|
import com.bumptech.glide.Glide;
|
||||||
|
import com.example.listify.data.List;
|
||||||
import com.example.listify.model.Product;
|
import com.example.listify.model.Product;
|
||||||
import com.example.listify.model.ShoppingList;
|
import com.example.listify.model.ShoppingList;
|
||||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
@ -13,7 +16,13 @@ import android.widget.ImageView;
|
|||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import org.json.JSONException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.time.Instant;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
public class ItemDetails extends AppCompatActivity implements ListPickerDialogFragment.OnListPickListener, CreateListDialogFragment.OnNewListListener {
|
public class ItemDetails extends AppCompatActivity implements ListPickerDialogFragment.OnListPickListener, CreateListDialogFragment.OnNewListListener {
|
||||||
private Product curProduct;
|
private Product curProduct;
|
||||||
@ -28,7 +37,7 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
|
|||||||
private TextView tvItemDesc;
|
private TextView tvItemDesc;
|
||||||
private ImageButton backToSearchbutton;
|
private ImageButton backToSearchbutton;
|
||||||
|
|
||||||
ArrayList<ShoppingList> shoppingLists = new ArrayList<>();
|
ArrayList<List> shoppingLists = new ArrayList<>();
|
||||||
|
|
||||||
private boolean isFABOpen = false;
|
private boolean isFABOpen = false;
|
||||||
|
|
||||||
@ -62,9 +71,32 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
|
|||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
closeFABMenu();
|
closeFABMenu();
|
||||||
|
|
||||||
// Hardcode shopping lists to demonstrate displaying lists
|
AuthManager authManager = new AuthManager();
|
||||||
for (int i = 0; i < 10; i++) {
|
try {
|
||||||
shoppingLists.add(new ShoppingList(Integer.toString(i)));
|
authManager.signIn("merzn@purdue.edu", "Password123");
|
||||||
|
} catch (AuthException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Properties configs = new Properties();
|
||||||
|
try {
|
||||||
|
configs = AuthManager.loadProperties(ItemDetails.this, "android.resource://" + getPackageName() + "/raw/auths.json");
|
||||||
|
} catch (IOException | JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey"));
|
||||||
|
SynchronousReceiver<Integer[]> listIdsReceiver = new SynchronousReceiver<>();
|
||||||
|
SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
|
||||||
|
|
||||||
|
requestor.getListOfIds(List.class, listIdsReceiver, listIdsReceiver);
|
||||||
|
try {
|
||||||
|
Integer[] listIds = listIdsReceiver.await();
|
||||||
|
for (int i = 0; i < listIds.length; i++) {
|
||||||
|
requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
|
||||||
|
shoppingLists.add(listReceiver.await());
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
ListPickerDialogFragment listPickerDialog = new ListPickerDialogFragment(shoppingLists);
|
ListPickerDialogFragment listPickerDialog = new ListPickerDialogFragment(shoppingLists);
|
||||||
@ -136,7 +168,32 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendNewListName(String name) {
|
public void sendNewListName(String name) {AuthManager authManager = new AuthManager();
|
||||||
|
try {
|
||||||
|
authManager.signIn("merzn@purdue.edu", "Password123");
|
||||||
|
} catch (AuthException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Properties configs = new Properties();
|
||||||
|
try {
|
||||||
|
configs = AuthManager.loadProperties(this, "android.resource://" + getPackageName() + "/raw/auths.json");
|
||||||
|
} catch (IOException | JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey"));
|
||||||
|
SynchronousReceiver<Integer> idReceiver = new SynchronousReceiver<>();
|
||||||
|
|
||||||
|
com.example.listify.data.List newList = new List(-1, name, "user filled by lambda", Instant.now().toEpochMilli());
|
||||||
|
|
||||||
|
try {
|
||||||
|
requestor.postObject(newList, idReceiver, idReceiver);
|
||||||
|
System.out.println(idReceiver.await());
|
||||||
|
// TODO: add item to new list
|
||||||
|
newList.getItemID();
|
||||||
Toast.makeText(this, String.format("%s created", name), Toast.LENGTH_LONG).show();
|
Toast.makeText(this, String.format("%s created", name), Toast.LENGTH_LONG).show();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Toast.makeText(this, "An error occurred", Toast.LENGTH_LONG).show();
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -15,6 +15,7 @@ import androidx.annotation.NonNull;
|
|||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import androidx.fragment.app.DialogFragment;
|
import androidx.fragment.app.DialogFragment;
|
||||||
import com.example.listify.adapter.DisplayShoppingListsAdapter;
|
import com.example.listify.adapter.DisplayShoppingListsAdapter;
|
||||||
|
import com.example.listify.data.List;
|
||||||
import com.example.listify.model.ShoppingList;
|
import com.example.listify.model.ShoppingList;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
@ -32,10 +33,10 @@ public class ListPickerDialogFragment extends DialogFragment {
|
|||||||
Button btnMinus;
|
Button btnMinus;
|
||||||
Button btnPlus;
|
Button btnPlus;
|
||||||
EditText etQuantity;
|
EditText etQuantity;
|
||||||
private ArrayList<ShoppingList> userLists;
|
private ArrayList<List> userLists;
|
||||||
private int selectedListIndex;
|
private int selectedListIndex;
|
||||||
|
|
||||||
public ListPickerDialogFragment(ArrayList<ShoppingList> userLists) {
|
public ListPickerDialogFragment(ArrayList<List> userLists) {
|
||||||
this.userLists = userLists;
|
this.userLists = userLists;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,11 +64,13 @@ public class ListPickerDialogFragment extends DialogFragment {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// Display user's shopping lists
|
// Display user's shopping lists
|
||||||
userListsView = (ListView) root.findViewById(R.id.user_lists);
|
userListsView = (ListView) root.findViewById(R.id.user_lists);
|
||||||
displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), userLists);
|
displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), userLists);
|
||||||
userListsView.setAdapter(displayShoppingListsAdapter);
|
userListsView.setAdapter(displayShoppingListsAdapter);
|
||||||
|
|
||||||
|
// TODO: fix highlighting error
|
||||||
userListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
userListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||||
@ -75,7 +78,8 @@ public class ListPickerDialogFragment extends DialogFragment {
|
|||||||
parent.getChildAt(i).setBackgroundColor(Color.TRANSPARENT);
|
parent.getChildAt(i).setBackgroundColor(Color.TRANSPARENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
view.setBackgroundColor(Color.GREEN);
|
parent.getChildAt(position).setBackgroundColor(Color.GREEN);
|
||||||
|
// view.setBackgroundColor(Color.GREEN);
|
||||||
selectedListIndex = position;
|
selectedListIndex = position;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import android.util.Log;
|
|||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.ImageButton;
|
import android.widget.ImageButton;
|
||||||
|
import android.widget.Toast;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import androidx.drawerlayout.widget.DrawerLayout;
|
import androidx.drawerlayout.widget.DrawerLayout;
|
||||||
@ -20,7 +21,6 @@ import com.example.listify.data.List;
|
|||||||
import com.example.listify.data.ListEntry;
|
import com.example.listify.data.ListEntry;
|
||||||
import com.google.android.material.navigation.NavigationView;
|
import com.google.android.material.navigation.NavigationView;
|
||||||
import org.json.JSONException;
|
import org.json.JSONException;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -177,6 +177,30 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendNewListName(String name) {
|
public void sendNewListName(String name) {
|
||||||
|
AuthManager authManager = new AuthManager();
|
||||||
|
try {
|
||||||
|
authManager.signIn("merzn@purdue.edu", "Password123");
|
||||||
|
} catch (AuthException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Properties configs = new Properties();
|
||||||
|
try {
|
||||||
|
configs = AuthManager.loadProperties(this, "android.resource://" + getPackageName() + "/raw/auths.json");
|
||||||
|
} catch (IOException | JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey"));
|
||||||
|
SynchronousReceiver<Integer> idReceiver = new SynchronousReceiver<>();
|
||||||
|
|
||||||
|
List newList = new List(-1, name, "user filled by lambda", Instant.now().toEpochMilli());
|
||||||
|
|
||||||
|
try {
|
||||||
|
requestor.postObject(newList, idReceiver, idReceiver);
|
||||||
|
System.out.println(idReceiver.await());
|
||||||
|
Toast.makeText(this, String.format("%s created", name), Toast.LENGTH_LONG).show();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Toast.makeText(this, "An error occurred", Toast.LENGTH_LONG).show();
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -18,7 +18,7 @@ public class Requestor {
|
|||||||
String apiKey;
|
String apiKey;
|
||||||
OkHttpClient client;
|
OkHttpClient client;
|
||||||
|
|
||||||
Requestor(AuthManager authManager, String apiKey) {
|
public Requestor(AuthManager authManager, String apiKey) {
|
||||||
this.authManager = authManager;
|
this.authManager = authManager;
|
||||||
this.apiKey = apiKey;
|
this.apiKey = apiKey;
|
||||||
client = new OkHttpClient();
|
client = new OkHttpClient();
|
||||||
|
|||||||
@ -5,17 +5,31 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
|
import android.widget.Button;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
import android.widget.ImageButton;
|
import android.widget.ImageButton;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
import android.widget.SearchView;
|
import android.widget.SearchView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.amplifyframework.auth.AuthException;
|
||||||
import com.example.listify.adapter.SearchResultsListAdapter;
|
import com.example.listify.adapter.SearchResultsListAdapter;
|
||||||
|
import com.example.listify.data.Item;
|
||||||
|
import com.example.listify.data.ItemSearch;
|
||||||
|
import com.example.listify.data.ListEntry;
|
||||||
import com.example.listify.model.Product;
|
import com.example.listify.model.Product;
|
||||||
|
|
||||||
|
import org.json.JSONException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.time.Instant;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Properties;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
public class SearchResults extends AppCompatActivity implements SortDialogFragment.OnSortingListener {
|
public class SearchResults extends AppCompatActivity implements SortDialogFragment.OnSortingListener {
|
||||||
private ListView listView;
|
private ListView listView;
|
||||||
@ -131,39 +145,35 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void doSearch(String query) {
|
private void doSearch(String query) {
|
||||||
// TODO: Query Database
|
|
||||||
// TODO: Create a new Product Object for each result
|
|
||||||
// TODO: Add each result to productList
|
|
||||||
|
|
||||||
// Clear the old search results
|
// Clear the old search results
|
||||||
resultsProductList = new ArrayList<>();
|
resultsProductList.clear();
|
||||||
|
|
||||||
// Hardcode some search results...
|
AuthManager authManager = new AuthManager();
|
||||||
for (int i = 0; i < 2; i++) {
|
try {
|
||||||
Product a = new Product("Bottled Water", "0000", "Walmart", "0001", "0123456780", "Bro, it's water...", "Grocery", 13.37, "9/24/2020", "1", "http://3.bp.blogspot.com/-MfroPPQVDKo/UyhUZWqGvkI/AAAAAAAAB-I/DGk622onsvc/s1600/lettuce-b-kool-cat-meme.jpg");
|
authManager.signIn("merzn@purdue.edu", "Password123");
|
||||||
Product b = new Product("Tin Foil", "0001", "Walmart", "0001", "0123456781", "Not aluminum foil", "Grocery", 1.00, "9/24/2020", "1", "https://i.ytimg.com/vi/q9N1doYMxR0/maxresdefault.jpg");
|
} catch (AuthException e) {
|
||||||
Product c = new Product("Lettuce", "0002", "Walmart", "0001", "0123456782", "Burger King foot lettuce", "Grocery", 0.60, "9/24/2020", "1", "https://www.cattitudedaily.com/wp-content/uploads/2019/12/white-cat-meme-feature.jpg");
|
e.printStackTrace();
|
||||||
Product d = new Product("Video Game", "0003", "Walmart", "0001", "0123456783", "Fun Vidya Gaemz", "Electronics", 60.00, "9/24/2020", "1", "https://i1.wp.com/bestlifeonline.com/wp-content/uploads/2018/06/cat-meme-67.jpg?resize=1024%2C1024&ssl=1");
|
}
|
||||||
Product e = new Product("Mountain Dew", "0004", "Walmart", "0001", "0123456784", "Gamer fuel", "Grocery", 5.87, "9/24/2020", "1", "https://memeguy.com/photos/images/gaming-cat-7680.png");
|
Properties configs = new Properties();
|
||||||
Product f = new Product("Tire", "0005", "Kroger", "0002", "0123456785", "30 inch rims", "Automotive", 146.97, "9/24/2020", "1", "http://cdn.sheknows.com/articles/2013/05/pet5.jpg");
|
try {
|
||||||
Product g = new Product("This is a test for a product that has a very long title to see if the text overflows", "0006", "Target", "0003", "0123456786", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Elit ut aliquam purus sit amet luctus venenatis. Tellus orci ac auctor augue mauris augue neque gravida. Habitant morbi tristique senectus et netus. Dignissim diam quis enim lobortis. Suspendisse sed nisi lacus sed viverra tellus in. Viverra adipiscing at in tellus integer feugiat scelerisque. Volutpat consequat mauris nunc congue nisi vitae suscipit tellus. Habitant morbi tristique senectus et netus et malesuada. Quis enim lobortis scelerisque fermentum dui faucibus in ornare quam. Mattis pellentesque id nibh tortor id aliquet. Volutpat blandit aliquam etiam erat. Vestibulum lorem sed risus ultricies tristique nulla aliquet.\n" +
|
configs = AuthManager.loadProperties(this, "android.resource://" + getPackageName() + "/raw/auths.json");
|
||||||
"\n" +
|
} catch (IOException | JSONException e) {
|
||||||
"Placerat orci nulla pellentesque dignissim. Quisque non tellus orci ac. Mattis enim ut tellus elementum sagittis vitae et. Interdum velit euismod in pellentesque massa placerat duis ultricies. Id nibh tortor id aliquet lectus. Massa placerat duis ultricies lacus sed. Convallis convallis tellus id interdum velit laoreet id donec. Amet luctus venenatis lectus magna fringilla urna porttitor rhoncus. Sodales ut eu sem integer vitae justo. Viverra ipsum nunc aliquet bibendum enim facilisis.\n" +
|
e.printStackTrace();
|
||||||
"\n" +
|
}
|
||||||
"Eget felis eget nunc lobortis mattis aliquam faucibus purus. Odio morbi quis commodo odio aenean sed adipiscing. Hac habitasse platea dictumst quisque sagittis purus sit. Nam libero justo laoreet sit. Et malesuada fames ac turpis egestas. Erat nam at lectus urna duis convallis convallis. Morbi tincidunt ornare massa eget egestas purus viverra accumsan in. Ut venenatis tellus in metus vulputate eu scelerisque felis imperdiet. At auctor urna nunc id cursus. Sed elementum tempus egestas sed. Lorem dolor sed viverra ipsum nunc aliquet bibendum. Orci eu lobortis elementum nibh tellus molestie. Porttitor leo a diam sollicitudin tempor. Adipiscing bibendum est ultricies integer quis auctor elit sed. Arcu cursus euismod quis viverra nibh. A diam sollicitudin tempor id eu nisl.\n" +
|
|
||||||
"\n" +
|
Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey"));
|
||||||
"Sapien eget mi proin sed libero enim sed faucibus turpis. Pharetra massa massa ultricies mi quis hendrerit dolor magna. Integer enim neque volutpat ac tincidunt vitae semper. Euismod lacinia at quis risus sed vulputate. Ut venenatis tellus in metus vulputate eu scelerisque. Etiam erat velit scelerisque in dictum non consectetur. Viverra nam libero justo laoreet sit amet cursus sit. Arcu non sodales neque sodales. Vivamus arcu felis bibendum ut tristique et egestas quis. Sed adipiscing diam donec adipiscing tristique risus. Sollicitudin tempor id eu nisl nunc mi ipsum faucibus vitae. Velit ut tortor pretium viverra suspendisse potenti nullam ac tortor. Non nisi est sit amet facilisis magna etiam. Tortor at risus viverra adipiscing. Donec ultrices tincidunt arcu non sodales neque sodales. Eget egestas purus viverra accumsan. Enim lobortis scelerisque fermentum dui faucibus in ornare. Porttitor massa id neque aliquam. Ut consequat semper viverra nam. Orci ac auctor augue mauris augue neque gravida.\n" +
|
|
||||||
"\n" +
|
SynchronousReceiver<ItemSearch> itemReceiver = new SynchronousReceiver<>();
|
||||||
"Lacus sed viverra tellus in hac habitasse platea dictumst. Nec ullamcorper sit amet risus nullam eget felis eget nunc. Semper feugiat nibh sed pulvinar. Consequat nisl vel pretium lectus quam id leo in. Volutpat maecenas volutpat blandit aliquam etiam erat velit scelerisque. Faucibus a pellentesque sit amet porttitor eget. Sed viverra tellus in hac habitasse platea dictumst vestibulum. Placerat vestibulum lectus mauris ultrices eros in cursus turpis. Sed tempus urna et pharetra pharetra massa massa ultricies mi. Ornare arcu odio ut sem. Ornare arcu dui vivamus arcu felis bibendum ut. Feugiat pretium nibh ipsum consequat. Consectetur adipiscing elit ut aliquam purus sit amet luctus venenatis. Felis eget velit aliquet sagittis id consectetur purus ut.", "Automotive", 45.22, "9/24/2020", "1", "http://cdn.sheknows.com/articles/2013/05/pet5.jpg");
|
requestor.getObject(query, ItemSearch.class, itemReceiver, itemReceiver);
|
||||||
Product h = new Product("Tin Foil", "0001", "Kroger", "0001", "0123456781", "Not aluminum foil", "Grocery", 1.00, "9/24/2020", "1", "https://i.ytimg.com/vi/q9N1doYMxR0/maxresdefault.jpg");
|
ItemSearch results;
|
||||||
resultsProductList.add(a);
|
try {
|
||||||
resultsProductList.add(b);
|
results = itemReceiver.await();
|
||||||
resultsProductList.add(c);
|
for (int i = 0; i < results.getResults().size(); i++) {
|
||||||
resultsProductList.add(d);
|
resultsProductList.add(new Product(results.getResults().get(i).getDescription(), results.getResults().get(i).getProductID(), Integer.toString(results.getResults().get(i).getChainID()), results.getResults().get(i).getChainID(), results.getResults().get(i).getUpc(), results.getResults().get(i).getDescription(), results.getResults().get(i).getPrice(), results.getResults().get(i).getImageURL(), results.getResults().get(i).getDepartment()));
|
||||||
resultsProductList.add(e);
|
}
|
||||||
resultsProductList.add(f);
|
} catch (Exception e) {
|
||||||
resultsProductList.add(g);
|
e.printStackTrace();
|
||||||
resultsProductList.add(h);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a list of all stores in the results so the user can filter by store name
|
// Create a list of all stores in the results so the user can filter by store name
|
||||||
@ -212,9 +222,9 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
|
|||||||
resultsProductListSorted.sort(new Comparator<Product>() {
|
resultsProductListSorted.sort(new Comparator<Product>() {
|
||||||
@Override
|
@Override
|
||||||
public int compare(Product a, Product b) {
|
public int compare(Product a, Product b) {
|
||||||
if (b.getPrice() - a.getPrice() > 0) {
|
if (b.getPrice().compareTo(a.getPrice()) > 0) {
|
||||||
return 1;
|
return 1;
|
||||||
} else if (b.getPrice() - a.getPrice() < 0) {
|
} else if (b.getPrice().compareTo(a.getPrice()) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
} else {
|
} else {
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@ -8,15 +8,15 @@ import android.view.ViewGroup;
|
|||||||
import android.widget.BaseAdapter;
|
import android.widget.BaseAdapter;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import com.example.listify.R;
|
import com.example.listify.R;
|
||||||
import com.example.listify.model.ShoppingList;
|
import com.example.listify.data.List;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class DisplayShoppingListsAdapter extends BaseAdapter {
|
public class DisplayShoppingListsAdapter extends BaseAdapter {
|
||||||
private Activity activity;
|
private Activity activity;
|
||||||
private ArrayList<ShoppingList> lists;
|
private ArrayList<List> lists;
|
||||||
private LayoutInflater inflater;
|
private LayoutInflater inflater;
|
||||||
|
|
||||||
public DisplayShoppingListsAdapter(Activity activity, ArrayList<ShoppingList> lists){
|
public DisplayShoppingListsAdapter(Activity activity, ArrayList<List> lists){
|
||||||
this.activity = activity;
|
this.activity = activity;
|
||||||
this.lists = lists;
|
this.lists = lists;
|
||||||
}
|
}
|
||||||
@ -45,7 +45,7 @@ public class DisplayShoppingListsAdapter extends BaseAdapter {
|
|||||||
convertView = inflater.inflate(R.layout.display_shopping_lists_item, null);
|
convertView = inflater.inflate(R.layout.display_shopping_lists_item, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
ShoppingList curList = lists.get(position);
|
List curList = lists.get(position);
|
||||||
|
|
||||||
TextView tvListName = (TextView) convertView.findViewById(R.id.shopping_list_name);
|
TextView tvListName = (TextView) convertView.findViewById(R.id.shopping_list_name);
|
||||||
tvListName.setText(curList.getName());
|
tvListName.setText(curList.getName());
|
||||||
|
|||||||
@ -1,24 +1,38 @@
|
|||||||
package com.example.listify.model;
|
package com.example.listify.model;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
public class Product implements Serializable {
|
public class Product implements Serializable {
|
||||||
private String itemName;
|
private String itemName;
|
||||||
private String itemId;
|
private int itemId;
|
||||||
private String chainName;
|
private String chainName;
|
||||||
private String chainId;
|
private int chainId;
|
||||||
private String upc;
|
private String upc;
|
||||||
private String description;
|
private String description;
|
||||||
private String department;
|
private String department;
|
||||||
private double price;
|
private BigDecimal price;
|
||||||
private String retrievedDate;
|
private String retrievedDate;
|
||||||
private String fetchCounts;
|
private String fetchCounts;
|
||||||
private String imageUrl;
|
private String imageUrl;
|
||||||
|
|
||||||
public Product() {}
|
public Product() {}
|
||||||
|
|
||||||
public Product(String itemName, String itemId, String chainName, String chainId, String upc,
|
public Product(String itemName, int itemId, String chainName, int chainId, String upc, String description, BigDecimal price, String imageUrl, String department) {
|
||||||
String description, String department, double price, String retrievedDate,
|
this.itemName = itemName;
|
||||||
|
this.itemId = itemId;
|
||||||
|
this.chainName = chainName;
|
||||||
|
this.chainId = chainId;
|
||||||
|
this.upc = upc;
|
||||||
|
this.description = description;
|
||||||
|
this.price = price;
|
||||||
|
this.imageUrl = imageUrl;
|
||||||
|
this.department = department;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public Product(String itemName, int itemId, String chainName, int chainId, String upc,
|
||||||
|
String description, String department, BigDecimal price, String retrievedDate,
|
||||||
String fetchCounts, String imageUrl) {
|
String fetchCounts, String imageUrl) {
|
||||||
this.itemName = itemName;
|
this.itemName = itemName;
|
||||||
this.itemId = itemId;
|
this.itemId = itemId;
|
||||||
@ -41,11 +55,11 @@ public class Product implements Serializable {
|
|||||||
this.itemName = itemName;
|
this.itemName = itemName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getItemId() {
|
public int getItemId() {
|
||||||
return itemId;
|
return itemId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setItemId(String itemId) {
|
public void setItemId(int itemId) {
|
||||||
this.itemId = itemId;
|
this.itemId = itemId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,11 +71,11 @@ public class Product implements Serializable {
|
|||||||
this.chainName = chainName;
|
this.chainName = chainName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getChainId() {
|
public int getChainId() {
|
||||||
return chainId;
|
return chainId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setChainId(String chainId) {
|
public void setChainId(int chainId) {
|
||||||
this.chainId = chainId;
|
this.chainId = chainId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,11 +103,11 @@ public class Product implements Serializable {
|
|||||||
this.department = department;
|
this.department = department;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getPrice() {
|
public BigDecimal getPrice() {
|
||||||
return price;
|
return price;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPrice(double price) {
|
public void setPrice(BigDecimal price) {
|
||||||
this.price = price;
|
this.price = price;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -12,33 +12,63 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
|
|
||||||
|
import com.amplifyframework.auth.AuthException;
|
||||||
|
import com.example.listify.AuthManager;
|
||||||
import com.example.listify.CreateListDialogFragment;
|
import com.example.listify.CreateListDialogFragment;
|
||||||
import com.example.listify.MainActivity;
|
import com.example.listify.MainActivity;
|
||||||
import com.example.listify.R;
|
import com.example.listify.R;
|
||||||
|
import com.example.listify.Requestor;
|
||||||
|
import com.example.listify.SynchronousReceiver;
|
||||||
import com.example.listify.adapter.DisplayShoppingListsAdapter;
|
import com.example.listify.adapter.DisplayShoppingListsAdapter;
|
||||||
|
import com.example.listify.data.List;
|
||||||
import com.example.listify.model.ShoppingList;
|
import com.example.listify.model.ShoppingList;
|
||||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||||
|
|
||||||
|
import org.json.JSONException;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.time.Instant;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
public class ListsFragment extends Fragment implements CreateListDialogFragment.OnNewListListener {
|
public class ListsFragment extends Fragment implements CreateListDialogFragment.OnNewListListener {
|
||||||
|
ArrayList<List> shoppingLists = new ArrayList<>();
|
||||||
ListView shoppingListsView;
|
ListView shoppingListsView;
|
||||||
|
|
||||||
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
View root = inflater.inflate(R.layout.fragment_lists, container, false);
|
View root = inflater.inflate(R.layout.fragment_lists, container, false);
|
||||||
|
|
||||||
// Toolbar toolbar = (Toolbar) root.findViewById(R.id.toolbar_lists);
|
|
||||||
// ((AppCompatActivity)getActivity()).setActionBar(toolbar);
|
|
||||||
|
|
||||||
// Hardcode shopping lists to demonstrate displaying lists
|
|
||||||
shoppingListsView = root.findViewById(R.id.shopping_lists);
|
shoppingListsView = root.findViewById(R.id.shopping_lists);
|
||||||
ShoppingList a = new ShoppingList("first list");
|
|
||||||
ShoppingList b = new ShoppingList("Groceries");
|
// TODO: Switch this to async
|
||||||
ShoppingList c = new ShoppingList("Expensive Stuff");
|
AuthManager authManager = new AuthManager();
|
||||||
ArrayList<ShoppingList> shoppingLists = new ArrayList<>();
|
try {
|
||||||
shoppingLists.add(a);
|
authManager.signIn("merzn@purdue.edu", "Password123");
|
||||||
shoppingLists.add(b);
|
} catch (AuthException e) {
|
||||||
shoppingLists.add(c);
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Properties configs = new Properties();
|
||||||
|
try {
|
||||||
|
configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json");
|
||||||
|
} catch (IOException | JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey"));
|
||||||
|
SynchronousReceiver<Integer[]> listIdsReceiver = new SynchronousReceiver<>();
|
||||||
|
SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
|
||||||
|
|
||||||
|
requestor.getListOfIds(List.class, listIdsReceiver, listIdsReceiver);
|
||||||
|
try {
|
||||||
|
Integer[] listIds = listIdsReceiver.await();
|
||||||
|
for (int i = 0; i < listIds.length; i++) {
|
||||||
|
requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
|
||||||
|
shoppingLists.add(listReceiver.await());
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set adapter and display this users lists
|
// Set adapter and display this users lists
|
||||||
DisplayShoppingListsAdapter displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), shoppingLists);
|
DisplayShoppingListsAdapter displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), shoppingLists);
|
||||||
@ -64,6 +94,30 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sendNewListName(String name) {
|
public void sendNewListName(String name) {
|
||||||
Toast.makeText(getActivity(), String.format("%s created", name), Toast.LENGTH_LONG).show();
|
AuthManager authManager = new AuthManager();
|
||||||
|
try {
|
||||||
|
authManager.signIn("merzn@purdue.edu", "Password123");
|
||||||
|
} catch (AuthException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Properties configs = new Properties();
|
||||||
|
try {
|
||||||
|
configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json");
|
||||||
|
} catch (IOException | JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
Requestor requestor = new Requestor(authManager, configs.getProperty("apiKey"));
|
||||||
|
SynchronousReceiver<Integer> idReceiver = new SynchronousReceiver<>();
|
||||||
|
|
||||||
|
List newList = new List(-1, name, "user filled by lambda", Instant.now().toEpochMilli());
|
||||||
|
|
||||||
|
try {
|
||||||
|
requestor.postObject(newList, idReceiver, idReceiver);
|
||||||
|
System.out.println(idReceiver.await());
|
||||||
|
Toast.makeText(getContext(), String.format("%s created", name), Toast.LENGTH_LONG).show();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Toast.makeText(getContext(), "An error occurred", Toast.LENGTH_LONG).show();
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -32,7 +32,7 @@
|
|||||||
<string name="menu_lists">My Lists</string>
|
<string name="menu_lists">My Lists</string>
|
||||||
<string name="title_activity_item_details">ItemDetails</string>
|
<string name="title_activity_item_details">ItemDetails</string>
|
||||||
<string name="add_to_list">Add to list</string>
|
<string name="add_to_list">Add to list</string>
|
||||||
<string name="create_new_list">Create new list</string>
|
<string name="create_new_list">Add to new list</string>
|
||||||
<string name="default_product_name">Product Name</string>
|
<string name="default_product_name">Product Name</string>
|
||||||
<string name="default_store">Store</string>
|
<string name="default_store">Store</string>
|
||||||
<string name="default__00_00">$00.00</string>
|
<string name="default__00_00">$00.00</string>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user