From 373b74f0feb62487958673df158a41aaf12b6f9e Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Tue, 24 Sep 2019 15:21:32 +0900 Subject: [PATCH] Performing setup for localization --- ...DomesticRemitRecipientHistoryActivity.java | 55 +++++++++---------- .../send/view/DomesticRemitActivity.java | 2 +- .../homeV2/view/HomeFragmentV2.java | 2 +- .../tab_tran_history1_international.xml | 2 +- .../res/layout/tab_tran_history2_domestic.xml | 2 +- app/src/main/res/values/strings.xml | 6 ++ 6 files changed, 36 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/view/DomesticRemitRecipientHistoryActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/view/DomesticRemitRecipientHistoryActivity.java index 5d691ffc..53132bdf 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/recenthistory/view/DomesticRemitRecipientHistoryActivity.java +++ b/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 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,19 +91,17 @@ 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 { - } + } } private void promptCalendarPicker() { @@ -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() @@ -178,7 +177,7 @@ public class DomesticRemitRecipientHistoryActivity extends BaseActivity implemen @Override public void updateSearchData(List transactionModels) { - adapter.setData(transactionModels); + adapter.setData(transactionModels); } @Override @@ -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); - finish(); + 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 } - } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java index 977b4e05..2a73d39c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/domesticremit/send/view/DomesticRemitActivity.java +++ b/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) { - toolbar_title.setText("Domestic Remittance"); + toolbar_title.setText(getString(R.string.domestic_remittance_text)); presenter.getDomesticRemitRelatedInfo(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java index b2753ad0..316b8a1f 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java +++ b/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.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("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)); return menuList; } diff --git a/app/src/main/res/layout/tab_tran_history1_international.xml b/app/src/main/res/layout/tab_tran_history1_international.xml index 0308a84c..7f5918b3 100644 --- a/app/src/main/res/layout/tab_tran_history1_international.xml +++ b/app/src/main/res/layout/tab_tran_history1_international.xml @@ -1,5 +1,5 @@ Please add your Auto Debit account to start using GME services. + Domestic Remittance + Recent Recipients + Domestic + International + +