Browse Source

Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

Hasemi 7 years ago
parent
commit
2d8e389d49

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/activity/MainActivity.java

@@ -101,8 +101,7 @@ public class MainActivity extends AppCompatActivity {
   private boolean exitToBack() {
     final FragmentBase fragment = (FragmentBase) getSupportFragmentManager().findFragmentById(R.id.container_main);
     if (null != fragment) {
-      fragment.onBackPressed();
-      return true;
+      return fragment.onBackPressed();
     }
     return false;
   }

+ 35 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/AddMyBucketListBean.java

@@ -0,0 +1,35 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.bean;
+
+import android.support.annotation.DrawableRes;
+
+/**
+ * AddMyBucketListBean
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 10. 26.]   [최초 작성]
+ * @since 2018. 10. 26.
+ */
+public class AddMyBucketListBean extends TextImageBean {
+
+  @DrawableRes
+  private int imageBigResource;
+
+  public AddMyBucketListBean(int imageResource, int textResource, int imageBigResource) {
+    super(imageResource, textResource);
+    this.imageBigResource = imageBigResource;
+  }
+
+  public int getImageBigResource() {
+    return imageBigResource;
+  }
+
+  public void setImageBigResource(int imageBigResource) {
+    this.imageBigResource = imageBigResource;
+  }
+}

+ 6 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/bean/TextImageBean.java

@@ -20,7 +20,8 @@ public class TextImageBean extends JsonBeanBase {
 
   @StringRes
   private int textResource;
-  private boolean isClicked;
+
+  private boolean isSelected;
 
   public TextImageBean(int imageResource) {
     this.imageResource = imageResource;
@@ -31,12 +32,12 @@ public class TextImageBean extends JsonBeanBase {
     this.textResource = textResource;
   }
 
-  public boolean isClicked() {
-    return isClicked;
+  public boolean isSelected() {
+    return isSelected;
   }
 
-  public void setClicked(boolean clicked) {
-    isClicked = clicked;
+  public void setSelected(boolean selected) {
+    isSelected = selected;
   }
 
   public int getImageResource() {

+ 74 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/AddMyBucketListModel.java

@@ -0,0 +1,74 @@
+package kr.co.zumo.app.lifeplus.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.AddMyBucketListBean;
+
+/**
+ * MyBucketListModel
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-18]   [최초 작성]
+ * @since 2018-10-18
+ */
+public class AddMyBucketListModel extends Model {
+
+  private List<AddMyBucketListBean> myBucketListData;
+  private int selectedIndex = 0;  // 선택 인덱스
+
+  public AddMyBucketListModel() {
+    myBucketListData = new ArrayList<>();
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_1, R.string.bucket_select_text1, R.drawable.img_bestbucket_1));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_2, R.string.bucket_select_text2, R.drawable.img_bestbucket_2));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_3, R.string.bucket_select_text3, R.drawable.img_bestbucket_3));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_4, R.string.bucket_select_text4, R.drawable.img_bestbucket_4));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_5, R.string.bucket_select_text5, R.drawable.img_bestbucket_5));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_6, R.string.bucket_select_text6, R.drawable.img_bestbucket_1));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_7, R.string.bucket_select_text7, R.drawable.img_bestbucket_2));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_8, R.string.bucket_select_text8, R.drawable.img_bestbucket_3));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_9, R.string.bucket_select_text9, R.drawable.img_bestbucket_4));
+    myBucketListData.add(new AddMyBucketListBean(R.drawable.img_select_bg_10, R.string.bucket_select_text10, R.drawable.img_bestbucket_5));
+  }
+
+  public int getSelectedIndex() {
+    return selectedIndex;
+  }
+
+  public void setSelectedIndex(int selectedIndex) {
+    this.selectedIndex = selectedIndex;
+  }
+
+  public List<AddMyBucketListBean> getMyBucketListData() {
+    return myBucketListData;
+  }
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+}

+ 0 - 23
app/src/main/java/kr/co/zumo/app/lifeplus/model/MyBucketListModel.java

