From d853802018288a99d55e8b239e3231328cfeabd8 Mon Sep 17 00:00:00 2001 From: ssabeerahamed Date: Fri, 19 Feb 2021 16:25:10 +0530 Subject: [PATCH 1/4] DTSERWFOUR-387-edit-venmo account partial edit is not successful --- build.gradle | 4 +-- .../view/widget/AbstractWidget.java | 25 ++++++++++++++++--- .../view/widget/ExpiryDateWidget.java | 1 + .../view/widget/NumberWidget.java | 1 + .../view/widget/PhoneWidget.java | 1 + .../view/widget/TextWidget.java | 1 + 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 1ad72af37..6f6b08213 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { } - project.version = "1.0.0-beta09" + project.version = "1.0.0-beta09-SNAPSHOT" } @@ -38,7 +38,7 @@ subprojects { targetVersion = 29 codeVersion = 1 - hyperwalletCoreVersion = '1.0.0-beta08' + hyperwalletCoreVersion = '1.0.0-beta09-SNAPSHOT' hyperwalletInsightVersion = '1.0.0-beta02' // androidMaterialVersion = '1.0.0' diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java index 0e9cb8311..077d32f88 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java @@ -16,6 +16,8 @@ */ package com.hyperwallet.android.ui.transfermethod.view.widget; +import android.text.Editable; +import android.text.TextWatcher; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; @@ -39,7 +41,7 @@ public abstract class AbstractWidget { public boolean isEdited = false; public AbstractWidget(@Nullable Field field, @NonNull WidgetEventListener listener, - @Nullable String defaultValue, @NonNull View defaultFocusView) { + @Nullable String defaultValue, @NonNull View defaultFocusView) { mField = field; mListener = listener; mDefaultValue = defaultValue; @@ -64,8 +66,7 @@ public void showValidationError() { public boolean isValid() { if (mField == null) { return true; - } - else if(!isEdited && mField.isFieldValueMasked()) { + } else if (!isEdited && mField.isFieldValueMasked()) { return true; } return !isInvalidEmptyValue() && !isInvalidLength() && !isInvalidRegex(); @@ -182,4 +183,22 @@ public boolean onKey(View v, int keyCode, KeyEvent event) { return false; } } + + protected class TextChangeListener implements TextWatcher { + + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + isEdited = true; + } + + @Override + public void afterTextChanged(Editable s) { + + } + } } \ No newline at end of file diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java index b5de70604..b4c743449 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java @@ -186,6 +186,7 @@ public void afterTextChanged(Editable s) { editText.setText(mExpireDateUtils.convertDateFromServerFormat(mDefaultValue)); editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); + editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java index 690347109..256a68a10 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java @@ -83,6 +83,7 @@ public void onFocusChange(View v, boolean hasFocus) { } editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); + editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); mTextInputLayout.addView(editText); diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java index e96aeb298..c09f2be29 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java @@ -76,6 +76,7 @@ public void onFocusChange(View v, boolean hasFocus) { editText.setText(mDefaultValue); editText.setInputType(InputType.TYPE_CLASS_PHONE); editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); + editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); appendLayout(mTextInputLayout, true); diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java index 7b99fbacb..69d7fb023 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java @@ -75,6 +75,7 @@ public void onFocusChange(View v, boolean hasFocus) { editText.setText(mDefaultValue); editText.setInputType(InputType.TYPE_CLASS_TEXT); editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); + editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); From c3effa2299fb015a5c77586af020cbf282a23ddf Mon Sep 17 00:00:00 2001 From: ssabeerahamed Date: Sat, 20 Feb 2021 09:00:48 +0530 Subject: [PATCH 2/4] update project version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6f6b08213..15b5bc15f 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { } - project.version = "1.0.0-beta09-SNAPSHOT" + project.version = "1.0.0-beta10-SNAPSHOT" } From 979323cc672df8cfabc55ba322d6393d6da2b9be Mon Sep 17 00:00:00 2001 From: ssabeerahamed Date: Sat, 27 Feb 2021 01:20:45 +0530 Subject: [PATCH 3/4] addresed review comments --- .../widget/AbstractMaskedInputWidget.java | 8 ++++++++ .../view/widget/AbstractWidget.java | 20 ------------------- .../view/widget/ExpiryDateWidget.java | 5 ++++- .../view/widget/NumberWidget.java | 1 - .../view/widget/PhoneWidget.java | 1 - .../view/widget/TextWidget.java | 1 - 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java index 87218b628..0edf5a30c 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java @@ -188,6 +188,10 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) { @Override public void afterTextChanged(Editable s) { + if(mEditText.hasFocus()) + { + isEdited = true; + } } @Override @@ -233,6 +237,10 @@ public void afterTextChanged(Editable s) { mEditText.addTextChangedListener(this); } } + if(mEditText.hasFocus()) + { + isEdited = true; + } } /* diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java index 077d32f88..7918bcf82 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java @@ -16,8 +16,6 @@ */ package com.hyperwallet.android.ui.transfermethod.view.widget; -import android.text.Editable; -import android.text.TextWatcher; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; @@ -183,22 +181,4 @@ public boolean onKey(View v, int keyCode, KeyEvent event) { return false; } } - - protected class TextChangeListener implements TextWatcher { - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - isEdited = true; - } - - @Override - public void afterTextChanged(Editable s) { - - } - } } \ No newline at end of file diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java index b4c743449..ec690cc90 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java @@ -178,6 +178,10 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { @Override public void afterTextChanged(Editable s) { + if(editText.hasFocus()) + { + isEdited = true; + } } }); @@ -186,7 +190,6 @@ public void afterTextChanged(Editable s) { editText.setText(mExpireDateUtils.convertDateFromServerFormat(mDefaultValue)); editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); - editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java index 256a68a10..690347109 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/NumberWidget.java @@ -83,7 +83,6 @@ public void onFocusChange(View v, boolean hasFocus) { } editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); - editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); mTextInputLayout.addView(editText); diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java index c09f2be29..e96aeb298 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/PhoneWidget.java @@ -76,7 +76,6 @@ public void onFocusChange(View v, boolean hasFocus) { editText.setText(mDefaultValue); editText.setInputType(InputType.TYPE_CLASS_PHONE); editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); - editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); appendLayout(mTextInputLayout, true); diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java index 69d7fb023..7b99fbacb 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/TextWidget.java @@ -75,7 +75,6 @@ public void onFocusChange(View v, boolean hasFocus) { editText.setText(mDefaultValue); editText.setInputType(InputType.TYPE_CLASS_TEXT); editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); - editText.addTextChangedListener(new TextChangeListener()); editText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_ACTION_NEXT); editText.setCustomSelectionActionModeCallback(new ActionModeCallbackInterceptor()); From 5b00895aade347dce2d113ab2cd691c7c8d036c6 Mon Sep 17 00:00:00 2001 From: ssabeerahamed Date: Sat, 27 Feb 2021 12:32:06 +0530 Subject: [PATCH 4/4] addresed review comments --- .../view/widget/AbstractMaskedInputWidget.java | 6 ++---- .../ui/transfermethod/view/widget/ExpiryDateWidget.java | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java index 0edf5a30c..ab7911f16 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java @@ -188,8 +188,7 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) { @Override public void afterTextChanged(Editable s) { - if(mEditText.hasFocus()) - { + if (mEditText.hasFocus()) { isEdited = true; } } @@ -237,8 +236,7 @@ public void afterTextChanged(Editable s) { mEditText.addTextChangedListener(this); } } - if(mEditText.hasFocus()) - { + if (mEditText.hasFocus()) { isEdited = true; } } diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java index ec690cc90..08031417e 100644 --- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java +++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java @@ -178,8 +178,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { @Override public void afterTextChanged(Editable s) { - if(editText.hasFocus()) - { + if (editText.hasFocus()) { isEdited = true; } }