merge with development

2022-11-10 12:50:52 +05:30
parent e57910bed2 fb103c6b51
commit 2d793440c1
7 changed files with 85 additions and 15 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -0,0 +1,34 @@
+<!--- Add a pull request title above in this format -->
+<!--- real example: 'AE-0001 | Applying MVVM Model' -->
+<!--- 'AE-JiraIssueNumber | JiraIssueTitle' (JiraIssueNumber can be removed if not available) -->
+
+## Description of what I changed
+<!--- Please include a summary of the change, relevant motivation and context -->
+<!--- It can simply be your commit message, which you must have -->
+
+
+## Issue I worked on
+<!--- Please add the issue number at the end -->
+<!--- Delete section if an issue is not available -->
+JIRA Issue: https://navihq.atlassian.net/browse/AE-####
+
+## Type of change I made
+<!--- Please delete options that are not relevant -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected, explain why)
+- [ ] Refactoring / Maintenance (non-breaking change to keep the project healthy)
+
+## QA Requirement for my changes
+<!--- Please delete options that are not relevant -->
+- [ ] QA is required for this change (QA Owner: @github-username)
+- [ ] QA is not required for this change
+
+## Checklist: I completed these to help reviewers :)
+<!--- Put an `x` in the box if you did the task -->
+- [ ] I am able to build the project locally with my changes
+- [ ] My changes generate no new warnings
+- [ ] My code follows the style guidelines of this project & spotless check passes
+- [ ] I have performed a self-review of my own code
+- [ ] I have made corresponding changes to the documentation
+- [ ] I understand that **'Squash and merge'** is the preferred merge
--- a/app/src/main/java/com/naviapp/home/analytics/LandingScreenAnalytics.kt
+++ b/app/src/main/java/com/naviapp/home/analytics/LandingScreenAnalytics.kt
@@ -20,9 +20,9 @@ object LandingScreenAnalytics {
        parameters: MutableMap<String, String>?
    ) {
        eventName?.let {
-            NaviTrackEvent.trackEventOnClickStream(it, parameters)
+            NaviTrackEvent.trackEvent(it, parameters)
        } ?: run {
-            NaviTrackEvent.trackEventOnClickStream(DEFAULT_EVENT_NAME, parameters)
+            NaviTrackEvent.trackEvent(DEFAULT_EVENT_NAME, parameters)
        }
    }
 }
--- a/app/src/main/java/com/naviapp/personalloanrevamp/intermediatev2/fragments/BankStatementV2Fragment.kt
+++ b/app/src/main/java/com/naviapp/personalloanrevamp/intermediatev2/fragments/BankStatementV2Fragment.kt
@@ -46,13 +46,13 @@ import com.naviapp.network.ApiErrorTagType
 import com.naviapp.payment.models.ProviderType
 import com.naviapp.personalloan.getloan.bankdetails.fragments.BankDetailsFragment
 import com.naviapp.personalloan.getloan.bankdetails.listeners.OnSelectBankListener
+import com.naviapp.personalloan.getloan.bankdetails.viewmodels.AggregatorSharedVM
 import com.naviapp.personalloan.intermediate.bankstatement.viewmodel.BankStatementVM
 import com.naviapp.personalloanrevamp.getloanRevamp.fragments.SelectBankV2Fragment
 import com.naviapp.personalloanrevamp.getloanRevamp.helper.GetLoanV2ViewHelper
 import com.naviapp.utils.*
 import com.naviapp.utils.Constants
 import com.naviapp.utils.Constants.FLOW_TYPE
-import com.naviapp.utils.Constants.IS_COMING_FROM_INREVIEW_PAGE
 import com.naviapp.utils.Constants.IS_REVAMP_FLOW
 import com.naviapp.utils.Constants.OFFER_UPGRADE_FLOW
 import com.naviapp.utils.EMPTY
@@ -200,6 +200,33 @@ class BankStatementV2Fragment :
        viewModel.errorResponse.observeNonNull(viewLifecycleOwner) {
            deInitializeAsyncListeners(firebaseDataHelper, apiPollScheduler)
        }
