Jelajahi Sumber

#2019-07-24 14:41
- 페이스북 공유 완료 토스트 팝업 삭제
- 검색 클릭 시 키보드 내리기
- 태그 검색 후 최근검색태그 갱신 오류 수정
- 위치 기반 서비스 미동의 토스트 추가
- 4.1.0.002 테스트 배포

yeongyun 6 tahun lalu
induk
melakukan
2d2f1ace8c

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsBasePresenter.java

@@ -220,7 +220,7 @@ public abstract class ContentsBasePresenter<M extends ContentsBaseModel, V exten
             @Override
             public void onSuccess(String result) {
                 logShare(R.string.fa_share_facebook);
-                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
+//                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
             }
 
             @Override

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventDetailPresenter.java

@@ -170,7 +170,7 @@ public abstract class EventDetailPresenter<M extends EventDetailModel, V extends
         share.shareEvent(model.getEventDetailBean(), new IShareListener() {
             @Override
             public void onSuccess(String result) {
-                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
+//                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
                 hideWaiter();
             }
 

+ 2 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/ISearchWithResultView.java

@@ -69,4 +69,6 @@ public interface ISearchWithResultView extends IView {
     void showEdit();
 
     void setSearchedTag(String tag);
+
+    void hideKeyboard();
 }

+ 8 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchWithResultFragment.java

@@ -616,4 +616,12 @@ public class SearchWithResultFragment extends FragmentBase<SearchWithResultPrese
         });
         vieHidewAnimator.start();
     }
+
+    @Override
+    public void hideKeyboard() {
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(editSearch.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
+        imm.hideSoftInputFromWindow(editSearchEdit.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
+        SoftKeyboardUtil.hideKeyboard(getActivity());
+    }
 }

+ 3 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchWithResultPresenter.java

@@ -324,6 +324,7 @@ public class SearchWithResultPresenter extends Presenter<SearchWithResultModel,
     private void search(String tag) {
         LogHelper.i(TAG, "search -> " + tag);
         if (StringUtil.isFull(tag)) {
+            view.hideKeyboard();
             view.setSearchedTag(tag);
             googleAnalyticsHelper.sendGA(GoogleAnalyticsHelper.Category.SEARCH, GoogleAnalyticsHelper.Action.CLICK, tag);
 
@@ -335,6 +336,8 @@ public class SearchWithResultPresenter extends Presenter<SearchWithResultModel,
             model.setDeliveryPackaging(model.getTag());
             model.saveLatestTag(tag);
 
+            renderLatest();
+
             //TODO: 처음 자동 검색
             model.setSearchTag(tag);
             model.search();

+ 6 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/SettingPresenter.java

@@ -288,8 +288,12 @@ public class SettingPresenter extends Presenter<SettingModel, ISettingView> {
                     showEventServiceToast(bool);
                 } else // 위치
                     //위치 동의 했을때만 동의 팝업 띄운다
-                    if (index == SettingViewHolder.SWITCH_LOCATION && bool) {
-                        showCustomToast(ResourceUtil.getString(R.string.setting_menu3_location_agree_message));
+                    if (index == SettingViewHolder.SWITCH_LOCATION) {
+                        if(bool) {
+                            showCustomToast(ResourceUtil.getString(R.string.setting_menu3_location_agree_message));
+                        } else {
+                            showCustomToast(ResourceUtil.getString(R.string.setting_menu3_location_disagree_message));
+                        }
                     }
                 break;
             case Event.ERROR:

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/web/WebFromContentsPresenter.java

@@ -228,7 +228,7 @@ public class WebFromContentsPresenter extends Presenter<WebFromContentsModel, IW
         share.shareUrl(model.getShareContents(), model.getUrl(), model.getSharePageIndex(), new IShareListener() {
             @Override
             public void onSuccess(String result) {
-                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
+//                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
             }
 
             @Override

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/web/WebFromEventPresenter.java

@@ -223,7 +223,7 @@ public class WebFromEventPresenter extends Presenter<WebFromEventModel, IWebFrom
         share.shareEvent(model.getDeliveredEventDetailBean(), new IShareListener() {
             @Override
             public void onSuccess(String result) {
-                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
+//                showShareToast(ResourceUtil.getString(R.string.share_completed_message));
                 hideWaiter();
             }
 

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

@@ -284,6 +284,7 @@
   <string name="setting_menu3_event_disagree">이벤트 혜택 / 서비스 정보 수신거부</string>
   <string name="setting_menu3_event_disagree_message">이벤트 혜택 / 서비스 정보 수신거부 처리되었습니다.\n(%s)</string>
   <string name="setting_menu3_location_agree_message">위치기반 서비스 이용을 동의하셨습니다.</string>
+  <string name="setting_menu3_location_disagree_message">위치기반 서비스 이용을 거부하셨습니다.</string>
   <string name="setting_menu4">약관/1:1 문의</string>
   <string name="setting_menu5">버킷리스트 작성·관리</string>
   <string name="setting_terms">약관보기</string>
@@ -965,7 +966,7 @@
   <string name="onboarding_title_03">회원만을 위한 특별 혜택</string>
   <string name="onboarding_desc_03">일상을 더 즐겁게 만들어줄\n다양한 이벤트 참여하기</string>
 
-  <string name="inquiry_completed">문의 등록이 완료되었습니다.</string>
+  <string name="inquiry_completed">등록이 완료되었습니다.</string>
   <string name="wrong_password_message">비밀번호를 5회 잘못 입력하셨습니다.\n회원님의 보안을 위해 임시 비밀번호를 발급 받아주세요.</string>
 
 </resources>