diff --git a/Listify/app/src/main/java/com/example/listify/ItemDetails.java b/Listify/app/src/main/java/com/example/listify/ItemDetails.java index b672924..415d1a4 100644 --- a/Listify/app/src/main/java/com/example/listify/ItemDetails.java +++ b/Listify/app/src/main/java/com/example/listify/ItemDetails.java @@ -52,7 +52,6 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr // Load Product object from search results activity curProduct = (Product) getIntent().getSerializableExtra("SelectedProduct"); - // Set up floating action buttons FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); linAddItem = (LinearLayout) findViewById(R.id.lin_add_item); @@ -123,8 +122,8 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr tvItemPrice = (TextView) findViewById(R.id.item_price); tvItemPrice.setText(String.format("$%.2f", curProduct.getPrice())); - tvItemDesc = (TextView) findViewById(R.id.item_desc); - tvItemDesc.setText(curProduct.getDescription()); +// tvItemDesc = (TextView) findViewById(R.id.item_desc); +// tvItemDesc.setText(curProduct.getDescription()); tvCreateNew = (TextView) findViewById(R.id.create_new_list); tvCreateNew.setVisibility(View.INVISIBLE); diff --git a/Listify/app/src/main/java/com/example/listify/adapter/SearchResultsListAdapter.java b/Listify/app/src/main/java/com/example/listify/adapter/SearchResultsListAdapter.java index cc4306c..bc02c73 100644 --- a/Listify/app/src/main/java/com/example/listify/adapter/SearchResultsListAdapter.java +++ b/Listify/app/src/main/java/com/example/listify/adapter/SearchResultsListAdapter.java @@ -57,8 +57,8 @@ public class SearchResultsListAdapter extends BaseAdapter { Product product = productList.get(position); // TODO: If image url is broken, display @drawable/ic_baseline_broken_image_600.xml Glide.with(activity).load(product.getImageUrl()).into(productImage); - if (product.getItemName().length() >= 35) { - itemName.setText(product.getItemName().substring(0, 35) + "..."); + if (product.getItemName().length() >= 60) { + itemName.setText(product.getItemName().substring(0, 60) + "..."); } else { itemName.setText(product.getItemName()); } diff --git a/Listify/app/src/main/res/layout/content_item_details.xml b/Listify/app/src/main/res/layout/content_item_details.xml index 0e98ba7..1d7fdf6 100644 --- a/Listify/app/src/main/res/layout/content_item_details.xml +++ b/Listify/app/src/main/res/layout/content_item_details.xml @@ -8,15 +8,13 @@ @@ -24,26 +22,23 @@ android:id="@+id/store_name" android:layout_width="126dp" android:layout_height="28dp" - android:layout_marginStart="52dp" - android:layout_marginTop="50dp" + android:layout_marginStart="50dp" + android:layout_marginTop="90dp" android:text="@string/default_store" - app:layout_constraintBottom_toTopOf="@+id/item_image" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="1.0" /> @@ -56,22 +51,18 @@ android:layout_marginBottom="25dp" android:text="@string/default__00_00" android:textSize="16sp" - app:layout_constraintBottom_toTopOf="@+id/item_desc" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/item_image" /> - - + + + + + + + + + + \ No newline at end of file diff --git a/Listify/app/src/main/res/layout/search_list_item.xml b/Listify/app/src/main/res/layout/search_list_item.xml index 469752d..02eb7e4 100644 --- a/Listify/app/src/main/res/layout/search_list_item.xml +++ b/Listify/app/src/main/res/layout/search_list_item.xml @@ -44,6 +44,7 @@ android:paddingTop="20dp" android:textSize="12sp" android:layout_toEndOf="@+id/item_image" + android:layout_alignParentBottom="true" android:text=""/>