Home rxSubject removed

SpinnerDatePickerLib-release/build/.transforms/469d64f6c6fc4a7e9718e748abf8ce98.bin

@@ -0,0 +1 @@
+o/classes

SpinnerDatePickerLib-release/build/.transforms/69f360c89c7232d5557d4cd3d34c6e3f.bin

@@ -0,0 +1 @@
+o/classes

SpinnerDatePickerLib-release/build/.transforms/e60a5c6df95c7eed5657083dcd5d5ec4.bin

@@ -0,0 +1 @@
+o/classes

app/build.gradle

@@ -16,13 +16,13 @@ repositories {
 apply plugin: 'io.fabric'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.gmeremit.online.gmeremittance_native"
         minSdkVersion 18
-        targetSdkVersion 28
-        versionCode 29
-        versionName "3.0.1"
+        targetSdkVersion 29
+        versionCode 30
+        versionName "3.0.2"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java

@@ -2,6 +2,9 @@ package com.gmeremit.online.gmeremittance_native.homeV2.presenter;
 
 import android.util.Log;
 
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
 import com.gmeremit.online.gmeremittance_native.BuildConfig;
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
 import com.gmeremit.online.gmeremittance_native.R;
@@ -39,21 +42,21 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
     private final HomeV2GatewayInterface gateway;
     private final CompositeDisposable compositeDisposable;
     private final BehaviorSubject<HomeViewRelatedDTO> homeFragmentRelatedSubject;
-    private final BehaviorSubject<HomeViewRelatedDTOV2> homeFragmentRelatedSubjectV2;
     private final boolean shouldCheckFingerprintPrompt;
     private boolean shouldNotPromptAppUpdate;
     private boolean shouldNotPromptAutoDebitAccountRenew;
     private String recentNotificationCount = null;
+    private MutableLiveData<HomeViewRelatedDTOV2> homeRelatedMutableLiveData;
 
-    public HomeV2Presenter(HomeV2ContractInterface view,HomeV2GatewayInterface gateway, boolean checkFingerprintPromptScreen) {
+    public HomeV2Presenter(HomeV2ContractInterface view, HomeV2GatewayInterface gateway, boolean checkFingerprintPromptScreen) {
         this.view = view;
         this.gateway = gateway;
         this.compositeDisposable = new CompositeDisposable();
         this.homeFragmentRelatedSubject = BehaviorSubject.create();
-        this.homeFragmentRelatedSubjectV2 = BehaviorSubject.create();
         this.shouldNotPromptAppUpdate = false;
         this.shouldNotPromptAutoDebitAccountRenew = false;
         this.shouldCheckFingerprintPrompt = checkFingerprintPromptScreen;
+        homeRelatedMutableLiveData = new MutableLiveData<>();
 
     }
 
@@ -231,15 +234,15 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
 
             boolean shouldShowKJBankNotice = checkIfShouldShowKJNotice();
 
-            HomeNotificationViewDTO notificationViewDTO = new HomeNotificationHandler(GmeApplication.getStringExtractor(), userInfoModelV2.getKyc(), userInfoModelV2.isVerified(), userInfoModelV2.getPennyTestStatus(), userInfoModelV2.getRedirectTo(),userInfoModelV2.getAgreeYn())
+            HomeNotificationViewDTO notificationViewDTO = new HomeNotificationHandler(GmeApplication.getStringExtractor(), userInfoModelV2.getKyc(), userInfoModelV2.isVerified(), userInfoModelV2.getPennyTestStatus(), userInfoModelV2.getRedirectTo(), userInfoModelV2.getAgreeYn())
                     .generateAppropriateHomeNotificationViewDTO();
 
-            boolean shouldShowTermsAndCondition="0".equalsIgnoreCase(userInfoModelV2.getAgreeYn());
+            boolean shouldShowTermsAndCondition = "0".equalsIgnoreCase(userInfoModelV2.getAgreeYn());
 
-                homeFragmentRelatedSubjectV2.onNext(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getAvailableBalance(),userInfoModelV2.getYearlyLimit(),
-                        userInfoModelV2.getRewardPoint(), shouldShowAutoDebitNotice, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice,
-                        userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getWalletNumber(),
-                        notificationViewDTO,shouldShowTermsAndCondition));
+            homeRelatedMutableLiveData.setValue(new HomeViewRelatedDTOV2(fullName, userInfoModelV2.getAvailableBalance(), userInfoModelV2.getYearlyLimit(),
+                    userInfoModelV2.getRewardPoint(), shouldShowAutoDebitNotice, autoDebitTitle, autoDebitBody, shouldShowKJBankNotice,
+                    userInfoModelV2.getPrimaryBankName(), userInfoModelV2.getWalletNumber(),
+                    notificationViewDTO, shouldShowTermsAndCondition));
 
             //If no notification is generated then we can show privileged Operation View
             view.showPrivilegedOperationView(notificationViewDTO == null || notificationViewDTO.shouldShowPrivilegedView());
@@ -313,9 +316,10 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
         return this.recentNotificationCount;
     }
 
