Skip to content

Commit

Permalink
Removed product images, removed unused image resources, added new abo…
Browse files Browse the repository at this point in the history
…ut icon
  • Loading branch information
Phyxtra committed Jun 30, 2015
1 parent ec39dd9 commit 50a106d
Show file tree
Hide file tree
Showing 18 changed files with 9 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;

Expand All @@ -28,7 +26,7 @@ public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapte

public static class ProductViewHolder extends RecyclerView.ViewHolder {
private TextView cart_product_name;
private ImageView cart_product_photo;
//private ImageView cart_product_photo;
private TextView cart_product_price;
private Spinner cart_product_quantity_spinner;
private TextView cart_product_quantity;
Expand All @@ -38,7 +36,7 @@ public static class ProductViewHolder extends RecyclerView.ViewHolder {
this.cart_product_quantity = (TextView) itemView.findViewById(R.id.cart_product_quantity);
this.cart_product_quantity_spinner = (Spinner) itemView.findViewById(R.id.cart_product_quantity_spinner);
this.cart_product_name = (TextView) itemView.findViewById(R.id.cart_product_name);
this.cart_product_photo = (ImageView) itemView.findViewById(R.id.cart_product_photo);
//this.cart_product_photo = (ImageView) itemView.findViewById(R.id.cart_product_photo);
this.cart_product_price = (TextView) itemView.findViewById(R.id.cart_product_price);
}
}
Expand Down Expand Up @@ -94,7 +92,7 @@ public void onBindViewHolder(final ProductViewHolder productViewHolder, final in
Html.fromHtml(productViewHolder.itemView.getResources().getString(R.string.currency)));

// set img
productViewHolder.cart_product_photo.setImageResource(R.drawable.no_image_avl);
// productViewHolder.cart_product_photo.setImageResource(R.drawable.no_image_avl);

// check the availability of attribute "unit" from product
String italic_unit = productViewHolder.itemView.getResources().getString(R.string.cart_product_quantity) +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public AppbarDrawerInclude(ActionBarActivity mainActivity) {
navdrawer.addItem(new NavigationDrawerItem("News", NewsActivity.class, R.drawable.news));
navdrawer.addItem(new NavigationDrawerItem("Produkt scannen", BarcodeScannerActivity.class, R.drawable.barcode));
navdrawer.addItem(new NavigationDrawerItem("Produkt suchen", ProductSearchActivity.class, R.drawable.produktsuche));
navdrawer.addItem(new NavigationDrawerItem(mainActivity.getResources().getString(R.string.about_title), AboutActivity.class, android.R.drawable.ic_menu_info_details));
navdrawer.addItem(new NavigationDrawerItem(mainActivity.getResources().getString(R.string.about_title), AboutActivity.class, R.drawable.about));

mAdapter = new NavigationDrawerAdapter(navdrawer, true);

Expand Down
Binary file added app/src/main/res/drawable-hdpi/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-hdpi/no_image_avl.png
Binary file not shown.
Binary file added app/src/main/res/drawable-ldpi/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-mdpi/no_image_avl.png
Binary file not shown.
Binary file added app/src/main/res/drawable-xhdpi/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-xhdpi/no_image_avl.png
Binary file not shown.
Binary file added app/src/main/res/drawable-xxhdpi/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-xxhdpi/no_image_avl.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-xxxhdpi/no_image_avl.png
Binary file not shown.
6 changes: 3 additions & 3 deletions app/src/main/res/layout/cart_entry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/cart_card_view"
android:layout_gravity="center"
android:layout_width="fill_parent"
android:layout_height="@dimen/product_card_height"
android:layout_marginRight="@dimen/product_card_margin"
Expand All @@ -16,14 +15,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/product_card_margin"
android:paddingLeft="@dimen/product_price_padding"
android:paddingRight="@dimen/product_price_padding"
android:paddingBottom="@dimen/product_card_margin"
android:paddingTop="@dimen/product_card_margin"
android:orientation="horizontal"
android:gravity="center_vertical"
android:id="@+id/product_view">

<!--
<ImageView
android:layout_width="wrap_content"
android:layout_height="fill_parent"
Expand All @@ -35,6 +34,7 @@
android:layout_marginLeft="@dimen/zero"
android:layout_marginTop="@dimen/zero"
android:layout_gravity="center_vertical|left"/>
-->
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="match_parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/dialog_add_to_cart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
android:orientation="vertical"
android:padding="24dp">

<!--
<ImageView
android:id="@+id/add_to_cart_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/no_image_avl" />

-->
<TextView
android:id="@+id/add_to_cart_name"
android:layout_width="wrap_content"
Expand Down
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.

0 comments on commit 50a106d

Please sign in to comment.