[이벤트][Common] 참여형 사진추가 로직 수정

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationFragment.java

@@ -161,11 +161,9 @@ public class EventParticipationFragment extends FragmentBase<EventParticipationP
         uploadImage = BitmapFactory.decodeStream(inputStream);
         inputStream.close();
         presenter.onEvent(new Event.Builder(Event.IMAGE).build());
-        // Log.e("APP#  EventParticipationFragment | onActivityResult", "|" + image.getWidth() + "," + image.getHeight());
 
       } catch (Exception e) {
         e.printStackTrace();
-        // Log.e("APP#  EventParticipationFragment | onActivityResult", "|" + "error");
       }
     }
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationImageViewHolder.java

@@ -10,9 +10,6 @@ import android.widget.ImageView;
 
 import com.wefika.flowlayout.FlowLayout;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -33,13 +30,12 @@ public class EventParticipationImageViewHolder extends EventParticipationView {
   private ConstraintLayout layoutCamera;
   private FlowLayout container;
   private IEventListener listener;
-  private List<Bitmap> imageList;
+  private int count;
 
   public EventParticipationImageViewHolder(View view) {
     super(view);
     layoutCamera = view.findViewById(R.id.layout_camera);
     container = view.findViewById(R.id.layout_container);
-    imageList = new ArrayList<>();
   }
 
   @Override
@@ -53,42 +49,41 @@ public class EventParticipationImageViewHolder extends EventParticipationView {
 
   @Override
   public void setUploadImage(Bitmap image) {
-
-    imageList.add(image);
+    ++count;
+    Log.e("APP#  EventParticipationImageViewHolder | setUploadImage", "| count" + count);
     LayoutInflater inflater = (LayoutInflater) itemView.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    View view = inflater.inflate(R.layout.capture_image_view, null);
-    ImageView albumImage = view.findViewById(R.id.image_view_album);
-    ImageView deleteButton = view.findViewById(R.id.button_delete);
 
     FlowLayout.LayoutParams layoutParams = new FlowLayout.LayoutParams(FlowLayout.LayoutParams.WRAP_CONTENT, FlowLayout.LayoutParams.WRAP_CONTENT);
-    layoutParams.leftMargin = ResourceUtil.dpToPx(5);
-    layoutParams.rightMargin = ResourceUtil.dpToPx(5);
-    layoutParams.topMargin = ResourceUtil.dpToPx(5);
-    layoutParams.bottomMargin = ResourceUtil.dpToPx(5);
-
-    for (int i = 0; i <= imageList.size(); ++i) {
-      setUploadButtonVisible();
-      Log.e("APP#  EventParticipationImageViewHolder | setUploadImage", "| i ===> " + i);
-      deleteButton.setOnClickListener(new onClickDeleteButton(i) {
-        @Override
-        public void onClick(View view) {
-          Log.e("APP#  EventParticipationImageViewHolder | onClick", "| index ===>" + index);
-          container.removeViewAt(index);
-          imageList.remove(index);
-          setUploadButtonVisible();
-
-        }
-      });
-      albumImage.setImageBitmap(image);
-      container.addView(view, 0, layoutParams);
-    }
+    layoutParams.leftMargin = ResourceUtil.dpToPx(2);
+    layoutParams.rightMargin = ResourceUtil.dpToPx(2);
+    layoutParams.topMargin = ResourceUtil.dpToPx(2);
+    layoutParams.bottomMargin = ResourceUtil.dpToPx(2);
+
+    setUploadButtonVisible();
+    View imageView = inflater.inflate(R.layout.capture_image_view, null);
+
+    ImageView albumImage = imageView.findViewById(R.id.image_view_album);
+    ImageView deleteButton = imageView.findViewById(R.id.button_delete);
+
+    deleteButton.setOnClickListener(new onClickDeleteButton(count - 1) {
+      @Override
+      public void onClick(View view) {
+        container.removeView(imageView);
+        // TODO: 프리젠터에서 데이터 삭제 처리 필요
+        listener.onEvent(new Event.Builder(Event.DELETE).build());
+        --count;
+        setUploadButtonVisible();
+      }
+    });
+
+    albumImage.setImageBitmap(image);
+    container.addView(imageView, 0, layoutParams);
 
-    Log.e("APP#  EventParticipationImageViewHolder | setUploadImage", "| imageList.size()" + imageList.size());
   }
 
 
   private void setUploadButtonVisible() {
-    if (imageList.size() >= 10) {
+    if (count >= 10) {
       layoutCamera.setVisibility(View.GONE);
     }
     else {
@@ -102,7 +97,6 @@ public class EventParticipationImageViewHolder extends EventParticipationView {
 
     public onClickDeleteButton(int index) {
       this.index = index;
-      Log.e("APP#  onClickDeleteButton | onClickDeleteButton", "| index" + index);
     }
   }
 }

app/src/main/res/layout/capture_image_view.xml

@@ -3,8 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="80dp"
-  android:layout_height="80dp"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
   android:layout_marginStart="5dp"
   android:layout_marginEnd="5dp"
   app:layout_constraintBottom_toBottomOf="parent"
@@ -13,8 +13,8 @@
   app:layout_constraintTop_toTopOf="parent">
 
   <android.support.constraint.ConstraintLayout
-    android:layout_width="73dp"
-    android:layout_height="73dp"
+    android:layout_width="80dp"
+    android:layout_height="80dp"
     android:background="@drawable/rectangle_cebebeb"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
@@ -25,14 +25,13 @@
       android:id="@+id/image_view_album"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
+      android:layout_margin="3dp"
       android:scaleType="centerCrop"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintHorizontal_bias="1.0"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintVertical_bias="0.0"
-      tools:background="@color/C999999"/>
+      tools:src="@color/C999999"/>
 
 
   </android.support.constraint.ConstraintLayout>