Forráskód Böngészése

[마이][Bug] 일부 코드 수정

hyodong.min 7 éve
szülő
commit
70e9992093

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/Event.java

@@ -83,6 +83,7 @@ public class Event {
   public static final int SWITCH = 55;
   public static final int BOOK_MARK_DEFAULT = 56;
   public static final int BOOK_MARK_LIST = 57;
+  public static final int ADD = 58;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
@@ -92,7 +93,7 @@ public class Event {
     COMPLETED, TUTORIAL_END, EXIT, START, SETTING, BUCKET, MY_COIN, MY, TOGGLE, MY_BUCKET,
     ACTION_BAR_HOME, ACTION_BAR_NOTIFICATION, ACTION_BAR_SETTING, ACTION_BAR_CLOSE, ACTION_BAR_BACK,
     ACTION_BAR_SEARCH, ACTION_BAR_MENU, ACTION_BAR_TITLE, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY, FOURTH_CATEGORY, FIFTH_CATEGORY,
-    SWITCH,BOOK_MARK_DEFAULT, BOOK_MARK_LIST
+    SWITCH,BOOK_MARK_DEFAULT, BOOK_MARK_LIST, ADD,
   })
   public @interface ID {}
 

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

@@ -78,7 +78,7 @@ public class MyBucketListFragment extends FragmentBase<MyBucketListPresenter> im
   @Override
   protected void defineActionButton() {
     ActionButtonManager.getInstance().begin().plus(floatingActionButton -> {
-      presenter.onEvent(new Event.Builder(Event.MY_BUCKET).build());
+      presenter.onEvent(new Event.Builder(Event.ADD).build());
     }).show();
   }
   @Override

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

@@ -60,6 +60,11 @@ public class MyBucketListPresenter extends Presenter<MyBucketListModel, IMyBucke
       case Event.CONFIRM:
         onCommand(new FragmentBackStackChangeCommand(ScreenID.BUCKET_HASH_TAG, ScreenID.DIRECTION_NEXT));
 
+        break;
+
+      case Event.ADD:
+        onCommand(new FragmentBackStackChangeCommand(ScreenID.BUCKET_HASH_TAG, ScreenID.DIRECTION_NEXT));
+
         break;
       case Event.INIT:
         break;

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

@@ -66,6 +66,7 @@ public class MyMainFragment extends FragmentBase<MyMainPresenter> {
       .menu(actionBar -> presenter.onClickMenu(actionBar))
       .search(actionBar -> presenter.onClickSearch(actionBar))
       .back(actionBar -> presenter.onClickBack(actionBar))
+      .scroll()
       .show();
   }
 

+ 2 - 2
app/src/main/res/layout/fragment_my_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<android.support.v4.widget.NestedScrollView
   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"
@@ -483,4 +483,4 @@
       app:layout_constraintStart_toStartOf="parent"/>
 
   </android.support.constraint.ConstraintLayout>
-</ScrollView>
+</android.support.v4.widget.NestedScrollView>