+        viewModel.errorAsyncResponse.observe(viewLifecycleOwner) {
+            when (it) {
+                AggregatorSharedVM.ErrorType.BANK_STATEMENT_UPLOAD_LIMIT_EXHAUSTED.name -> {
+                    NaviDeepLinkNavigator.navigate(
+                        activity = activity,
+                        ctaData = CtaData(
+                            url = NaviDeepLinkNavigator.LOAN_APPLICATION.appendStrings(
+                                FORWARD_SLASH.toString(),
+                                GetLoanV2ViewHelper.LOAN_OFFER_UPGRADE_V2
+                            )
+                        ),
+                        finish = true
+                    )
+                    activity?.finishAffinity()
+                }
+                AggregatorSharedVM.ErrorType.BANK_STATEMENT_SOFT_REJECT.name -> {
+                    NaviDeepLinkNavigator.navigate(
+                        activity = activity,
+                        ctaData = CtaData(
+                            url = NaviDeepLinkNavigator.ERROR_V2
+                        ),
+                        finish = true
+                    )
+                    activity?.finishAffinity()
+                }
+            }
+        }
    }

    private val onPollingEnd = { handleTimeOutError() }
--- a/app/src/main/res/layout/bank_statement_verification_method_layout.xml
+++ b/app/src/main/res/layout/bank_statement_verification_method_layout.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <RelativeLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

@@ -10,7 +10,13 @@
            android:id="@+id/net_banking_container"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true">
+            android:layout_alignParentStart="true"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/otp_banking_container"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">

            <include
                android:id="@+id/net_banking_option"
@@ -23,13 +29,17 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentEnd="true"
+            android:layout_marginStart="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/net_banking_container"
            app:layout_constraintTop_toTopOf="parent">

            <include
                android:id="@+id/otp_option"
                layout="@layout/title_subtitle_with_icon_layout" />
        </LinearLayout>
-    </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

 </layout>
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,6 @@ buildscript {

 plugins {
    id('com.diffplug.spotless') version('6.11.0')
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
 }

 apply from: "$project.rootDir/spotless.gradle"
--- a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragment.kt
+++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragment.kt
@@ -36,6 +36,7 @@ import com.navi.amc.utils.Constant.DATA
 import com.navi.amc.utils.Constant.SHOW_BOTTOMSHEET
 import com.navi.amc.utils.getBottomSheet
 import com.navi.amc.utils.orFalse
+import com.navi.amc.utils.orTrue
 import com.navi.base.model.ActionData
 import com.navi.base.utils.BaseUtils.cacheDirUri
 import com.navi.common.downloader.DownloadUtil
@@ -101,8 +102,8 @@ class FundDetailsFragment : AmcBaseFragment() {
                    val rect = Rect()
                    scroll.getHitRect(rect)
                    val view =
-                        binding.container.findViewWithTag<FundGraphView>("graph").getSubtitle()
-                    if (!view.getLocalVisibleRect(rect)) {
+                        binding.container.findViewWithTag<FundGraphView>("graph")?.getSubtitle()
+                    if (!view?.getLocalVisibleRect(rect).orTrue()) {
                        binding.fundOnscrollView.apply {
                            left.setSpannableString(viewModel.fundReturn.value?.leftText)
                            right.setSpannableString(viewModel.fundReturn.value?.rightText)
--- a/navi-common/src/main/java/com/navi/common/utils/CommonNaviAnalytics.kt
+++ b/navi-common/src/main/java/com/navi/common/utils/CommonNaviAnalytics.kt
@@ -35,12 +35,11 @@ class CommonNaviAnalytics private constructor() {
            error: GenericErrorResponse?,
            errorMessage: ErrorMessage?
        ) {
-            val map =
-                mapOf(
-                    Pair("error_data", error.toString()),
-                    Pair("message", errorMessage.toString())
-                )
-            NaviTrackEvent.trackEventOnClickStream(eventName, map)
+            val map = mapOf(
+                Pair("error_data", error.toString()),
+                Pair("message", errorMessage.toString())
+            )
+            NaviTrackEvent.trackEvent(eventName, map)
        }
    }