@@ -1,11 +1,5 @@
 package kr.co.zumo.app.lifeplus.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.TextImageBean;
-
 /**
  * MyBucketListModel
  * <pre>
@@ -18,24 +12,7 @@ import kr.co.zumo.app.lifeplus.bean.TextImageBean;
  */
 public class MyBucketListModel extends Model {
 
-  private List<TextImageBean> myBucketListData;
-
   public MyBucketListModel() {
-    myBucketListData = new ArrayList<>();
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_1, R.string.bucket_select_text1));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_2, R.string.bucket_select_text2));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_3, R.string.bucket_select_text3));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_4, R.string.bucket_select_text4));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_5, R.string.bucket_select_text5));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_6, R.string.bucket_select_text1));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_7, R.string.bucket_select_text2));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_8, R.string.bucket_select_text3));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_9, R.string.bucket_select_text4));
-    myBucketListData.add(new TextImageBean(R.drawable.img_select_bg_10, R.string.bucket_select_text5));
-  }
-
-  public List<TextImageBean> getMyBucketListData() {
-    return myBucketListData;
   }
 
   @Override

+ 3 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/FragmentBase.java

@@ -228,10 +228,11 @@ public abstract class FragmentBase<P extends Presenter> extends Fragment impleme
   /**
    * Device back key
    */