+
     @Override
-    public Observable<HomeViewRelatedDTOV2> subscribeToHomeFragmentDataFetchEventV2() {
-        return homeFragmentRelatedSubjectV2;
+    public LiveData<HomeViewRelatedDTOV2> subscribeToHomeRelatedDataEvent() {
+        return homeRelatedMutableLiveData;
     }
 
     @Override

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2PresenterInterface.java

@@ -2,6 +2,8 @@ package com.gmeremit.online.gmeremittance_native.homeV2.presenter;
 
 import android.content.Context;
 
+import androidx.lifecycle.LiveData;
+
 import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
 import com.gmeremit.online.gmeremittance_native.homeV2.model.HomeNotificationViewDTO;
@@ -46,7 +48,8 @@ public interface HomeV2PresenterInterface extends BasePresenterInterface {
 
     String getPersistedRecentNotification();
 
-    Observable<HomeViewRelatedDTOV2> subscribeToHomeFragmentDataFetchEventV2();
+
+    LiveData<HomeViewRelatedDTOV2> subscribeToHomeRelatedDataEvent();
 
     HomeNotificationViewDTO constructPennyTestViewNotification();
 

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

@@ -105,7 +105,6 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
 
     HomeMenuRvAdapterV2 homeMenuRvAdapterV2;
     private CompositeDisposable compositeDisposable;
-    private HomeFragmentDataObserverV2 homeFragmentDataObserverV2;
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -123,7 +122,6 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
 
     private void init() {
         setupMenuRecyclerView();
-        homeFragmentDataObserverV2 = new HomeFragmentDataObserverV2();
         compositeDisposable = new CompositeDisposable();
 
 
@@ -180,8 +178,20 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
 
     private void performDefaultAction(Bundle savedInupdateInfostanceState) {
         HomeParentViewContractV2 parentView = ((HomeParentViewContractV2) getActivity());
-        compositeDisposable.add(
-                parentView.getPresenter().subscribeToHomeFragmentDataFetchEventV2().subscribeWith(homeFragmentDataObserverV2));
+//        compositeDisposable.add(
+//                parentView.getPresenter().subscribeToHomeFragmentDataFetchEventV2().subscribeWith(homeFragmentDataObserverV2));
+
+        parentView.getPresenter().subscribeToHomeRelatedDataEvent().observe(getViewLifecycleOwner(),homeViewRelatedDTOV2->{
+            waveProgressBarView.stopAnimation();
+            updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getYearlyLimit(), homeViewRelatedDTOV2.getRewardPoint());
+            setWalletNo(homeViewRelatedDTOV2.getWalletNo(), homeViewRelatedDTOV2.getBankName());
+            showAutoDebitNoticeViewIfRequiredInPopup(homeViewRelatedDTOV2.shouldShowAutoDebitNotice(), homeViewRelatedDTOV2.getAutoDebitNoticeTitle(), homeViewRelatedDTOV2.getAutoDebitNoticeBody(), () -> {
+                showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO());
+            });
+
+            if (homeViewRelatedDTOV2.shouldShowTermsAndCondition())
+                TermsAndConditionAcitivity.startTermsAndCondition(getActivity());
+        });
 
     }
 
@@ -301,42 +311,6 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
     }
 
 
-    class HomeFragmentDataObserverV2 extends GenericApiObserverResponse<HomeViewRelatedDTOV2> {
-
-        @Override
-        protected void onSuccess(HomeViewRelatedDTOV2 homeViewRelatedDTOV2) {
-            if (isUIReady()) {
-                waveProgressBarView.stopAnimation();
-                updateInfo(homeViewRelatedDTOV2.getUserName(), homeViewRelatedDTOV2.getAvailableBalance(), homeViewRelatedDTOV2.getYearlyLimit(), homeViewRelatedDTOV2.getRewardPoint());
-                setWalletNo(homeViewRelatedDTOV2.getWalletNo(), homeViewRelatedDTOV2.getBankName());
-                showAutoDebitNoticeViewIfRequiredInPopup(homeViewRelatedDTOV2.shouldShowAutoDebitNotice(), homeViewRelatedDTOV2.getAutoDebitNoticeTitle(), homeViewRelatedDTOV2.getAutoDebitNoticeBody(), () -> {
-                    showNotificationView(homeViewRelatedDTOV2.getHomeNotificationViewDTO());
-                });
-
-                if (homeViewRelatedDTOV2.shouldShowTermsAndCondition())
-                    TermsAndConditionAcitivity.startTermsAndCondition(getActivity());
-            }
-
-        }
-
-        @Override
-        public void onFailed(String message) {
-            waveProgressBarView.stopAnimation();
-
-        }
-
-        @Override
-        protected void onConnectionNotEstablished(String message) {
-            waveProgressBarView.stopAnimation();
-
-        }
-
-        @Override
-        protected void unauthorizedAccess(String message) {
-            waveProgressBarView.stopAnimation();
-
-        }
-    }
 
 
     public void showNotificationView(HomeNotificationViewDTO notificationViewDTO) {

app/src/main/java/com/gmeremit/online/gmeremittance_native/loginV2/presenter/LoginV2Presenter.java

@@ -200,7 +200,6 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI
             if (SecurityUtils.checkFingerPrintUsablity(view.getContext()))
                 persistUserCredentialForFingerprintAuth(userId, encUserPassword, loginResponse);
             else {
-
                 onLoginSuccess(loginResponse);
             }
         }
