Browse Source

Performing setup for localization

master
Preyea Regmi 5 years ago
parent
commit
373b74f0fe
  1. 49
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/view/DomesticRemitRecipientHistoryActivity.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java
  4. 2
      app/src/main/res/layout/tab_tran_history1_international.xml
  5. 2
      app/src/main/res/layout/tab_tran_history2_domestic.xml
  6. 6
      app/src/main/res/values/strings.xml

49
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/view/DomesticRemitRecipientHistoryActivity.java

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

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java

@ -141,7 +141,7 @@ public class DomesticRemitActivity extends BaseActivity implements DomesticRemit
} }
private void performDefaultAction(Bundle savedInstanceState) { private void performDefaultAction(Bundle savedInstanceState) {
toolbar_title.setText("Domestic Remittance");
toolbar_title.setText(getString(R.string.domestic_remittance_text));
presenter.getDomesticRemitRelatedInfo(); presenter.getDomesticRemitRelatedInfo();
} }

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java

@ -156,7 +156,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
menuList.add(new MenuItem(getString(R.string.send_money_text), R.drawable.ic_menu_sendmoney, 1)); menuList.add(new MenuItem(getString(R.string.send_money_text), R.drawable.ic_menu_sendmoney, 1));
menuList.add(new MenuItem(getString(R.string.todays_rate_text), R.drawable.ic_menu_exchange_rate, 3)); menuList.add(new MenuItem(getString(R.string.todays_rate_text), R.drawable.ic_menu_exchange_rate, 3));
// menuList.add(new MenuItem(getString(R.string.resend_money_text), R.drawable.ic_menu_resendmoney, 5)); // menuList.add(new MenuItem(getString(R.string.resend_money_text), R.drawable.ic_menu_resendmoney, 5));
menuList.add(new MenuItem("Domestic Remit", R.drawable.ic_menu_wallet_statement, 7));
menuList.add(new MenuItem(getString(R.string.domestic_remittance_text), R.drawable.ic_menu_wallet_statement, 7));
menuList.add(new MenuItem(getString(R.string.gme_wallet_statement_text), R.drawable.ic_menu_wallet_statement, 4)); menuList.add(new MenuItem(getString(R.string.gme_wallet_statement_text), R.drawable.ic_menu_wallet_statement, 4));
return menuList; return menuList;
} }

2
app/src/main/res/layout/tab_tran_history1_international.xml

@ -1,5 +1,5 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center" <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center"
android:text="International"
android:text="@string/international_text"
android:textSize="17sp" android:textSize="17sp"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
app:txtfontName="@string/semibold" app:txtfontName="@string/semibold"

2
app/src/main/res/layout/tab_tran_history2_domestic.xml

@ -1,5 +1,5 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center" <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView android:gravity="center"
android:text="Domestic"
android:text="@string/domestic_text"
android:textSize="17sp" android:textSize="17sp"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
app:txtfontName="@string/semibold" app:txtfontName="@string/semibold"

6
app/src/main/res/values/strings.xml

@ -629,4 +629,10 @@
<string name="autodebit_account_required_message">Please add your Auto Debit account to start using GME services.</string> <string name="autodebit_account_required_message">Please add your Auto Debit account to start using GME services.</string>
<string name="domestic_remittance_text">Domestic Remittance</string>
<string name="recent_recipients_text">Recent Recipients</string>
<string name="domestic_text">Domestic</string>
<string name="international_text">International</string>
</resources> </resources>
Loading…
Cancel
Save