diff --git a/Lookify/.idea/misc.xml b/Lookify/.idea/misc.xml index 37a7509..7bfef59 100644 --- a/Lookify/.idea/misc.xml +++ b/Lookify/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/Lookify/app/src/main/java/com/example/lookifyv2/Product.java b/Lookify/app/src/main/java/com/example/lookifyv2/Product.java index 5ef8190..b1a62d9 100644 --- a/Lookify/app/src/main/java/com/example/lookifyv2/Product.java +++ b/Lookify/app/src/main/java/com/example/lookifyv2/Product.java @@ -12,14 +12,9 @@ public class Product extends AppCompatActivity { setContentView(R.layout.activity_product); } - /** - * Created by AndroidBash on 09/05/2016. - */ - private int id; private String imageLink; private String productPrice; - private String productCode; private String productName; private String productRetailer; @@ -30,13 +25,12 @@ public class Product extends AppCompatActivity { private String productSex; - public Product(int id, String imageLink, String productPrice, String productCode, String productName, String productRetailer, + public Product(int id, String productCode, String productName, String imageLink, String productPrice, String productRetailer, String productColour, String productStyle, String productCollection, String productType, String productSex) { this.id = id; this.imageLink = imageLink; this.productPrice = productPrice; - this.productCode = productCode; this.productName = productName; this.productRetailer = productRetailer; @@ -50,7 +44,6 @@ public class Product extends AppCompatActivity { public int getId() { return id; } - public void setId(int id) { this.id = id; } @@ -58,7 +51,6 @@ public class Product extends AppCompatActivity { public String getImageLink() { return imageLink; } - public void setImageLink(String imageLink) { this.imageLink = imageLink; } @@ -66,7 +58,6 @@ public class Product extends AppCompatActivity { public String getproductPrice() { return productPrice; } - public void setproductPrice(String productPrice) { this.productPrice = productPrice; } @@ -74,7 +65,6 @@ public class Product extends AppCompatActivity { public String getproductCode() { return productCode; } - public void setproductCode(String productCode) { this.productCode = productCode; } @@ -82,7 +72,6 @@ public class Product extends AppCompatActivity { public String getproductName() { return productName; } - public void setproductName(String productName) { this.productName = productName; } @@ -90,15 +79,11 @@ public class Product extends AppCompatActivity { public String getproductRetailer() { return productRetailer; } - - public void setproductRetailer(String productRetailer) { - this.productRetailer = productRetailer; - } + public void setproductRetailer(String productRetailer) { this.productRetailer = productRetailer; } public String getproductColour() { return productColour; } - public void setproductColour(String productColour) { this.productColour = productColour; } @@ -106,7 +91,6 @@ public class Product extends AppCompatActivity { public String getproductStyle() { return productStyle; } - public void setproductStyle(String productStyle) { this.productStyle = productStyle; } @@ -114,15 +98,11 @@ public class Product extends AppCompatActivity { public String getproductCollection() { return productCollection; } - - public void setproductCollection(String productCollection) { - this.productCollection = productCollection; - } + public void setproductCollection(String productCollection) { this.productCollection = productCollection; } public String getproductType() { return productType; } - public void setproductType(String productType) { this.productType = productType; } @@ -130,7 +110,6 @@ public class Product extends AppCompatActivity { public String getproductSex() { return productSex; } - public void setproductSex(String productSex) { this.productSex = productSex; } diff --git a/Lookify/app/src/main/java/com/example/lookifyv2/ProductsAdapter.java b/Lookify/app/src/main/java/com/example/lookifyv2/ProductsAdapter.java index 31fbd48..234a4b4 100644 --- a/Lookify/app/src/main/java/com/example/lookifyv2/ProductsAdapter.java +++ b/Lookify/app/src/main/java/com/example/lookifyv2/ProductsAdapter.java @@ -12,7 +12,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.PopupMenu; //????????????????????? +import android.widget.PopupMenu; import android.widget.TextView; import android.widget.Toast; @@ -41,9 +41,10 @@ public class ProductsAdapter extends RecyclerView.Adapter + android:focusable="true" + android:scaleType="centerCrop" + android:background="?attr/selectableItemBackgroundBorderless"/> + + + android:textColor="@color/cardview_dark_background" /> + android:textColor="@color/cardview_dark_background" /> diff --git a/Lookify/app/src/main/res/layout/popup.xml b/Lookify/app/src/main/res/layout/popup.xml new file mode 100644 index 0000000..3b9cda0 --- /dev/null +++ b/Lookify/app/src/main/res/layout/popup.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + +