Order search fixes

app/build.gradle

@@ -155,6 +155,6 @@ dependencies {
     implementation 'com.scottyab:rootbeer-lib:0.0.7'
     implementation 'com.mtramin:rxfingerprint:2.2.1'
     implementation project(':securitykeypad')
-    implementation project(':SpinnerDatePickerLib-release')
+    implementation project(path: ':SpinnerDatePickerLib-release')
 }
 apply plugin: 'com.google.gms.google-services'

app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java

@@ -68,6 +68,9 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
 
     @Override
     public Observable<ArrayList<RewardOrderedProductItemModel>> getOrderedProductList(String startDate, String endDate) {
+        Type productType = new TypeToken<GenericResponseDataModel<ArrayList<RewardOrderedProductItemModel>>>() {
+        }.getType();
+
         return this.gateway.getRewardOrderedProductList(this.gateway.getAuth(), this.gateway.getUserID(), startDate, endDate)
                 .subscribeOn(Schedulers.io())
                 .doOnSubscribe(subs -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
@@ -78,8 +81,7 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
                     }
                 })
                 .flatMap(response -> {
-                    TypeToken productType = TypeToken.getParameterized(GenericResponseDataModel.class, ArrayList.class, RewardOrderedProductItemModel.class);
-                    GenericResponseDataModel<ArrayList<RewardOrderedProductItemModel>> data = HttpClientV2.getDeserializer().fromJson(response.string(), productType.getType());
+                    GenericResponseDataModel<ArrayList<RewardOrderedProductItemModel>> data = HttpClientV2.getDeserializer().fromJson(response.string(), productType);
                     if(data.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
                     {
                         return Observable.just(data.getData());

app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardlisting/OrderHistoryFragment.java

@@ -195,10 +195,10 @@ public class OrderHistoryFragment extends BaseFragment implements OrderListingRv
                 .spinnerTheme(R.style.NumberPickerStyle)
                 .showTitle(true)
                 .showDaySpinner(true)
-                .defaultDate(1990, 0, 1)
                 .setCurrentDateAsMaxDate()
-                .minDate(cYear, (cMonth-1)%11, cDay)
-                .maxDate(cYear,(cMonth)%11,cDay)
+                .setdefaultFromDate(cYear, (cMonth-1)%11, cDay)
+                .setdefaultToDate(cYear,(cMonth)%11,cDay)
+                .minDate(2017,9,10)
                 .dialogTheme(R.style.DatePickerTheme)
                 .showTitle(true)
                 .setTitle(getString(R.string.filter_by_date_text))
@@ -212,13 +212,23 @@ public class OrderHistoryFragment extends BaseFragment implements OrderListingRv
 
                     @Override
                     public void onFromDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
-                        startDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear + 1) + "-" + Integer.toString(dayOfMonth);
+                        String monthString=Integer.toString( monthOfYear+1);
+                        if(monthString.trim().length()==1)
+                        {
+                            monthString="0"+monthString;
+                        }
+                        startDate = Integer.toString(year) + "-" + monthString + "-" + Integer.toString(dayOfMonth);
                         fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(), "MMM d, yyyy", startDate));
                     }
 
                     @Override
                     public void onToDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) {
-                        endDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear + 1) + "-" + Integer.toString(dayOfMonth);
+                        String monthString=Integer.toString( monthOfYear+1);
+                        if(monthString.trim().length()==1)
+                        {
+                            monthString="0"+monthString;
+                        }
+                        endDate = Integer.toString(year) + "-" + monthString + "-" + Integer.toString(dayOfMonth);
                         toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(), "MMM d, yyyy", endDate));
 
 
@@ -281,7 +291,10 @@ public class OrderHistoryFragment extends BaseFragment implements OrderListingRv
                     toDateTv.setText("");
                     dateContainer.setVisibility(View.GONE);
                 }
-                    showDataNotFoundView(false);
+                showDataNotFoundView(false);
+                searchEditText.removeTextChangedListener(OrderHistoryFragment.this);
+                searchEditText.setText("");
+                searchEditText.addTextChangedListener(OrderHistoryFragment.this);
                 data = rewardOrderedProductItemModels;
                 orderListAdapter.setData(rewardOrderedProductItemModels);
             } else {