diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java
index d02d414..e3f9aad 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivity.java
@@ -16,6 +16,7 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.ImageView;
import android.widget.TextView;
import com.example.nemophila.entities.Account;
@@ -212,6 +213,7 @@
holder.rateView.setText(list.get(position).getRate());
holder.genreView.setText(list.get(position).getGenre());
holder.commentView.setText(list.get(position).getComment());
+// holder.iconView.setImageResource(list.get(position).getIcon());
}
@Override
@@ -227,14 +229,22 @@
public TextView rateView;
public TextView genreView;
public TextView commentView;
+ public ImageView iconView;
+ public ImageView image1View;
+ public ImageView image2View;
+ public ImageView image3View;
public ShopAcViewHolder(@NonNull View itemView) {
super(itemView);
- nameView = (TextView) itemView.findViewById(R.id.userName);
- dateView = (TextView) itemView.findViewById(R.id.date);
- rateView = (TextView) itemView.findViewById(R.id.rate);
- genreView = (TextView) itemView.findViewById(R.id.genre);
- commentView = (TextView) itemView.findViewById(R.id.comment);
+ nameView = (TextView) itemView.findViewById(R.id.shopAcUserName);
+ dateView = (TextView) itemView.findViewById(R.id.shopAcDate);
+ rateView = (TextView) itemView.findViewById(R.id.shopAcRate);
+ genreView = (TextView) itemView.findViewById(R.id.shopAcGenre);
+ commentView = (TextView) itemView.findViewById(R.id.shopAcComment);
+ iconView = (ImageView) itemView.findViewById(R.id.shopAcIconPic);
+ image1View = (ImageView) itemView.findViewById(R.id.shopAcImage1);
+ image2View = (ImageView) itemView.findViewById(R.id.shopAcImage2);
+ image3View = (ImageView) itemView.findViewById(R.id.shopAcImage3);
}
}
@@ -245,6 +255,10 @@
private String rate;
private String genre;
private String comment;
+ private String icon;
+ private String image1;
+ private String image2;
+ private String image3;
public String getName() {
return name;
@@ -280,6 +294,27 @@
public void setComment(String comment) {
this.comment = comment;
}
+
+ public String getIcon() { return icon; }
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ public String getImage() { return image1; }
+ public void setImage1(String image1) {
+ this.image1 = image1;
+ }
+
+ public String getImage2() { return image2; }
+ public void setImage2(String image2) {
+ this.image2 = image2;
+ }
+
+ public String getImage3() { return image3; }
+ public void setImage3(String image3) {
+ this.image3 = image3;
+ }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_friend.xml b/app/src/main/res/layout/activity_friend.xml
index e42699e..e22a6fe 100644
--- a/app/src/main/res/layout/activity_friend.xml
+++ b/app/src/main/res/layout/activity_friend.xml
@@ -53,14 +53,14 @@
android:id="@+id/friendsList"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:visibility="invisible"/>
+ android:visibility="visible"/>
+ android:visibility="invisible">
-
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_shop_activity_posts.xml b/app/src/main/res/layout/layout_shop_activity_posts.xml
index 1e9ae11..4465951 100644
--- a/app/src/main/res/layout/layout_shop_activity_posts.xml
+++ b/app/src/main/res/layout/layout_shop_activity_posts.xml
@@ -15,30 +15,30 @@
android:orientation="horizontal">
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file