From 1fdd50c211870155a48b011035e635f6a4e16087 Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 18 Feb 2020 10:56:30 +0545 Subject: [PATCH] Occupation field added --- .idea/caches/build_file_checksums.ser | Bin 662 -> 662 bytes .../kycV3/gateway/KYCV3Gateway.java | 2 +- .../kycV3/presenter/KYCV3ViewModel.java | 7 +- .../view/personal/CustomerDetailFragment.java | 57 +++++++------- .../webbrowserV2/WebBrowserFragmentV2.java | 44 +++++++---- .../layout/fragment_kyc_customer_detail.xml | 74 +++++++++--------- 6 files changed, 97 insertions(+), 87 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 836df4934ec5fd1b60b3bf39ba82ac7576b01480..7446c80b3d9c0e793b9e026c3d0216322340f55a 100644 GIT binary patch delta 26 icmbQnI*oP043@Bd+fNhc+?%|Q(QR@SqswF#rbz&mEDDzZ delta 26 icmbQnI*oP03>Hhv52_RA+?#xW(PeTKquXQ_rbz&d8VU>m diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/gateway/KYCV3Gateway.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/gateway/KYCV3Gateway.java index 654efc31..ab8f154a 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/gateway/KYCV3Gateway.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/gateway/KYCV3Gateway.java @@ -69,7 +69,7 @@ public class KYCV3Gateway extends PrivilegedGateway implements KYCV3GatewayInter map.put("city", createStringUploadValue(personalInfoDTO.getCity())); map.put("address", createStringUploadValue(personalInfoDTO.getAddress())); map.put("nativeCountry", createStringUploadValue(personalInfoDTO.getNativeCountry())); -// map.put("occupation", createStringUploadValue(personalInfoDTO.getOccupation())); + map.put("occupation", createStringUploadValue(personalInfoDTO.getOccupation())); } PrimaryInformationDTO primaryInformationDTO = requestBody.getPrimaryInformation(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java index ecef3487..87998df7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java @@ -342,10 +342,9 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter form1ViewBindings.getEmailChangeEvent().map(val -> validator.validateEmail(val.toString())), form1ViewBindings.getCityChangeEvent().map(val -> validator.validateCity(val)), form1ViewBindings.getAddressChangeEvent().map(val -> validator.validateKoreaAddress(val.toString())), - //TODO Ocuupation field added -// this.view.getCustomerDetailViewContract().getForm1ViewBindings().getOccupationChangeEvent().map(val -> validator.validateOccupation(val)), - (isFullNameValid, isGenderValid, isDobValid, isEmailValid, isCityValid, isAddressValid) -> { - boolean result = isFullNameValid && isEmailValid && isAddressValid && isDobValid && isGenderValid && isCityValid; + form1ViewBindings.getOccupationChangeEvent().map(val -> validator.validateOccupation(val)), + (isFullNameValid, isGenderValid, isDobValid, isEmailValid, isCityValid, isAddressValid,isOccupationValid) -> { + boolean result = isFullNameValid && isEmailValid && isAddressValid && isDobValid && isGenderValid && isCityValid&&isOccupationValid; Log.d(TAG, "Form 1 valid: " + result); customerDetailForm1Button.setValue(result); if (!result) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/personal/CustomerDetailFragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/personal/CustomerDetailFragment.java index 3504a74d..8871c6a2 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/personal/CustomerDetailFragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/personal/CustomerDetailFragment.java @@ -142,11 +142,10 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present @BindView(R.id.cityWrapper) TextInputLayout cityWrapper; - //TODO Ocuupation field added -// @BindView(R.id.ed_occupation) -// EditText ed_occupation; -// @BindView(R.id.occupationSelectionWrapper) -// TextInputLayout occupationSelectionWrapper; + @BindView(R.id.ed_occupation) + EditText ed_occupation; + @BindView(R.id.occupationSelectionWrapper) + TextInputLayout occupationSelectionWrapper; @BindView(R.id.ed_address) EditText ed_address; @@ -360,11 +359,11 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present } //TODO Ocuupation field added -// IDTextDTO selectedOccupation = val.getSelectedOccupationFromId(val.getPersonalInformation().getOccupation()); -// if (selectedOccupation != null) { -// ed_occupation.setText(selectedOccupation.toString()); -// form1ViewBindings.occupationPublishSubject.onNext(selectedOccupation); -// } + IDTextDTO selectedOccupation = val.getSelectedOccupationFromId(val.getPersonalInformation().getOccupation()); + if (selectedOccupation != null) { + ed_occupation.setText(selectedOccupation.toString()); + form1ViewBindings.occupationPublishSubject.onNext(selectedOccupation); + } ed_dob.setText(val.getPersonalInformation().getDob()); @@ -1140,25 +1139,25 @@ public class CustomerDetailFragment extends BaseFragment implements KYCV3Present } //TODO Ocuupation field added -// @OnClick(R.id.ed_occupation) -// public void promptOccupation() { -// hideKeyBoard(); -// if (occupationSelectionDialog == null) -// occupationSelectionDialog = new GenericTextListingDialog<>(); -// -// occupationSelectionDialog.setData(ViewModelProviders.of(getActivity()).get(KYCV3ViewModel.class).getAvailableOccupationList()); -// -// occupationSelectionDialog.setListener(selectedBranch -> -// { -// ed_occupation.setText(selectedBranch.toString()); -// form1ViewBindings.occupationPublishSubject.onNext(selectedBranch); -// occupationSelectionDialog.dismiss(); -// -// }); -// occupationSelectionDialog.setHintAndTitle(getString(R.string.search_occupation_text), getString(R.string.select_occupation_text), getString(R.string.no_occupation_found_text)); -// if (!occupationSelectionDialog.isAdded()) -// occupationSelectionDialog.show(getActivity().getSupportFragmentManager(), "OCCUPATIONCHOOSER"); -// } + @OnClick(R.id.ed_occupation) + public void promptOccupation() { + hideKeyBoard(); + if (occupationSelectionDialog == null) + occupationSelectionDialog = new GenericTextListingDialog<>(); + + occupationSelectionDialog.setData(ViewModelProviders.of(getActivity()).get(KYCV3ViewModel.class).getAvailableOccupationList()); + + occupationSelectionDialog.setListener(selectedBranch -> + { + ed_occupation.setText(selectedBranch.toString()); + form1ViewBindings.occupationPublishSubject.onNext(selectedBranch); + occupationSelectionDialog.dismiss(); + + }); + occupationSelectionDialog.setHintAndTitle(getString(R.string.search_occupation_text), getString(R.string.select_occupation_text), getString(R.string.no_occupation_found_text)); + if (!occupationSelectionDialog.isAdded()) + occupationSelectionDialog.show(getActivity().getSupportFragmentManager(), "OCCUPATIONCHOOSER"); + } @OnClick(R.id.ed_primaryBank) public void promptBank() { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java index 11f5acff..c5587626 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/webbrowserV2/WebBrowserFragmentV2.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.net.ConnectivityManager; +import android.net.NetworkCapabilities; import android.net.NetworkInfo; import android.net.Uri; import android.net.http.SslError; @@ -21,6 +22,7 @@ import android.webkit.ValueCallback; import android.webkit.WebChromeClient; import android.webkit.WebResourceError; import android.webkit.WebResourceRequest; +import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; @@ -100,18 +102,16 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment { webView.getSettings().setSaveFormData(false); webView.clearCache(true); webView.clearHistory(); - webView.getSettings().setJavaScriptEnabled(true); + WebSettings settings = webView.getSettings(); + settings.setJavaScriptEnabled(true); + settings.setTextZoom(100); + settings.setSupportMultipleWindows(true); + settings.setJavaScriptCanOpenWindowsAutomatically(true); webView.getSettings().setAllowFileAccess(true); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true); } - //(필수!!) 일부폰에서 접근성 설정에 의해 CSS 깨짐 발생 아래 설정 - //(REQUIRED!!) set up when CSS crack for some phone depending on accessability setting - webView.getSettings().setTextZoom(100); - webView.getSettings().setSupportMultipleWindows(true); - webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); - //(필수!!) 모바일 브라우저와 웹뷰(하이브리드 앱)를 구분하기 위한 UserAgent 설정 - //(REQUIRED!!) set up UserAgent for distingushing between mobile browser and webview(hybrid app) + StringBuffer sb = new StringBuffer(webView.getSettings().getUserAgentString()).append(STR_USER_AGENT_YESSIGN_ANDROID); webView.getSettings().setUserAgentString(sb.toString()); @@ -121,8 +121,23 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment { ConnectivityManager cm = (ConnectivityManager) getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); if (null != cm) { - NetworkInfo info = cm.getActiveNetworkInfo(); - return (info != null && info.isConnected()); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork()); + if (capabilities != null) { + return (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) + || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) + || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) + || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) + ); + + } else { + return false; + } + } else { + NetworkInfo info = cm.getActiveNetworkInfo(); + return (info != null && info.isConnected()); + } + } return false; } @@ -278,9 +293,7 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { contentSelectionIntent.setAction(Intent.ACTION_OPEN_DOCUMENT); - } - else - { + } else { contentSelectionIntent.setAction(Intent.ACTION_GET_CONTENT); } @@ -333,7 +346,7 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment { @SuppressLint("CheckResult") private void checkPermissionAndProceed() { - new RxPermissions(getActivity()).requestEach(Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE) + new RxPermissions(getActivity()).requestEach(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE) .takeWhile(permission -> permission.granted) //or use take untill if you want to get permission.granted == false event //.takeUntil(permission -> !permission.granted) @@ -348,14 +361,13 @@ public abstract class WebBrowserFragmentV2 extends BaseFragment { } private void showPermissionNeededDialog() { - showPopUpMessage("Please grant the required permissions", CustomAlertDialog.AlertType.ALERT,alertType -> { + showPopUpMessage("Please grant the required permissions", CustomAlertDialog.AlertType.ALERT, alertType -> { checkPermissionAndProceed(); }); } } - public interface WebBrowserFragmentActionListener { void updateTitle(String title); diff --git a/app/src/main/res/layout/fragment_kyc_customer_detail.xml b/app/src/main/res/layout/fragment_kyc_customer_detail.xml index cdf05e5b..dea90da8 100644 --- a/app/src/main/res/layout/fragment_kyc_customer_detail.xml +++ b/app/src/main/res/layout/fragment_kyc_customer_detail.xml @@ -244,43 +244,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + +