Browse Source

Chat fixes

master
Preyea Regmi 5 years ago
parent
commit
7c90bc008f
  1. 17
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java
  2. 30
      app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java
  4. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/KYCV3Activity.java
  5. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/termsandcondition/view/TermsAndConditionAcitivity.java
  6. BIN
      app/src/main/res/drawable/ico_bank_credit_union.png
  7. BIN
      app/src/main/res/drawable/ico_bank_deutsche.png
  8. BIN
      app/src/main/res/drawable/ico_bank_epost.png
  9. BIN
      app/src/main/res/drawable/ico_bank_hsbc.png
  10. BIN
      app/src/main/res/drawable/ico_bank_kfcc.png
  11. 1
      app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml

17
app/src/main/java/com/gmeremit/online/gmeremittance_native/customer_support/view/CustomerSupportFragment.java

@ -44,6 +44,7 @@ import static com.gmeremit.online.gmeremittance_native.base.PrefKeys.USER_COOUNT
public class CustomerSupportFragment extends DialogFragment implements CustomerSupportContract.IView, OnBootListener { public class CustomerSupportFragment extends DialogFragment implements CustomerSupportContract.IView, OnBootListener {
private static final String CUSTOMER_SUPPORT_IS_GUEST_USER = "GUEST_USER_BUNDLE_KEY";
@BindView(R.id.viewLiveChat) @BindView(R.id.viewLiveChat)
View viewLiveChat; View viewLiveChat;
@ -69,10 +70,12 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS
private CustomAlertDialog customAlertDialog; private CustomAlertDialog customAlertDialog;
private static final String CUSTOMER_SUPPORT_FRAG_ARG_BUNDLE_KEY = "customerSupporBundleKeyArg"; private static final String CUSTOMER_SUPPORT_FRAG_ARG_BUNDLE_KEY = "customerSupporBundleKeyArg";
private boolean shouldStartChatAsGuestUser;
public static CustomerSupportFragment newInstance(String badgeCount) {
public static CustomerSupportFragment newInstance(String badgeCount, boolean shouldStartChatAsGuestUser) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(CUSTOMER_SUPPORT_FRAG_ARG_BUNDLE_KEY, badgeCount); bundle.putString(CUSTOMER_SUPPORT_FRAG_ARG_BUNDLE_KEY, badgeCount);
bundle.putBoolean(CUSTOMER_SUPPORT_IS_GUEST_USER, shouldStartChatAsGuestUser);
CustomerSupportFragment customerSupportFragment = new CustomerSupportFragment(); CustomerSupportFragment customerSupportFragment = new CustomerSupportFragment();
customerSupportFragment.setArguments(bundle); customerSupportFragment.setArguments(bundle);
return customerSupportFragment; return customerSupportFragment;
@ -81,10 +84,7 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setStyle(DialogFragment.STYLE_NO_FRAME, android.R.style.Theme_Translucent_NoTitleBar); setStyle(DialogFragment.STYLE_NO_FRAME, android.R.style.Theme_Translucent_NoTitleBar);
} }
@Nullable @Nullable
@ -101,6 +101,7 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS
callTxtView.setText(getCustomerSupportContact()); callTxtView.setText(getCustomerSupportContact());
String badgeCount = getArguments().getString(CUSTOMER_SUPPORT_FRAG_ARG_BUNDLE_KEY, ""); String badgeCount = getArguments().getString(CUSTOMER_SUPPORT_FRAG_ARG_BUNDLE_KEY, "");
shouldStartChatAsGuestUser = getArguments().getBoolean(CUSTOMER_SUPPORT_IS_GUEST_USER, false);
if (badgeCount != null && badgeCount.length() > 0) { if (badgeCount != null && badgeCount.length() > 0) {
notificationCounterTxtView.setText(badgeCount); notificationCounterTxtView.setText(badgeCount);
notificationCounterTxtView.setVisibility(View.VISIBLE); notificationCounterTxtView.setVisibility(View.VISIBLE);
@ -223,7 +224,7 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS
@Override @Override
public void onCutomDialogActionPressed(CustomAlertDialog.AlertType alertType) { public void onCutomDialogActionPressed(CustomAlertDialog.AlertType alertType) {
ChatUtils.ChatInitData initializer = ChatUtils.startChannelIoCredential(false);
ChatUtils.ChatInitData initializer = ChatUtils.startChannelIoCredential(shouldStartChatAsGuestUser);
showProgressBar(true, getString(R.string.processing_request_text)); showProgressBar(true, getString(R.string.processing_request_text));
ChannelIO.boot(initializer.getChannelPluginSettings(), initializer.getProfile(), CustomerSupportFragment.this); ChannelIO.boot(initializer.getChannelPluginSettings(), initializer.getProfile(), CustomerSupportFragment.this);
} }
@ -295,7 +296,11 @@ public class CustomerSupportFragment extends DialogFragment implements CustomerS
@Override @Override
public void onCompletion(ChannelPluginCompletionStatus status, @Nullable Guest guest) { public void onCompletion(ChannelPluginCompletionStatus status, @Nullable Guest guest) {
showProgressBar(false, ""); showProgressBar(false, "");
((HomeParentViewContractV2) getActivity()).getChannelOnBootListener().onCompletion(status, guest);
if (getActivity() instanceof HomeParentViewContractV2)
((HomeParentViewContractV2) getActivity()).getChannelOnBootListener().onCompletion(status, guest);
else
ChannelIO.open(getActivity());
dismissDialog(); dismissDialog();
} }
} }

30
app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/banklistingdialog/BankIconMapper.java

@ -19,12 +19,21 @@ public class BankIconMapper {
case "004": case "004":
case "2": case "2":
return R.drawable.ico_bank_kb; return R.drawable.ico_bank_kb;
case "005":
case "26":
return R.drawable.ico_bank_keb;
case "006":
case "24":
return R.drawable.ico_bank_kb;
case "007": case "007":
case "9": case "9":
return R.drawable.ico_bank_sh; return R.drawable.ico_bank_sh;
case "011": case "011":
case "4": case "4":
return R.drawable.ico_bank_nh; return R.drawable.ico_bank_nh;
case "012":
case "23":
return R.drawable.ico_bank_nh;
case "020": case "020":
case "21": case "21":
return R.drawable.ico_bank_wr; return R.drawable.ico_bank_wr;
@ -52,18 +61,33 @@ public class BankIconMapper {
case "039": case "039":
case "25": case "25":
return R.drawable.ico_bank_bs; return R.drawable.ico_bank_bs;
case "045":
case "8":
return R.drawable.ico_bank_kfcc;
case "048":
case "11":
return R.drawable.ico_bank_credit_union;
case "054":
case "19":
return R.drawable.ico_bank_hsbc;
case "055":
case "6":
return R.drawable.ico_bank_deutsche;
case "071":
case "14":
return R.drawable.ico_bank_epost;
case "081": case "081":
case "13": case "13":
return R.drawable.ico_bank_keb; return R.drawable.ico_bank_keb;
case "088": case "088":
case "10": case "10":
return R.drawable.ico_bank_shinhan; return R.drawable.ico_bank_shinhan;
case "090":
case "29":
return R.drawable.ico_bank_kakao;
case "089": case "089":
case "28": case "28":
return R.drawable.ico_bank_kbank; return R.drawable.ico_bank_kbank;
case "090":
case "29":
return R.drawable.ico_bank_kakao;
case "900": case "900":
case "27": case "27":
return R.drawable.ico_bank_wsb; return R.drawable.ico_bank_wsb;

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

@ -207,7 +207,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
switch (view.getId()) { switch (view.getId()) {
case R.id.iv_help: case R.id.iv_help:
CustomerSupportFragment newFragment = CustomerSupportFragment.newInstance(presenter.getPersistedRecentNotification());
CustomerSupportFragment newFragment = CustomerSupportFragment.newInstance(presenter.getPersistedRecentNotification(),false);
newFragment.show(getSupportFragmentManager(), "dialog"); newFragment.show(getSupportFragmentManager(), "dialog");
showDrawer(false); showDrawer(false);
break; break;

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/KYCV3Activity.java

@ -178,7 +178,7 @@ public class KYCV3Activity extends BaseActivity implements KYCV3PresenterInterfa
@OnClick(R.id.iv_support) @OnClick(R.id.iv_support)
public void onCsSupportPressed() { public void onCsSupportPressed() {
CustomerSupportFragment newFragment = CustomerSupportFragment.newInstance("");
CustomerSupportFragment newFragment = CustomerSupportFragment.newInstance("",true);
newFragment.show(getSupportFragmentManager(), "dialog"); newFragment.show(getSupportFragmentManager(), "dialog");
} }

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/termsandcondition/view/TermsAndConditionAcitivity.java

@ -99,7 +99,7 @@ public class TermsAndConditionAcitivity extends BaseActivity implements WebBrows
@OnClick(R.id.iv_support) @OnClick(R.id.iv_support)
public void onCsSupportPressed() { public void onCsSupportPressed() {
CustomerSupportFragment newFragment = CustomerSupportFragment.newInstance("");
CustomerSupportFragment newFragment = CustomerSupportFragment.newInstance("",true);
newFragment.show(getSupportFragmentManager(), "dialog"); newFragment.show(getSupportFragmentManager(), "dialog");
} }

BIN
app/src/main/res/drawable/ico_bank_credit_union.png

After

Width: 100  |  Height: 66  |  Size: 5.7 KiB

BIN
app/src/main/res/drawable/ico_bank_deutsche.png

After

Width: 100  |  Height: 66  |  Size: 4.5 KiB

BIN
app/src/main/res/drawable/ico_bank_epost.png

After

Width: 100  |  Height: 66  |  Size: 4.2 KiB

BIN
app/src/main/res/drawable/ico_bank_hsbc.png

After

Width: 100  |  Height: 66  |  Size: 3.4 KiB

BIN
app/src/main/res/drawable/ico_bank_kfcc.png

After

Width: 100  |  Height: 66  |  Size: 5.2 KiB

1
app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml

@ -4,6 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/scrollView" android:id="@+id/scrollView"
android:clickable="true" android:clickable="true"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout

Loading…
Cancel
Save