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

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/pin/CustomPinResetPresenter.java

@@ -45,6 +45,9 @@ public class CustomPinResetPresenter implements IPinContract.Presenter {
     view.updateGuideText(R.string.pin_code_reset_message);
     view.updateTitleText(R.string.pin_code_reset);
     view.restart();
+    view.setCloseButtonVisible(false);
+    view.setHelpButtonVisible(false);
+
   }
 
   @Override

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

@@ -205,6 +205,7 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     int size = defaultBookmarkBeans.size();
     setDefaultBookmarkLabel();
     textViewBookmarkRecommend.setVisibility(View.VISIBLE);
+
     if (defaultBookmarkBeans.size() == 1) {
       layoutLikeBookmark1.setVisibility(View.GONE);
       textViewBookmark1.setText(defaultBookmarkBeans.get(0).getTitle());
@@ -297,20 +298,20 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
 
 
       if (myBucketBeans.get(0).getTagList().size() == 1) {
-        textViewBucket1HashTag1.setText(myBucketBeans.get(0).getTagList().get(0).getTagName());
+        textViewBucket1HashTag1.setText(String.format("#%s", myBucketBeans.get(0).getTagList().get(0).getTagName()));
       }
       else if (myBucketBeans.get(0).getTagList().size() == 2) {
-        textViewBucket1HashTag1.setText(myBucketBeans.get(0).getTagList().get(0).getTagName());
-        textViewBucket1HashTag2.setText(myBucketBeans.get(0).getTagList().get(1).getTagName());
+        textViewBucket1HashTag1.setText(String.format("#%s",myBucketBeans.get(0).getTagList().get(0).getTagName()));
+        textViewBucket1HashTag2.setText(String.format("#%s",myBucketBeans.get(0).getTagList().get(1).getTagName()));
       }
 
       if (myBucketBeans.get(1).getTagList().size() == 1) {
-        textViewBucket2HashTag1.setText(myBucketBeans.get(0).getTagList().get(0).getTagName());
+        textViewBucket2HashTag1.setText(String.format("#%s",myBucketBeans.get(0).getTagList().get(0).getTagName()));
         //textViewBucket1HashTag2.setText(myBucketBeans.get(0).getTagList().get(1).getTagName());
       }
       else if (myBucketBeans.get(1).getTagList().size() == 2) {
-        textViewBucket2HashTag1.setText(myBucketBeans.get(1).getTagList().get(0).getTagName());
-        textViewBucket2HashTag2.setText(myBucketBeans.get(1).getTagList().get(1).getTagName());
+        textViewBucket2HashTag1.setText(String.format("#%s",myBucketBeans.get(1).getTagList().get(0).getTagName()));
+        textViewBucket2HashTag2.setText(String.format("#%s",myBucketBeans.get(1).getTagList().get(1).getTagName()));
       }
     }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/pin/reset/PinResetInputFragment.java

@@ -13,7 +13,7 @@ import android.view.ViewGroup;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.custom.pin.CustomPinRegisterPresenter;
+import kr.co.zumo.app.lifeplus.view.custom.pin.CustomPinResetPresenter;
 import kr.co.zumo.app.lifeplus.view.custom.pin.CustomPinView;
 import kr.co.zumo.app.lifeplus.view.custom.pin.IPinContract;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
@@ -50,7 +50,7 @@ public class PinResetInputFragment extends FragmentBase<PinResetInputPresenter>
      *
      */
     customPinView = new CustomPinView(getContext());
-    pinPresenter = new CustomPinRegisterPresenter(customPinView, new IPinContract.Listener() {
+    pinPresenter = new CustomPinResetPresenter(customPinView, new IPinContract.Listener() {
       @Override
       public void onPinResult(String result) {
         presenter.onEvent(new Event.Builder(Event.SUCCESS).string(result).build());