|
|
@ -69,8 +69,8 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen |
|
|
|
private DomesticRemitRecipientHistoryPresenterInterface presenter; |
|
|
|
private DomesticRemitRecipientHistoryRvAdapter adapter; |
|
|
|
|
|
|
|
public static final int SELECT_DOMESTIC_TXN_FROM_HISTORY_REQUEST=4235; |
|
|
|
public static final String SELECTED_DOMESTIC_TXN_BUNDLE_KEY="selectedTxnBundleKey"; |
|
|
|
public static final int SELECT_DOMESTIC_TXN_FROM_HISTORY_REQUEST = 4235; |
|
|
|
public static final String SELECTED_DOMESTIC_TXN_BUNDLE_KEY = "selectedTxnBundleKey"; |
|
|
|
|
|
|
|
@Override |
|
|
|
protected void onCreate(Bundle savedInstanceState) { |
|
|
@ -82,8 +82,8 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen |
|
|
|
} |
|
|
|
|
|
|
|
private void initialize() { |
|
|
|
this.presenter=new DomesticRemitRecipientHistoryPresenterImpl(this,new DomesticRemitRecipientHistoryGateway()); |
|
|
|
toolbarTitle.setText("History"); |
|
|
|
this.presenter = new DomesticRemitRecipientHistoryPresenterImpl(this, new DomesticRemitRecipientHistoryGateway()); |
|
|
|
toolbarTitle.setText(getString(R.string.recent_recipients_text)); |
|
|
|
searchTextChangeListener = new SearchEdittextTextChangeListener(); |
|
|
|
ivCancel.setVisibility(View.INVISIBLE); |
|
|
|
setupRecyclerView(); |
|
|
@ -91,17 +91,15 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen |
|
|
|
} |
|
|
|
|
|
|
|
private void setupRecyclerView() { |
|
|
|
adapter=new DomesticRemitRecipientHistoryRvAdapter(this); |
|
|
|
adapter = new DomesticRemitRecipientHistoryRvAdapter(this); |
|
|
|
transactionHistoryRv.setAdapter(adapter); |
|
|
|
transactionHistoryRv.addItemDecoration(new LineDividerItemDecoration(this,LineDividerItemDecoration.VERTICAL_LIST)); |
|
|
|
transactionHistoryRv.addItemDecoration(new LineDividerItemDecoration(this, LineDividerItemDecoration.VERTICAL_LIST)); |
|
|
|
} |
|
|
|
|
|
|
|
private void performDefaultAction(Bundle savedInstanceState) { |
|
|
|
if (savedInstanceState == null) { |
|
|
|
this.presenter.getTransactionHistory(null, null); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
} else { |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -114,26 +112,27 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen |
|
|
|
.showDaySpinner(true) |
|
|
|
.defaultDate(1990, 0, 1) |
|
|
|
.setCurrentDateAsMaxDate() |
|
|
|
.minDate(2017,9,10) |
|
|
|
.minDate(2017, 9, 10) |
|
|
|
.dialogTheme(R.style.DatePickerTheme) |
|
|
|
.setTitle(getString(R.string.filter_by_date_text)) |
|
|
|
.setFromTitle(getString(R.string.from_text)+" :") |
|
|
|
.setToTitle(getString(R.string.to_text)+" :") |
|
|
|
.setFromTitle(getString(R.string.from_text) + " :") |
|
|
|
.setToTitle(getString(R.string.to_text) + " :") |
|
|
|
.setPositiveButtonText(getString(R.string.ok_text)) |
|
|
|
.setNegativeButtonText(getString(R.string.cancel_text)) |
|
|
|
.callback(new DateRangePickerDialog.OnRangeDateSetListener() { |
|
|
|
private String startDate=""; |
|
|
|
private String endDate=""; |
|
|
|
private String startDate = ""; |
|
|
|
private String endDate = ""; |
|
|
|
|
|
|
|
@Override |
|
|
|
public void onFromDateSet(DatePicker datePicker, int year, int monthOfYear, int dayOfMonth) { |
|
|
|
startDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear+1) + "-" + Integer.toString(dayOfMonth); |
|
|
|
fromDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",startDate)); |
|
|
|
startDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear + 1) + "-" + 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); |
|
|
|
toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(),"MMM d, yyyy",endDate)); |
|
|
|
endDate = Integer.toString(year) + "-" + Integer.toString(monthOfYear + 1) + "-" + Integer.toString(dayOfMonth); |
|
|
|
toDateTv.setText(Utils.formateDateFromstring(Utils.getDefaultDateFormat(), "MMM d, yyyy", endDate)); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
@ -143,14 +142,14 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen |
|
|
|
|
|
|
|
@Override |
|
|
|
public void onDateRangeReceivedSucess() { |
|
|
|
if(dateContainer.getVisibility()!= View.VISIBLE) { |
|
|
|
if (dateContainer.getVisibility() != View.VISIBLE) { |
|
|
|
dateContainer.setVisibility(View.VISIBLE); |
|
|
|
searchbarDivider.setVisibility(View.VISIBLE); |
|
|
|
} |
|
|
|
searchEditText.removeTextChangedListener(searchTextChangeListener); |
|
|
|
searchEditText.setText(""); |
|
|
|
searchEditText.addTextChangedListener(searchTextChangeListener); |
|
|
|
presenter.getTransactionHistory(startDate,endDate); |
|
|
|
presenter.getTransactionHistory(startDate, endDate); |
|
|
|
} |
|
|
|
}) |
|
|
|
.build() |
|
|
@ -198,16 +197,15 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen |
|
|
|
|
|
|
|
@Override |
|
|
|
public void onDomesticRemitSelected(DomesticReciepientHistoryDetailDTO data) { |
|
|
|
Intent intent= new Intent(); |
|
|
|
intent.putExtra(SELECTED_DOMESTIC_TXN_BUNDLE_KEY,data); |
|
|
|
setResult(Activity.RESULT_OK,intent); |
|
|
|
Intent intent = new Intent(); |
|
|
|
intent.putExtra(SELECTED_DOMESTIC_TXN_BUNDLE_KEY, data); |
|
|
|
setResult(Activity.RESULT_OK, intent); |
|
|
|
finish(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void onClick(View v) { |
|
|
|
switch(v.getId()) |
|
|
|
{ |
|
|
|
switch (v.getId()) { |
|
|
|
case R.id.iv_back: |
|
|
|
onBackPressed(); |
|
|
|
break; |
|
|
@ -228,5 +226,4 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |