diff --git a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java index 471f184f5..e34075468 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/transfermethod/AddTransferMethodFragment.java @@ -61,7 +61,7 @@ import com.hyperwallet.android.ui.view.WidgetSelectionDialogFragment; import com.hyperwallet.android.ui.view.widget.AbstractWidget; import com.hyperwallet.android.ui.view.widget.DateChangedListener; -import com.hyperwallet.android.ui.view.widget.DateUtil; +import com.hyperwallet.android.ui.view.widget.DateUtils; import com.hyperwallet.android.ui.view.widget.DateWidget; import com.hyperwallet.android.ui.view.widget.WidgetEventListener; import com.hyperwallet.android.ui.view.widget.WidgetFactory; @@ -99,7 +99,7 @@ public class AddTransferMethodFragment extends Fragment implements WidgetEventLi private HyperwalletTransferMethod mTransferMethod; private String mTransferMethodProfileType; private HashMap mWidgetInputStateHashMap; - private final DateUtil mDateUtil = new DateUtil(); + private final DateUtils mDateUtils = new DateUtils(); /** * Please do not use this to have instance of AddTransferMethodFragment this is reserved for android framework diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/WidgetDateDialogFragment.java b/ui/src/main/java/com/hyperwallet/android/ui/view/WidgetDateDialogFragment.java index d81e51369..274879b85 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/WidgetDateDialogFragment.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/WidgetDateDialogFragment.java @@ -13,7 +13,7 @@ import androidx.fragment.app.FragmentManager; import com.hyperwallet.android.ui.R; -import com.hyperwallet.android.ui.view.widget.DateUtil; +import com.hyperwallet.android.ui.view.widget.DateUtils; import java.util.Calendar; @@ -23,7 +23,7 @@ public class WidgetDateDialogFragment extends DialogFragment { private static final String ARGUMENT_DATE = "ARGUMENT_DATE"; private static final String ARGUMENT_FIELD_NAME = "ARGUMENT_FIELD_NAME"; private OnSelectedDateCallback mOnSelectedDateCallback; - private final DateUtil mDateUtil = new DateUtil(); + private final DateUtils mDateUtils = new DateUtils(); /** * Please do not use this to have instance of DateDialogFragment this is reserved for android framework @@ -75,7 +75,7 @@ public Dialog onCreateDialog(@Nullable Bundle state) { final String fieldName = getArguments().getString(ARGUMENT_FIELD_NAME); Calendar calendar; try { - calendar = mDateUtil.convertDateFromServerFormatToCalendar(storedDate); + calendar = mDateUtils.convertDateFromServerFormatToCalendar(storedDate); } catch (Exception e) { calendar = Calendar.getInstance(); } @@ -85,7 +85,7 @@ public Dialog onCreateDialog(@Nullable Bundle state) { new DatePickerDialog.OnDateSetListener() { @Override public void onDateSet(DatePicker view, int resultYear, int resultMonth, int resultDayOfMonth) { - final String selectedDate = mDateUtil + final String selectedDate = mDateUtils .buildDateFromDateDialogToServerFormat(resultYear, resultMonth, resultDayOfMonth); mOnSelectedDateCallback.setSelectedDateField(fieldName, selectedDate); } diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateUtil.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateUtils.java similarity index 98% rename from ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateUtil.java rename to ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateUtils.java index 8da501d0b..4c0ccb59f 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateUtil.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateUtils.java @@ -31,7 +31,7 @@ /** * Class is used for manage and convert date {@link DateWidget} */ -public final class DateUtil { +public final class DateUtils { private static final String SERVER_DATE_PATTERN = "yyyy-MM-dd"; private static final String WIDGET_DATE_PATTERN = "dd MMMM yyyy"; @@ -39,7 +39,7 @@ public final class DateUtil { private final SimpleDateFormat mServerDateFormat = new SimpleDateFormat(SERVER_DATE_PATTERN, Locale.getDefault()); private final SimpleDateFormat mWidgetDateFormat; - public DateUtil() { + public DateUtils() { mWidgetDateFormat = new SimpleDateFormat( DateFormat.getBestDateTimePattern(Locale.getDefault(), WIDGET_DATE_PATTERN), Locale.getDefault()); } diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java index 0d576066a..c193db3d7 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/DateWidget.java @@ -37,7 +37,7 @@ public class DateWidget extends AbstractWidget implements DateChangedListener { - private final DateUtil mDateUtil; + private final DateUtils mDateUtils; private ViewGroup mContainer; private String mValue; private TextInputLayout mTextInputLayout; @@ -46,7 +46,7 @@ public class DateWidget extends AbstractWidget implements DateChangedListener { public DateWidget(@NonNull HyperwalletField field, @NonNull WidgetEventListener listener, @Nullable String defaultValue, @NonNull View defaultFocusView) { super(field, listener, defaultValue, defaultFocusView); - mDateUtil = new DateUtil(); + mDateUtils = new DateUtils(); mValue = defaultValue; } @@ -67,7 +67,7 @@ public View getView(@NonNull final ViewGroup viewGroup) { mEditText = new EditText( new ContextThemeWrapper(viewGroup.getContext(), R.style.Widget_Hyperwallet_TextInputEditText)); try { - mEditText.setText(mDateUtil.convertDateFromServerToWidgetFormat( + mEditText.setText(mDateUtils.convertDateFromServerToWidgetFormat( TextUtils.isEmpty(mDefaultValue) ? mValue = mField.getValue() : mDefaultValue)); } catch (ParseException e) { mEditText.setText(""); @@ -114,7 +114,7 @@ public void onUpdate(@Nullable final String selectedDate) { if (!TextUtils.isEmpty(selectedDate)) { mValue = selectedDate; try { - mEditText.setText(mDateUtil.convertDateFromServerToWidgetFormat(selectedDate)); + mEditText.setText(mDateUtils.convertDateFromServerToWidgetFormat(selectedDate)); mListener.saveTextChanged(getName(), getValue()); mListener.valueChanged(); } catch (ParseException e) { diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtil.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtils.java similarity index 99% rename from ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtil.java rename to ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtils.java index aee64f92e..0e334ce8f 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtil.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtils.java @@ -26,7 +26,7 @@ /** * Class is used for manage and convert card expire date {@link ExpiryDateWidget} */ -class ExpireDateUtil { +class ExpireDateUtils { static final char ONE_CHAR = '1'; static final int MAX_INPUT_LENGTH = 5; @@ -40,7 +40,7 @@ class ExpireDateUtil { private final Calendar mUpperValidDate = Calendar.getInstance(); - ExpireDateUtil() { + ExpireDateUtils() { mUpperValidDate.add(Calendar.YEAR, VALID_PERIOD_IN_YEARS); } diff --git a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java index 834629f85..9f2bde50f 100644 --- a/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java +++ b/ui/src/main/java/com/hyperwallet/android/ui/view/widget/ExpiryDateWidget.java @@ -16,10 +16,10 @@ */ package com.hyperwallet.android.ui.view.widget; -import static com.hyperwallet.android.ui.view.widget.ExpireDateUtil.MAX_INPUT_LENGTH; -import static com.hyperwallet.android.ui.view.widget.ExpireDateUtil.ONE_CHAR; -import static com.hyperwallet.android.ui.view.widget.ExpireDateUtil.SEPARATOR; -import static com.hyperwallet.android.ui.view.widget.ExpireDateUtil.ZERO_CHAR; +import static com.hyperwallet.android.ui.view.widget.ExpireDateUtils.MAX_INPUT_LENGTH; +import static com.hyperwallet.android.ui.view.widget.ExpireDateUtils.ONE_CHAR; +import static com.hyperwallet.android.ui.view.widget.ExpireDateUtils.SEPARATOR; +import static com.hyperwallet.android.ui.view.widget.ExpireDateUtils.ZERO_CHAR; import android.content.Context; import android.text.Editable; @@ -42,7 +42,7 @@ import com.hyperwallet.android.ui.R; public class ExpiryDateWidget extends AbstractWidget { - private final ExpireDateUtil mExpireDateUtil; + private final ExpireDateUtils mExpireDateUtils; private ViewGroup mContainer; private TextInputLayout mTextInputLayout; private String mValue; @@ -53,7 +53,7 @@ public ExpiryDateWidget(@NonNull HyperwalletField field, @NonNull WidgetEventLis @Nullable String defaultValue, @NonNull View defaultFocusView) { super(field, listener, defaultValue, defaultFocusView); mValue = defaultValue; - mExpireDateUtil = new ExpireDateUtil(); + mExpireDateUtils = new ExpireDateUtils(); } @Override @@ -82,7 +82,7 @@ public View getView(@NonNull final ViewGroup viewGroup) { @Override public void onFocusChange(View v, boolean hasFocus) { if (!hasFocus) { - mValue = mExpireDateUtil.convertDateToServerFormat(((EditText) v).getText().toString()); + mValue = mExpireDateUtils.convertDateToServerFormat(((EditText) v).getText().toString()); mListener.valueChanged(); } else { mListener.widgetFocused(ExpiryDateWidget.this.getName()); @@ -141,9 +141,9 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { } } - dateParts = mExpireDateUtil.getDateParts(input); + dateParts = mExpireDateUtils.getDateParts(input); - if (!mExpireDateUtil.isValidMonth(dateParts[0])) { + if (!mExpireDateUtils.isValidMonth(dateParts[0])) { inErrorState = true; } @@ -161,7 +161,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { dateBuilder.append(dateParts[1]); String formattedDate = dateBuilder.toString(); - int cursorPosition = mExpireDateUtil.getCursorPosition(formattedDate.length(), changeStart, + int cursorPosition = mExpireDateUtils.getCursorPosition(formattedDate.length(), changeStart, insertionSize); ignoreConcurrentChanges = true; @@ -169,7 +169,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { editText.setSelection(cursorPosition); if (before != count) { - mValue = mExpireDateUtil.convertDateToServerFormat(formattedDate); + mValue = mExpireDateUtils.convertDateToServerFormat(formattedDate); mListener.saveTextChanged(getName(), mValue); } ignoreConcurrentChanges = false; @@ -182,7 +182,7 @@ public void afterTextChanged(Editable s) { editText.setInputType(InputType.TYPE_CLASS_DATETIME); editText.setHint(mField.getLabel()); - editText.setText(mExpireDateUtil.convertDateFromServerFormat( + editText.setText(mExpireDateUtils.convertDateFromServerFormat( TextUtils.isEmpty(mDefaultValue) ? mField.getValue() : mDefaultValue)); editText.setOnKeyListener(new DefaultKeyListener(mDefaultFocusView, editText)); @@ -219,7 +219,7 @@ public String getErrorMessage() { return mMessageInvalidDateLength; } - if (mExpireDateUtil.isInvalidDate(mValue)) { + if (mExpireDateUtils.isInvalidDate(mValue)) { return mMessageInvalidDate; } @@ -228,7 +228,7 @@ public String getErrorMessage() { @Override protected boolean isInvalidRegex() { - return mExpireDateUtil.isInvalidDate(mValue); + return mExpireDateUtils.isInvalidDate(mValue); } } diff --git a/ui/src/test/java/com/hyperwallet/android/ui/view/widget/DateUtilTest.java b/ui/src/test/java/com/hyperwallet/android/ui/view/widget/DateUtilsTest.java similarity index 73% rename from ui/src/test/java/com/hyperwallet/android/ui/view/widget/DateUtilTest.java rename to ui/src/test/java/com/hyperwallet/android/ui/view/widget/DateUtilsTest.java index d016de8af..7b96181d1 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/view/widget/DateUtilTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/view/widget/DateUtilsTest.java @@ -15,8 +15,8 @@ import java.util.Collection; @RunWith(RobolectricTestRunner.class) -public class DateUtilTest { - private final DateUtil mDateUtil = new DateUtil(); +public class DateUtilsTest { + private final DateUtils mDateUtils = new DateUtils(); @Rule public final ExpectedException mThrown = ExpectedException.none(); @@ -25,32 +25,32 @@ public class DateUtilTest { public void testConvertDateFromServerToWidgetFormat() throws Exception { String serverDate = "2005-05-23"; String widgetDate = "23 May 2005"; - assertThat(mDateUtil.convertDateFromServerToWidgetFormat(serverDate), is(widgetDate)); + assertThat(mDateUtils.convertDateFromServerToWidgetFormat(serverDate), is(widgetDate)); } @Test public void testBuildParamsDateFromServerToWidget_whenIncorrectDate() throws Exception { mThrown.expect(ParseException.class); - mDateUtil.convertDateFromServerToWidgetFormat("1990-01"); + mDateUtils.convertDateFromServerToWidgetFormat("1990-01"); } @Test public void testConvertDateFromServerToWidgetFormat_whenDateIsNullOrEmpty() throws Exception { - assertThat(mDateUtil.convertDateFromServerToWidgetFormat(""), is("")); - assertThat(mDateUtil.convertDateFromServerToWidgetFormat(null), is("")); + assertThat(mDateUtils.convertDateFromServerToWidgetFormat(""), is("")); + assertThat(mDateUtils.convertDateFromServerToWidgetFormat(null), is("")); } @Test public void testBuildParamsDateFromServerToCalendar_whenIncorrectDate() throws Exception { mThrown.expect(ParseException.class); - mDateUtil.convertDateFromServerFormatToCalendar("123-32").getTime(); + mDateUtils.convertDateFromServerFormatToCalendar("123-32").getTime(); } @Test public void testConvertDateFromServerFormatToCalendar_whenDateIsNullOrEmpty() throws ParseException { - assertThat(mDateUtil.convertDateFromServerFormatToCalendar(null).getTime().toString(), + assertThat(mDateUtils.convertDateFromServerFormatToCalendar(null).getTime().toString(), is(Calendar.getInstance().getTime().toString())); - assertThat(mDateUtil.convertDateFromServerFormatToCalendar("").getTime().toString(), + assertThat(mDateUtils.convertDateFromServerFormatToCalendar("").getTime().toString(), is(Calendar.getInstance().getTime().toString())); } @@ -59,7 +59,7 @@ public void testConvertDateFromServerFormatToCalendar() throws ParseException { String serverDate = "2005-05-23"; final Calendar mayCalendar = Calendar.getInstance(); mayCalendar.set(2005, 4, 23, 0, 0, 0); - assertThat(mDateUtil.convertDateFromServerFormatToCalendar(serverDate).getTime().toString(), + assertThat(mDateUtils.convertDateFromServerFormatToCalendar(serverDate).getTime().toString(), is(mayCalendar.getTime().toString())); } @@ -75,7 +75,7 @@ public void testBuildDateFromDateDialogToServerFormat() { month = (int) item[1]; dayOfMonth = (int) item[2]; widgetDate = (String) item[3]; - assertThat(mDateUtil.buildDateFromDateDialogToServerFormat(year, month, dayOfMonth), is(widgetDate)); + assertThat(mDateUtils.buildDateFromDateDialogToServerFormat(year, month, dayOfMonth), is(widgetDate)); } } diff --git a/ui/src/test/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtilTest.java b/ui/src/test/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtilsTest.java similarity index 97% rename from ui/src/test/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtilTest.java rename to ui/src/test/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtilsTest.java index d9f46e916..c0045f060 100644 --- a/ui/src/test/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtilTest.java +++ b/ui/src/test/java/com/hyperwallet/android/ui/view/widget/ExpireDateUtilsTest.java @@ -15,8 +15,8 @@ import junitparams.Parameters; @RunWith(JUnitParamsRunner.class) -public class ExpireDateUtilTest { - private final ExpireDateUtil helper = new ExpireDateUtil(); +public class ExpireDateUtilsTest { + private final ExpireDateUtils helper = new ExpireDateUtils(); @Test @Parameters(method = "parametersToTestValidDate")