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

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/EditMyBucketListPresenter.java

@@ -9,10 +9,13 @@ import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.dialog.AlertDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.ConfirmDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
+import kr.co.zumo.app.lifeplus.view.dialog.IAttribute;
 import kr.co.zumo.app.lifeplus.view.dialog.ICustomConfirmListener;
+import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
 
 
 /**
@@ -50,14 +53,7 @@ public class EditMyBucketListPresenter extends AddMyBucketListPresenter {
         break;
       case Event.DELETE:
         // 삭제 완료
-
-        if (BucketListModelHelper.getInstance().getCountOfBucket() == 0) {
-          jump(ScreenID.MY_MAIN);
-        }
-        else {
-          back(ScreenID.MY_BUCKET_LIST);
-        }
-
+        showDeleteResultDialog();
         break;
       default:
         super.onResult(event);
@@ -94,6 +90,7 @@ public class EditMyBucketListPresenter extends AddMyBucketListPresenter {
         public void onNegativeResult(ConfirmDialog dialog, Event event) {
 
         }
+
         @Override
         public void onDialogCanceled(ConfirmDialog dialog) {
           dialog.dispose();
@@ -132,4 +129,34 @@ public class EditMyBucketListPresenter extends AddMyBucketListPresenter {
     view.setVisibleButton(false);
     model.updateBucket();
   }
+
+  public void showDeleteResultDialog() {
+    new DialogBuilder<AlertDialog, ICustomDialogListener>(getFragmentManager(), DialogID.ALERT)
+      .listener(new ICustomDialogListener<AlertDialog>() {
+        @Override
+        public void onDialogResult(AlertDialog dialog, Event event) {
+          if (event.getEventId() == Event.CONFIRM) {
+            dialog.dispose();
+            if (BucketListModelHelper.getInstance().getCountOfBucket() == 0) {
+              jump(ScreenID.MY_MAIN);
+            }
+            else {
+              back(ScreenID.MY_BUCKET_LIST);
+            }
+          }
+        }
+
+        @Override
+        public void onDialogCanceled(AlertDialog dialog) {
+          dialog.dispose();
+        }
+      })
+      .attribute(new IAttribute<AlertDialog>() {
+        @Override
+        public void onAttribute(AlertDialog dialog) {
+          dialog.setText(R.string.delete_message);
+        }
+      })
+      .show();
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingFragment.java

@@ -19,6 +19,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
 /**
@@ -50,11 +51,11 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    //   bottomBar = (View) findViewById(R.id.tutorial_bottom_layout);
+    bottomBar = (View) findViewById(R.id.tutorial_bottom_layout);
     viewPager = (ViewPager) findViewById(R.id.tutorial_view_pager);
     tabLayout = (TabLayout) findViewById(R.id.tutorial_tab_layout);
-//    buttonTutorial1 = (TextView) bottomBar.findViewById(R.id.button1_tutorial);
-//    buttonTutorial2 = (TextView) bottomBar.findViewById(R.id.button2_tutorial);
+    buttonTutorial1 = (TextView) bottomBar.findViewById(R.id.button1_tutorial);
+    buttonTutorial2 = (TextView) bottomBar.findViewById(R.id.button2_tutorial);
 
     findViewById(R.id.main_content).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
 
@@ -78,7 +79,7 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
 
       // TODO: 2차 오픈: 준비중, 얼랏 처리
       public void onPageSelected(int position) {
-        //bottomBar.setVisibility(position != 0 ? View.VISIBLE : View.INVISIBLE);
+        bottomBar.setVisibility(position != 0 ? View.VISIBLE : View.INVISIBLE);
       }
 
       @Override
@@ -87,8 +88,8 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
 
       }
     });
-//    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_LEFT).build()));
-//    buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_RIGHT).build()));
+    buttonTutorial1.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_LEFT).build()));
+    buttonTutorial2.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_RIGHT).build()));
 
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingFromZumoPagerAdapter.java

@@ -46,7 +46,6 @@ public class OnBoardingFromZumoPagerAdapter extends OnBoardingPagerAdapter {
     tabLayout.setVisibility(View.GONE);
 
     ((TextView) bottomBar.findViewById(R.id.button1_tutorial)).setText(R.string.tutorial_bottom_close);
-    // TODO: 2차 오픈: 준비중, 얼랏 처리
     ((TextView) bottomBar.findViewById(R.id.button2_tutorial)).setText(R.string.tutorial_bottom_next_for_zumo_user_2);
 
     switch (position) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingPagerAdapter.java

@@ -121,6 +121,7 @@ public class OnBoardingPagerAdapter extends PagerAdapter {
         //하단 바 사라짐
         view = layoutInflater.inflate(R.layout.on_boarding_last, container, false);
         Button buttonStart = view.findViewById(R.id.button_start_main);
+        bottomBar.setVisibility(View.GONE);
         buttonStart.setOnClickListener(v -> presenter.onEvent(new Event.Builder(Event.TUTORIAL_END).build()));
         break;
       default:

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

@@ -26,6 +26,6 @@
     app:tabGravity="center"
     app:tabIndicatorHeight="0dp"/>
 
-  <!--<include layout="@layout/on_boarding_bottom_layout"/>-->
+  <include layout="@layout/on_boarding_bottom_layout"/>
 
 </RelativeLayout>

app/src/main/res/values/strings.xml

@@ -26,6 +26,7 @@
 
   <string name="more_info">more info</string>
   <string name="copy_right">copyright</string>
+  <string name="delete_message">삭제되었습니다</string>
 
   <string name="empty_string" translatable="false"/>
   <string name="confirm">확인</string>