@@ -261,6 +260,7 @@ public class LoginV2Presenter extends BasePresenter implements LoginV2PresenterI
         @Override
         public void onError(Throwable e) {
             gateway.flushBiometricData();
+            onLoginSuccess(loginModelV2);
         }
 
         @Override

app/src/main/res/values-ru/strings.xml

@@ -122,7 +122,7 @@
     <string name="verification_detail_text">Подтверждение</string>
     <string name="pick_money_text">Как бы вы хотели забрать деньги?</string>
     <string name="select_bank_text">Выбрать банк</string>
-    <string name="account_number_text">Номер счета</string>
+    <string name="account_number_text">Счет банковской книжки (Тонжан)</string>
     <string name="continue_text">Продолжить</string>
     <string name="reciever_details_text">Информация о получателе</string>
     <string name="transaction_detail_text">Детали транзакции</string>
@@ -668,7 +668,7 @@
     <string name="passport_issue_date_text">Дата выдачи</string>
     <string name="passport_expiry_date_text">Дата истечения срока паспорта</string>
     <string name="passport_error_text">Неправильный номер паспорта</string>
-    <string name="another_id_information_text">Другой ID (По выбору)</string>
+    <string name="another_id_information_text">Добавьте Айди карту (ARC)</string>
     <string name="another_id_issue_date_text">Дата выдачи</string>
     <string name="another_id_expiry_date_text">Дата истечения</string>
     <string name="another_id_number_error_text">Неправильный номер ID</string>

app/src/main/res/values-uz/strings.xml

@@ -122,7 +122,7 @@
     <string name="verification_detail_text">Verifikatsiya</string>
     <string name="pick_money_text">Pulni qanday qilib qabul qilishini istaysiz?</string>
     <string name="select_bank_text">Bankni tanlang</string>
-    <string name="account_number_text">Hisob raqami</string>
+    <string name="account_number_text">Bank Hisob raqami (Tonjan)</string>
     <string name="continue_text">Davom ettirish</string>
     <string name="reciever_details_text">Qabul qiluvchining ma\'lumotlari</string>
     <string name="transaction_detail_text">Tranzaksiya ma\'lumotlari</string>
@@ -505,9 +505,9 @@
     <string name="bank_placeholder_text">Bankni yoki Karta Turini Tanlang</string>
     <string name="branch_placeholder_text">Filialni tanlang</string>
     <string name="account_placeholder_text">Bank Karta Raqami</string>
-    <string name="first_name_placeholder_text">Ismingizni kiriting</string>
-    <string name="middle_name_placeholder_text">Otangiz ismini kiriting</string>
-    <string name="last_name_placeholder_text">Familiyani kiriting</string>
+    <string name="first_name_placeholder_text">Ismini kiriting (Oluvchining)</string>
+    <string name="middle_name_placeholder_text">Otasining Ismini Kiriting (Ixtiyoriy)</string>
+    <string name="last_name_placeholder_text">Familya kiriting</string>
     <string name="full_name_placeholder_text">To‘liq ism-sharifni kiriting</string>
     <string name="first_name_local_placeholder_text">Ismingizni o\'z tilingizda kiriting</string>
     <string name="middle_name_local_placeholder_text">Otangizning ismini o\'z tilingizda kiriting</string>
@@ -667,7 +667,7 @@
     <string name="passport_issue_date_text">Pasport berilgan sanasi</string>
     <string name="passport_expiry_date_text">Pasport amal qilish muddati</string>
     <string name="passport_error_text">noto\'g\'ri pasport raqam</string>
-    <string name="another_id_information_text">Boshqa shaxsni tasdiqlovchi hujjat (ixtiyoriy)</string>
+    <string name="another_id_information_text">Aydi Karta ma`lumotlari</string>
     <string name="another_id_issue_date_text">Aydi berilgan sanasi</string>
     <string name="another_id_expiry_date_text">Aydi amal qilish muddati</string>
     <string name="another_id_number_error_text">Noto\'g\'ri Aydi raqam</string>