-  public void onBackPressed() {
+  public boolean onBackPressed() {
     if (null != presenter) {
-      presenter.onBackPressed();
+      return presenter.onBackPressed();
     }
+    return false;
   }
 
   /***********************************

+ 13 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListAdapter.java

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.AddMyBucketListBean;
 import kr.co.zumo.app.lifeplus.bean.TextImageBean;
 
 /**
@@ -26,14 +27,17 @@ import kr.co.zumo.app.lifeplus.bean.TextImageBean;
 public class AddMyBucketListAdapter extends RecyclerView.Adapter<AddMyBucketListViewHolder> {
 
   private Context context;
-  private List<TextImageBean> data;
+  private List<AddMyBucketListBean> data;
   private List<AddMyBucketListViewHolder> holders;
   private IClickListener listener;
 
-  public AddMyBucketListAdapter(Context context, List<TextImageBean> data, IClickListener listener) {
+  private int selectedIndex;
+
+  public AddMyBucketListAdapter(Context context, List<AddMyBucketListBean> data, int selectedIndex, IClickListener listener) {
     this.context = context;
     this.data = data;
     this.listener = listener;
+    this.selectedIndex = selectedIndex;
 
     holders = new ArrayList<>();
   }
@@ -52,6 +56,11 @@ public class AddMyBucketListAdapter extends RecyclerView.Adapter<AddMyBucketList
       setFocus(index);
       this.listener.onClick(index);
     });
+
+    if(selectedIndex == position) {
+      setFocus(selectedIndex);
+      this.listener.onClick(selectedIndex);
+    }
   }
 
   private void setFocus(int index) {
@@ -59,7 +68,7 @@ public class AddMyBucketListAdapter extends RecyclerView.Adapter<AddMyBucketList
     TextImageBean bean;
     for (int i = 0; i < len; ++i) {
       bean = data.get(i);
-      bean.setClicked(i == index);
+      bean.setSelected(i == index);
     }
 
     AddMyBucketListViewHolder holder;
@@ -70,7 +79,7 @@ public class AddMyBucketListAdapter extends RecyclerView.Adapter<AddMyBucketList
       idx = holder.getIndex();
       bean = data.get(idx);
 
-      holder.select(bean.isClicked());
+      holder.select(bean.isSelected());
     }
   }
 

+ 12 - 14
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListFragment.java

@@ -18,9 +18,9 @@ import android.widget.TextView;
 import java.util.List;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.bean.TextImageBean;
+import kr.co.zumo.app.lifeplus.bean.AddMyBucketListBean;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
-import kr.co.zumo.app.lifeplus.model.MyBucketListModel;
+import kr.co.zumo.app.lifeplus.model.AddMyBucketListModel;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
@@ -34,7 +34,7 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
  * @history 하세미   [2018-10-18]   [최초 작성]
  * @since 2018-10-18
  */
-public class AddMyBucketListFragment extends FragmentBase<MyBucketListPresenter> implements IMyBucketListView {
+public class AddMyBucketListFragment extends FragmentBase<AddMyBucketListPresenter> implements IAddMyBucketListView {
 
   private RecyclerView recyclerViewImageList;
   private EditText editTextMyBucketTitle;
@@ -55,6 +55,7 @@ public class AddMyBucketListFragment extends FragmentBase<MyBucketListPresenter>
     editTextMyBucketTitle = findViewById(R.id.edit_text_my_bucket);
     textViewMyBucketDetail = findViewById(R.id.text_view_my_bucket_detail);
     buttonAddMyBucket = findViewById(R.id.button_add_my_bucket);
+    imageViewBack = findViewById(R.id.image_background);
 
     editTextMyBucketTitle.requestFocus();
     editTextMyBucketTitle.addTextChangedListener(new TextWatcher() {
@@ -96,12 +97,10 @@ public class AddMyBucketListFragment extends FragmentBase<MyBucketListPresenter>
 
   }
 
-  public void init(List<TextImageBean> myBucketListData) {
-    AddMyBucketListAdapter addMyBucketListAdapter = new AddMyBucketListAdapter(getActivity(), myBucketListData, new AddMyBucketListAdapter.IClickListener() {
-      @Override
-      public void onClick(int index) {
-        presenter.onEvent(new Event.Builder(Event.CLICK).integer(index).build());
-      }
+  public void init(List<AddMyBucketListBean> myBucketListData) {
+    int selectedIndex = presenter.getSelectedIndex();
+    AddMyBucketListAdapter addMyBucketListAdapter = new AddMyBucketListAdapter(getActivity(), myBucketListData, selectedIndex, index -> {
+      presenter.onEvent(new Event.Builder(Event.CLICK).integer(index).build());
     });
     recyclerViewImageList.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
     recyclerViewImageList.setAdapter(addMyBucketListAdapter);
@@ -119,11 +118,10 @@ public class AddMyBucketListFragment extends FragmentBase<MyBucketListPresenter>
   }
 
   @Override
-  protected MyBucketListPresenter definePresenter() {
-    return new MyBucketListPresenter(getModel(MyBucketListModel.class), this);
+  protected AddMyBucketListPresenter definePresenter() {
+    return new AddMyBucketListPresenter(getModel(AddMyBucketListModel.class), this);
   }
 
-
   /**
    * 등록 버튼 보이기 안보이기
    *
@@ -149,11 +147,11 @@ public class AddMyBucketListFragment extends FragmentBase<MyBucketListPresenter>
 
   @Override
   public void changeBackground(int drawableId) {
-
+    imageViewBack.setImageResource(drawableId);
   }
 
   @Override
   public void changeDescription(int stringId) {
-
+    textViewMyBucketDetail.setText(stringId);
   }
 }

+ 140 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListPresenter.java

@@ -0,0 +1,140 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
+
+import android.util.Log;
+import android.view.View;
+
+import kr.co.zumo.app.lifeplus.bean.AddMyBucketListBean;
+import kr.co.zumo.app.lifeplus.model.AddMyBucketListModel;
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.command.FragmentBackStackChangeCommand;
+import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
+
+
+/**
+ * MyBucketListPresenter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-18]   [최초 작성]
+ * @since 2018-10-18
+ */
+public class AddMyBucketListPresenter extends Presenter<AddMyBucketListModel, IAddMyBucketListView> {
+
+  public AddMyBucketListPresenter(AddMyBucketListModel model, IAddMyBucketListView view) {
+    super(model, view);
+  }
+
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+
+  @Override
+  public boolean onBackPressed() {
+    onCommand(new FragmentBackStackChangeCommand(ScreenID.MY_BUCKET, ScreenID.DIRECTION_BACK));
+    return true;
+  }
+
+  @Override
+  protected void onEventInternal(Event event) {
+    Log.i("APP# AddMyBucketListPresenter | onEventInternal", "|" + event.toString());
+    switch (event.getEventId()) {
+      case Event.CONFIRM:
+        onCommand(new FragmentBackStackChangeCommand(ScreenID.BUCKET_HASH_TAG, ScreenID.DIRECTION_NEXT));
+        break;
+      case Event.CLICK:
+        // 배경 변경 해줌
+        int index = event.getInteger();
+        model.setSelectedIndex(index);
+        changeBackground(index);
+        changeDescription(index);
+
+        break;
+      case Event.INIT:
+        view.init(model.getMyBucketListData());
+        break;
+      default:
+        break;
+    }
+  }
+
+  private void changeBackground(int index) {
+    AddMyBucketListBean bean = model.getMyBucketListData().get(index);
+
+    view.changeBackground(bean.getImageBigResource());
+
+  }
+
+  private void changeDescription(int index) {
+    AddMyBucketListBean bean = model.getMyBucketListData().get(index);
+
+    view.changeDescription(bean.getTextResource());
+  }
+
+  /**
+   * 텍스트 입력 시 실행
+   *
+   * @param inputText
+   */
+  public void onTextChanged(String inputText) {
+    view.setVisibleRegisterButton(inputText.length() != 0);
+  }
+
+  /**
+   * 레이아웃 변경시 실행
+   *
+   * @param view
+   * @param left
+   * @param top
+   * @param right
+   * @param bottom
+   * @param oldLeft
+   * @param oldTop
+   * @param oldRight
+   * @param oldBottom
+   */
+  public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+    Log.i("APP# MyBucketListPresenter | onLayoutChange", "|" + "bottom: " + bottom + ", oldBottom: " + oldBottom);
+    if (Math.abs(oldBottom - bottom) > 100) {
+      if (bottom < oldBottom) {
+        this.view.setLayoutSize(false);
+      }
+      else {
+        this.view.setLayoutSize(true);
+      }
+    }
+  }
+
+  public int getSelectedIndex() {
+    return model.getSelectedIndex();
+  }
+
+
+  @Override
+  public void onResult(Event event) {
+
+  }
+}

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListViewHolder.java

@@ -49,7 +49,7 @@ public class AddMyBucketListViewHolder extends RecyclerView.ViewHolder {
    * @param bean
    */
   public void attach(TextImageBean bean) {
-    select(bean.isClicked());
+    select(bean.isSelected());
   }
 
   /**

+ 42 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/IAddMyBucketListView.java

@@ -0,0 +1,42 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
+
+import android.support.annotation.DrawableRes;
+import android.support.annotation.StringRes;
+
+import java.util.List;
+
+import kr.co.zumo.app.lifeplus.bean.AddMyBucketListBean;
+import kr.co.zumo.app.lifeplus.view.IView;
+
+/**
+ * IMyBucketListView
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-18]   [최초 작성]
+ * @since 2018-10-18
+ */
+public interface IAddMyBucketListView extends IView {
+
+  /**
+   * 등록 버튼 보이기 안보이기
+   *
+   * @param isVisible
+   */
+  void setVisibleRegisterButton(boolean isVisible);
+
+  /**
+   * 키보드 표시 유무에 따라서 레이아웃 설정
+   *
+   * @param isBig
+   */
+  void setLayoutSize(boolean isBig);
+
+  void changeBackground(@DrawableRes int drawableId);
+
+  void changeDescription(@StringRes int stringId);
+
+  void init(List<AddMyBucketListBean> myBucketListData);
+}

+ 0 - 25
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/IMyBucketListView.java

@@ -1,11 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
 
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-
-import java.util.List;
-
-import kr.co.zumo.app.lifeplus.bean.TextImageBean;
 import kr.co.zumo.app.lifeplus.view.IView;
 
 /**
@@ -20,23 +14,4 @@ import kr.co.zumo.app.lifeplus.view.IView;
  */
 public interface IMyBucketListView extends IView {
 
-  /**
-   * 등록 버튼 보이기 안보이기
-   *
-   * @param isVisible
-   */
-  void setVisibleRegisterButton(boolean isVisible);
-
-  /**
-   * 키보드 표시 유무에 따라서 레이아웃 설정
-   *
-   * @param isBig
-   */
-  void setLayoutSize(boolean isBig);
-
-  void changeBackground(@DrawableRes int drawableId);
-
-  void changeDescription(@StringRes int stringId);
-
-  void init(List<TextImageBean> myBucketListData);
 }

+ 4 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/MyBucketListFragment.java

@@ -19,7 +19,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.MyBucketListBean;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.manager.ActionButtonManager;
-import kr.co.zumo.app.lifeplus.model.BucketListModel;
+import kr.co.zumo.app.lifeplus.model.MyBucketListModel;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
@@ -33,7 +33,7 @@ import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
  * @history 하세미   [2018-10-17]   [최초 작성]
  * @since 2018-10-17
  */
-public class MyBucketListFragment extends FragmentBase<BucketListPresenter> implements IBucketListView {
+public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> implements IMyBucketListView {
 
   private ViewPager viewPagerBucketList;
   private TabLayout tabLayoutBucketList;
@@ -82,8 +82,8 @@ public class MyBucketListFragment extends FragmentBase<BucketListPresenter> impl
     }).show();
   }
   @Override
-  protected BucketListPresenter definePresenter() {
-    return new BucketListPresenter(getModel(BucketListModel.class), this);
+  protected MyBucketListPresenter definePresenter() {
+    return new MyBucketListPresenter(getModel(MyBucketListModel.class), this);
   }
 
   public void doDummyData() {

+ 0 - 42
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/MyBucketListPresenter.java

@@ -1,8 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
 
-import android.util.Log;
-import android.view.View;
-
 import kr.co.zumo.app.lifeplus.model.MyBucketListModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -62,54 +59,15 @@ public class MyBucketListPresenter extends Presenter<MyBucketListModel, IMyBucke
     switch (event.getEventId()) {
       case Event.CONFIRM:
         onCommand(new FragmentBackStackChangeCommand(ScreenID.BUCKET_HASH_TAG, ScreenID.DIRECTION_NEXT));
-        break;
-      case Event.CLICK:
-        // 배경 변경 해줌
 
         break;
       case Event.INIT:
-        view.init(model.getMyBucketListData());
         break;
       default:
         break;
     }
   }
 
-  /**
-   * 텍스트 입력 시 실행
-   *
-   * @param inputText
-   */
-  public void onTextChanged(String inputText) {
-    view.setVisibleRegisterButton(inputText.length() != 0);
-  }
-
-  /**
-   * 레이아웃 변경시 실행
-   *
-   * @param view
-   * @param left
-   * @param top
-   * @param right
-   * @param bottom
-   * @param oldLeft
-   * @param oldTop
-   * @param oldRight
-   * @param oldBottom
-   */
-  public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-    Log.i("APP# MyBucketListPresenter | onLayoutChange", "|" + "bottom: " + bottom + ", oldBottom: " + oldBottom);
-    if (Math.abs(oldBottom - bottom) > 100) {
-      if (bottom < oldBottom) {
-        this.view.setLayoutSize(false);
-      }
-      else {
-        this.view.setLayoutSize(true);
-      }
-    }
-  }
-
-
   @Override
   public void onResult(Event event) {
 

+ 1 - 1
app/src/main/res/layout/fragment_add_my_bucket_list.xml

@@ -8,7 +8,7 @@
   >
 
   <ImageView
-    android:id="@+id/imageView2"
+    android:id="@+id/image_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scaleType="centerCrop"

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -383,7 +383,7 @@
   <string name="saving">적립</string>
 
   <string name="bucket_select_text1">무작정 혼자 여행하기</string>
-  <string name="bucket_select_text2">무작정 혼자 여행하기</string>
+  <string name="bucket_select_text2">디즈니랜드 여행</string>
   <string name="bucket_select_text3">테니스 배우기</string>
   <string name="bucket_select_text4">이스탄불에서 달콤한 디저트 맛보기</string>
   <string name="bucket_select_text5">모르는 외국어 새로 배우기</string>